mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 03:53:21 +02:00
Code Issues Wiki Activity

Bug 525675: Delegate opening unknown file types to unknownEditorStrategy

Browse source 
This code enables the Debug view in CDT to take advantage of:
https://www.eclipse.org/eclipse/news/4.6/platform.php#text-editor-selection-strategy

Change-Id: I35e0453ce7ee772aac33ffbce6e66926bbb475e3
This commit is contained in:
Jonah Graham 2017-06-28 14:27:42 +01:00
parent 15c8bad95d
commit fad069c809
4 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
View file

@ -42,7 +42,7 @@ Export-Package:
org.eclipse.cdt.debug.ui.preferences,
org.eclipse.cdt.debug.ui.provisional;x-internal:=true,
org.eclipse.cdt.debug.ui.sourcelookup
Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.12.0,4.0.0)",
org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",

2
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugModelPresentation.java
View file

@ -233,7 +233,7 @@ public class CDebugModelPresentation extends LabelProvider implements IDebugMode
URI uri = uriEditorInput.getURI();
try {
IFileStore fileStore = EFS.getStore(uri);
id = CDebugUIUtils.getEditorId(fileStore);
id = CDebugUIUtils.getEditorId(fileStore, false);
} catch (CoreException e) {
// fallback to default case
}

62
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java
View file

@ -71,8 +71,11 @@ import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.FileStoreEditorInput;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.ide.IUnassociatedEditorStrategy;
import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.internal.ide.registry.SystemEditorOrTextEditorStrategy;
import org.eclipse.ui.internal.ide.registry.UnassociatedEditorStrategyRegistry;
import org.eclipse.ui.progress.UIJob;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.SimpleMarkerAnnotation;
@ -393,7 +396,7 @@ public class CDebugUIUtils {
* @deprecated Deprecated on creation as this is waiting for Bug 516470 to be resolved
*/
@Deprecated
public static String getEditorId(IFileStore fileStore) throws PartInitException {
public static String getEditorId(IFileStore fileStore, boolean allowInteractive) throws PartInitException {
String name = fileStore.fetchInfo().getName();
if (name == null) {
throw new IllegalArgumentException();
@ -420,7 +423,7 @@ public class CDebugUIUtils {
IEditorDescriptor defaultEditor = editorReg.getDefaultEditor(name, contentType);
defaultEditor = IDE.overrideDefaultEditorAssociation(new FileStoreEditorInput(fileStore), contentType, defaultEditor);
return getEditorDescriptor(name, editorReg, defaultEditor).getId();
return getEditorDescriptor(name, editorReg, defaultEditor, allowInteractive).getId();
}
/**
@ -443,32 +446,19 @@ public class CDebugUIUtils {
*/
@Deprecated
private static IEditorDescriptor getEditorDescriptor(String name,
IEditorRegistry editorReg, IEditorDescriptor defaultDescriptor)
IEditorRegistry editorReg, IEditorDescriptor defaultDescriptor, boolean allowInteractive)
throws PartInitException {
if (defaultDescriptor != null) {
return defaultDescriptor;
}
IEditorDescriptor editorDesc = defaultDescriptor;
// next check the OS for in-place editor (OLE on Win32)
if (editorReg.isSystemInPlaceEditorAvailable(name)) {
editorDesc = editorReg
.findEditor(IEditorRegistry.SYSTEM_INPLACE_EDITOR_ID);
}
// next check with the OS for an external editor
if (editorDesc == null
&& editorReg.isSystemExternalEditorAvailable(name)) {
editorDesc = editorReg
.findEditor(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID);
}
// next lookup the default text editor
if (editorDesc == null) {
editorDesc = editorReg
.findEditor(IDEWorkbenchPlugin.DEFAULT_TEXT_EDITOR_ID);
IUnassociatedEditorStrategy strategy = getUnassociatedEditorStrategy(allowInteractive);
IEditorDescriptor editorDesc;
try {
editorDesc = strategy.getEditorDescriptor(name, editorReg);
} catch (CoreException e) {
throw new PartInitException(IDEWorkbenchMessages.IDE_noFileEditorFound, e);
}
// if no valid editor found, bail out
@ -479,6 +469,32 @@ public class CDebugUIUtils {
return editorDesc;
}
/**
* @param allowInteractive
* Whether interactive strategies are considered
* @return The strategy to use in order to open unknown file. Either as set
* by preference, or a {@link SystemEditorOrTextEditorStrategy} if
* none is explicitly configured. Never returns {@code null}.
*
* @todo The IDE class has this method as a private, copied here so that it can be
* exposed via getEditorId. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=516470
* @deprecated Deprecated on creation as this is waiting for Bug 516470 to be resolved
*/
private static IUnassociatedEditorStrategy getUnassociatedEditorStrategy(boolean allowInteractive) {
String preferedStrategy = IDEWorkbenchPlugin.getDefault().getPreferenceStore()
.getString(IDE.UNASSOCIATED_EDITOR_STRATEGY_PREFERENCE_KEY);
IUnassociatedEditorStrategy res = null;
UnassociatedEditorStrategyRegistry registry = IDEWorkbenchPlugin.getDefault()
.getUnassociatedEditorStrategyRegistry();
if (allowInteractive || !registry.isInteractive(preferedStrategy)) {
res = registry.getStrategy(preferedStrategy);
}
if (res == null) {
res = new SystemEditorOrTextEditorStrategy();
}
return res;
}
}

4
dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/sourcelookup/DsfSourceDisplayAdapter.java
View file

@ -268,7 +268,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
private String getEditorIdForFile(IFile file) {
try {
IEditorDescriptor descriptor = IDE.getEditorDescriptor(file);
IEditorDescriptor descriptor = IDE.getEditorDescriptor(file, true, false);
return descriptor.getId();
} catch (PartInitException exc) {
DsfUIPlugin.log(exc);
@ -278,7 +278,7 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
private String getEditorIdForFileStore(IFileStore fileStore) {
try {
return CDebugUIUtils.getEditorId(fileStore);
return CDebugUIUtils.getEditorId(fileStore, false);
} catch (PartInitException exc) {
DsfUIPlugin.log(exc);
}