mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

Removed the assumption that working copy has a resource, which for external files is false.

Browse source
This commit is contained in:
Doug Schaefer 2005-04-13 16:16:43 +00:00
parent da287f19be
commit 22c3065bd3
1 changed files with 15 additions and 9 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

@ -20,6 +20,7 @@ import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProcessor2;
import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference;
import org.eclipse.cdt.ui.CElementContentProvider; import org.eclipse.cdt.ui.CElementContentProvider;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.IWorkingCopyManager;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.IDialogSettings;
@ -204,16 +205,21 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
ContentAssistant assistant = new ContentAssistant(); ContentAssistant assistant = new ContentAssistant();
IContentAssistProcessor processor = null;
IWorkingCopy workingCopy = CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(getEditor().getEditorInput()); IWorkingCopy workingCopy = CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(getEditor().getEditorInput());
IResource resource = workingCopy.getResource(); IResource resource = workingCopy.getResource();
IProject project = resource.getProject(); if (resource != null) {
ICFileType type = CCorePlugin.getDefault().getFileType(project, resource.getLocation().lastSegment()); IProject project = resource.getProject();
ICFileType type = CCorePlugin.getDefault().getFileType(project, resource.getLocation().lastSegment());
IContentAssistProcessor processor
= (type.getLanguage().getId().equals(ICFileTypeConstants.LANG_C) processor = type.getLanguage().getId().equals(ICFileTypeConstants.LANG_C)
|| getPreferenceStore().getBoolean(ContentAssistPreference.DONT_USE_DOM)) || getPreferenceStore().getBoolean(ContentAssistPreference.DONT_USE_DOM)
? (IContentAssistProcessor)new CCompletionProcessor(getEditor()) ? (IContentAssistProcessor)new CCompletionProcessor(getEditor())
: (IContentAssistProcessor)new CCompletionProcessor2(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?