mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Turned new content assist on for C.

Browse source
This commit is contained in:
Doug Schaefer 2005-04-14 20:29:38 +00:00
parent fc2141e160
commit 9877d0b3bd
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
View file

@ -49,7 +49,6 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
import org.eclipse.jface.text.rules.RuleBasedScanner; import org.eclipse.jface.text.rules.RuleBasedScanner;
import org.eclipse.jface.text.source.IAnnotationHover; import org.eclipse.jface.text.source.IAnnotationHover;
import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
@ -205,25 +204,10 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
ContentAssistant assistant = new ContentAssistant(); ContentAssistant assistant = new ContentAssistant();
IContentAssistProcessor processor = null; IContentAssistProcessor processor
= getPreferenceStore().getBoolean(ContentAssistPreference.DONT_USE_DOM)
IWorkingCopy workingCopy = CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(getEditor().getEditorInput()); ? (IContentAssistProcessor)new CCompletionProcessor(getEditor())
: (IContentAssistProcessor)new CCompletionProcessor2(getEditor());
if (workingCopy == null)
return null;
IResource resource = workingCopy.getResource();
if (resource != null) {
IProject project = resource.getProject();
ICFileType type = CCorePlugin.getDefault().getFileType(project, resource.getLocation().lastSegment());
processor = type.getLanguage().getId().equals(ICFileTypeConstants.LANG_C)
|| getPreferenceStore().getBoolean(ContentAssistPreference.DONT_USE_DOM)
? (IContentAssistProcessor)new CCompletionProcessor(getEditor())
: (IContentAssistProcessor)new CCompletionProcessor2(getEditor());
} else
processor = new CCompletionProcessor(getEditor());
assistant.setContentAssistProcessor(processor, IDocument.DEFAULT_CONTENT_TYPE); assistant.setContentAssistProcessor(processor, IDocument.DEFAULT_CONTENT_TYPE);
//Will this work as a replacement for the configuration lines below? //Will this work as a replacement for the configuration lines below?