diff options
author | Nitin Dahyabhai | 2020-08-18 03:26:57 +0000 |
---|---|---|
committer | Nitin Dahyabhai | 2020-08-18 03:26:57 +0000 |
commit | 37a18b3b8e271ca2ef5bed36e2cb2e63a0584fcb (patch) | |
tree | 74d258f8c67e38e50a1d6d724edb8c7c11771d9f /core/bundles/org.eclipse.wst.sse.ui | |
parent | 3f121564f3ada6e6c8bf8d4e484e17aa073889f3 (diff) | |
download | webtools.sourceediting-37a18b3b8e271ca2ef5bed36e2cb2e63a0584fcb.tar.gz webtools.sourceediting-37a18b3b8e271ca2ef5bed36e2cb2e63a0584fcb.tar.xz webtools.sourceediting-37a18b3b8e271ca2ef5bed36e2cb2e63a0584fcb.zip |
[565338] Revert original generic hover implementation
Diffstat (limited to 'core/bundles/org.eclipse.wst.sse.ui')
6 files changed, 0 insertions, 56 deletions
diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java index f89e5f4188..5943a673d0 100644 --- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java +++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/PreferenceInitializer.java @@ -85,7 +85,5 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { * SWT.MOD2 is currently SWT.COMMAND on Mac; SWT.CONTROL elsewhere */ store.setDefault(AppearancePreferenceNames.EDITOR_TEXT_HOVER_MODIFIERS, "combinationHover|true|0;problemHover|false|0;documentationHover|false|0;annotationHover|true|" + mod2Name); //$NON-NLS-1$ - - store.setDefault(EditorPreferenceNames.PREFER_GENERIC_HOVER, true); } }
\ No newline at end of file diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java index c765af1398..5f91600068 100644 --- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java +++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIMessages.java @@ -256,7 +256,6 @@ public class SSEUIMessages extends NLS { public static String TextHoverPreferenceTab_hoverPreferences; public static String TextHoverPreferenceTab_keyModifier; public static String TextHoverPreferenceTab_description; - public static String TextHoverPreferenceTab_generic; public static String TextHoverPreferenceTab_modifierIsNotValid; public static String TextHoverPreferenceTab_modifierIsNotValidForHover; public static String TextHoverPreferenceTab_duplicateModifier; diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties index 6afd12cfd9..26c6de96b0 100644 --- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties +++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/SSEUIPluginResources.properties @@ -232,7 +232,6 @@ TextHoverPreferenceTab_title=Hovers TextHoverPreferenceTab_hoverPreferences=Text &Hover key modifier preferences: TextHoverPreferenceTab_keyModifier=Pressed key &modifier while hovering: TextHoverPreferenceTab_description=Description: -TextHoverPreferenceTab_generic=Prefer Generic Editor hovers when available TextHoverPreferenceTab_modifierIsNotValid=Modifier ''{0}'' is not valid. TextHoverPreferenceTab_modifierIsNotValidForHover=Modifier ''{0}'' for ''{1}'' hover is not valid. TextHoverPreferenceTab_duplicateModifier=''{0}'' hover uses the same modifier as ''{1}'' hover. diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/EditorPreferenceNames.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/EditorPreferenceNames.java index 18bedbda5f..71752e8958 100644 --- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/EditorPreferenceNames.java +++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/EditorPreferenceNames.java @@ -44,9 +44,4 @@ public class EditorPreferenceNames { * </p> */ public final static String CODEASSIST_AUTOACTIVATION_DELAY = "content_assist_autoactivation_delay"; //$NON-NLS-1$ - - /** - * Preference name for boolean value controlling whether to defer to Generic Editor hovers - */ - public final static String PREFER_GENERIC_HOVER = "prefer_generic_hover"; //$NON-NLS-1$ } diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TextHoverPreferenceTab.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TextHoverPreferenceTab.java index 57fce1c8a3..a1b9c9961a 100644 --- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TextHoverPreferenceTab.java +++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/TextHoverPreferenceTab.java @@ -58,7 +58,6 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.wst.sse.ui.internal.SSEUIMessages; import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; import org.eclipse.wst.sse.ui.internal.editor.IHelpContextIds; -import org.eclipse.wst.sse.ui.internal.preferences.EditorPreferenceNames; import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore; import org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager; import org.eclipse.wst.sse.ui.internal.taginfo.TextHoverManager.TextHoverDescriptor; @@ -291,8 +290,6 @@ public class TextHoverPreferenceTab extends AbstractPreferenceTab { new Label(hoverComposite, SWT.NONE).setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 2, 1)); - addCheckBox(hoverComposite, SSEUIMessages.TextHoverPreferenceTab_generic, EditorPreferenceNames.PREFER_GENERIC_HOVER, 0); - initialize(); Dialog.applyDialogFont(hoverComposite); @@ -305,7 +302,6 @@ public class TextHoverPreferenceTab extends AbstractPreferenceTab { List<OverlayPreferenceStore.OverlayKey> overlayKeys = new ArrayList<>(); overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AppearancePreferenceNames.EDITOR_TEXT_HOVER_MODIFIERS)); - overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, EditorPreferenceNames.PREFER_GENERIC_HOVER)); OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()]; overlayKeys.toArray(keys); diff --git a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/taginfo/BestMatchHover.java b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/taginfo/BestMatchHover.java index af578af4f1..dfadcbb769 100644 --- a/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/taginfo/BestMatchHover.java +++ b/core/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/taginfo/BestMatchHover.java @@ -15,28 +15,17 @@ package org.eclipse.wst.sse.ui.internal.taginfo; import java.util.ArrayList; -import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Set; -import org.eclipse.core.filebuffers.FileBuffers; -import org.eclipse.core.filebuffers.ITextFileBuffer; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.content.IContentType; -import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IInformationControlCreator; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextHover; import org.eclipse.jface.text.ITextHoverExtension; import org.eclipse.jface.text.ITextHoverExtension2; import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.ui.internal.genericeditor.GenericEditorPlugin; import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder; import org.eclipse.wst.sse.ui.internal.Logger; -import org.eclipse.wst.sse.ui.internal.SSEUIPlugin; -import org.eclipse.wst.sse.ui.internal.preferences.EditorPreferenceNames; /** * Provides the best hover help documentation (by using other hover help @@ -60,8 +49,6 @@ public class BestMatchHover implements ITextHover, ITextHoverExtension, ITextHov private ITextHover controlCreatorProvider; - private Set<IContentType> fDetectedContentTypes; - public BestMatchHover(ITextHover infoTagHover) { this(new ITextHover[]{infoTagHover}); } @@ -100,39 +87,9 @@ public class BestMatchHover implements ITextHover, ITextHoverExtension, ITextHov } } hoverList.add(new AnnotationHoverProcessor()); - - if (SSEUIPlugin.getInstance().getPreferenceStore().getBoolean(EditorPreferenceNames.PREFER_GENERIC_HOVER)) { - Set<IContentType> detectedContentTypes = detectContentTypes(textViewer); - if (textViewer instanceof ISourceViewer && detectedContentTypes != null) { - List<ITextHover> genericHovers = GenericEditorPlugin.getDefault().getHoverRegistry().getAvailableHovers((ISourceViewer) textViewer, null, detectedContentTypes); - hoverList.addAll(0, genericHovers); - } - } return hoverList; } - private Set<IContentType> detectContentTypes(ITextViewer viewer) { - if (fDetectedContentTypes == null) { - Set<IContentType> types = new HashSet<>(); - IDocument currentDocument = viewer.getDocument(); - if (currentDocument != null) { - ITextFileBuffer textFileBuffer = FileBuffers.getTextFileBufferManager().getTextFileBuffer(currentDocument); - if (textFileBuffer != null) { - IContentType[] foundTypes = Platform.getContentTypeManager().findContentTypesFor(textFileBuffer.getLocation().lastSegment()); - for (int i = 0; i < foundTypes.length; i++) { - IContentType type = foundTypes[i]; - while (type != null) { - types.add(type); - type = type.getBaseType(); - } - } - } - } - fDetectedContentTypes = types; - } - return fDetectedContentTypes; - } - public IInformationControlCreator getHoverControlCreator() { IInformationControlCreator creator = null; |