diff --git a/org.eclipse.lsp4e/META-INF/MANIFEST.MF b/org.eclipse.lsp4e/META-INF/MANIFEST.MF index a78da5896..40bfd4fef 100644 --- a/org.eclipse.lsp4e/META-INF/MANIFEST.MF +++ b/org.eclipse.lsp4e/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Language Server Protocol client for Eclipse IDE (Incubation) Bundle-SymbolicName: org.eclipse.lsp4e;singleton:=true -Bundle-Version: 0.19.4.qualifier +Bundle-Version: 0.19.5.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", org.eclipse.equinox.common;bundle-version="3.8.0", diff --git a/svg/org.eclipse.languageserver/icons/full/elcl16/link_to_editor.svg b/org.eclipse.lsp4e/icons/full/elcl16/link_to_editor.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/elcl16/link_to_editor.svg rename to org.eclipse.lsp4e/icons/full/elcl16/link_to_editor.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/boolean.svg b/org.eclipse.lsp4e/icons/full/obj16/boolean.svg similarity index 98% rename from svg/org.eclipse.languageserver/icons/full/obj16/boolean.svg rename to org.eclipse.lsp4e/icons/full/obj16/boolean.svg index 6a7b26e78..1d4d1838e 100644 --- a/svg/org.eclipse.languageserver/icons/full/obj16/boolean.svg +++ b/org.eclipse.lsp4e/icons/full/obj16/boolean.svg @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32" - height="32" + width="16" + height="16" viewBox="0 0 32 32.000001" id="svg4136" version="1.1" diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/class.svg b/org.eclipse.lsp4e/icons/full/obj16/class.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/class.svg rename to org.eclipse.lsp4e/icons/full/obj16/class.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/constant.svg b/org.eclipse.lsp4e/icons/full/obj16/constant.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/constant.svg rename to org.eclipse.lsp4e/icons/full/obj16/constant.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/constructor.svg b/org.eclipse.lsp4e/icons/full/obj16/constructor.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/constructor.svg rename to org.eclipse.lsp4e/icons/full/obj16/constructor.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/enum.svg b/org.eclipse.lsp4e/icons/full/obj16/enum.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/enum.svg rename to org.eclipse.lsp4e/icons/full/obj16/enum.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/field.svg b/org.eclipse.lsp4e/icons/full/obj16/field.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/field.svg rename to org.eclipse.lsp4e/icons/full/obj16/field.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/function.svg b/org.eclipse.lsp4e/icons/full/obj16/function.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/function.svg rename to org.eclipse.lsp4e/icons/full/obj16/function.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/interface.svg b/org.eclipse.lsp4e/icons/full/obj16/interface.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/interface.svg rename to org.eclipse.lsp4e/icons/full/obj16/interface.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/keyword.svg b/org.eclipse.lsp4e/icons/full/obj16/keyword.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/keyword.svg rename to org.eclipse.lsp4e/icons/full/obj16/keyword.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/method.svg b/org.eclipse.lsp4e/icons/full/obj16/method.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/method.svg rename to org.eclipse.lsp4e/icons/full/obj16/method.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/module.svg b/org.eclipse.lsp4e/icons/full/obj16/module.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/module.svg rename to org.eclipse.lsp4e/icons/full/obj16/module.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/namespace.svg b/org.eclipse.lsp4e/icons/full/obj16/namespace.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/namespace.svg rename to org.eclipse.lsp4e/icons/full/obj16/namespace.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/null.svg b/org.eclipse.lsp4e/icons/full/obj16/null.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/null.svg rename to org.eclipse.lsp4e/icons/full/obj16/null.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/number.svg b/org.eclipse.lsp4e/icons/full/obj16/number.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/number.svg rename to org.eclipse.lsp4e/icons/full/obj16/number.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/package.svg b/org.eclipse.lsp4e/icons/full/obj16/package.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/package.svg rename to org.eclipse.lsp4e/icons/full/obj16/package.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/property.svg b/org.eclipse.lsp4e/icons/full/obj16/property.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/property.svg rename to org.eclipse.lsp4e/icons/full/obj16/property.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/reference.svg b/org.eclipse.lsp4e/icons/full/obj16/reference.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/reference.svg rename to org.eclipse.lsp4e/icons/full/obj16/reference.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/snippet.svg b/org.eclipse.lsp4e/icons/full/obj16/snippet.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/snippet.svg rename to org.eclipse.lsp4e/icons/full/obj16/snippet.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/text.svg b/org.eclipse.lsp4e/icons/full/obj16/text.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/text.svg rename to org.eclipse.lsp4e/icons/full/obj16/text.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/unit.svg b/org.eclipse.lsp4e/icons/full/obj16/unit.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/unit.svg rename to org.eclipse.lsp4e/icons/full/obj16/unit.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/value.svg b/org.eclipse.lsp4e/icons/full/obj16/value.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/value.svg rename to org.eclipse.lsp4e/icons/full/obj16/value.svg diff --git a/svg/org.eclipse.languageserver/icons/full/obj16/variable.svg b/org.eclipse.lsp4e/icons/full/obj16/variable.svg similarity index 100% rename from svg/org.eclipse.languageserver/icons/full/obj16/variable.svg rename to org.eclipse.lsp4e/icons/full/obj16/variable.svg diff --git a/org.eclipse.lsp4e/plugin.xml b/org.eclipse.lsp4e/plugin.xml index 703d482ab..0f387997a 100644 --- a/org.eclipse.lsp4e/plugin.xml +++ b/org.eclipse.lsp4e/plugin.xml @@ -974,7 +974,7 @@ + icon="platform:/plugin/org.eclipse.ui/icons/full/elcl16/collapseall.svg" /> + icon="icons/full/elcl16/link_to_editor.svg" /> diff --git a/org.eclipse.lsp4e/pom.xml b/org.eclipse.lsp4e/pom.xml index 7005fadd7..9a46415d2 100644 --- a/org.eclipse.lsp4e/pom.xml +++ b/org.eclipse.lsp4e/pom.xml @@ -10,7 +10,7 @@ org.eclipse.lsp4e eclipse-plugin - 0.19.4-SNAPSHOT + 0.19.5-SNAPSHOT diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ui/LSPImages.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ui/LSPImages.java index 8c47e3b63..88bb6bfcf 100644 --- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ui/LSPImages.java +++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/ui/LSPImages.java @@ -83,36 +83,36 @@ private LSPImages() { public static void initalize(ImageRegistry registry) { imageRegistry = registry; - declareRegistryImage(IMG_MODULE, OBJECT + "module.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_NAMESPACE, OBJECT + "namespace.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_PACKAGE, OBJECT + "package.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_CLASS, OBJECT + "class.png"); //$NON-NLS-1$ + declareRegistryImage(IMG_MODULE, OBJECT + "module.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_NAMESPACE, OBJECT + "namespace.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_PACKAGE, OBJECT + "package.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_CLASS, OBJECT + "class.svg"); //$NON-NLS-1$ declareRegistryImage(IMG_TYPE_PARAMETER, OBJECT + "type_parameter.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_METHOD, OBJECT + "method.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_PROPERTY, OBJECT + "property.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_FIELD, OBJECT + "field.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_CONSTRUCTOR, OBJECT + "constructor.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_ENUM, OBJECT + "enum.png"); //$NON-NLS-1$ + declareRegistryImage(IMG_METHOD, OBJECT + "method.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_PROPERTY, OBJECT + "property.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_FIELD, OBJECT + "field.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_CONSTRUCTOR, OBJECT + "constructor.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_ENUM, OBJECT + "enum.svg"); //$NON-NLS-1$ declareRegistryImage(IMG_ENUM_MEMBER, OBJECT + "enum_member.png"); //$NON-NLS-1$ declareRegistryImage(IMG_STRUCT, OBJECT + "struct.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_INTERACE, OBJECT + "interface.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_FUNCTION, OBJECT + "function.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_VARIABLE, OBJECT + "variable.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_CONSTANT, OBJECT + "constant.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_OBJECT, OBJECT + "object.png"); //$NON-NLS-1$ + declareRegistryImage(IMG_INTERACE, OBJECT + "interface.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_FUNCTION, OBJECT + "function.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_VARIABLE, OBJECT + "variable.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_CONSTANT, OBJECT + "constant.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_OBJECT, OBJECT + "object.png"); //$NON-NLS-1$ declareRegistryImage(IMG_STRING, OBJECT + "string.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_NUMBER, OBJECT + "number.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_BOOLEAN, OBJECT + "boolean.png"); //$NON-NLS-1$ + declareRegistryImage(IMG_NUMBER, OBJECT + "number.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_BOOLEAN, OBJECT + "boolean.svg"); //$NON-NLS-1$ declareRegistryImage(IMG_ARRAY, OBJECT + "array.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_NULL, OBJECT + "null.png"); //$NON-NLS-1$ + declareRegistryImage(IMG_NULL, OBJECT + "null.svg"); //$NON-NLS-1$ - declareRegistryImage(IMG_TEXT, OBJECT + "text.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_UNIT, OBJECT + "unit.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_VALUE, OBJECT + "value.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_KEYWORD, OBJECT + "keyword.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_SNIPPET, OBJECT + "snippet.png"); //$NON-NLS-1$ + declareRegistryImage(IMG_TEXT, OBJECT + "text.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_UNIT, OBJECT + "unit.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_VALUE, OBJECT + "value.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_KEYWORD, OBJECT + "keyword.svg"); //$NON-NLS-1$ + declareRegistryImage(IMG_SNIPPET, OBJECT + "snippet.svg"); //$NON-NLS-1$ declareRegistryImage(IMG_COLOR, OBJECT + "color.png"); //$NON-NLS-1$ - declareRegistryImage(IMG_REFERENCE, OBJECT + "reference.png"); //$NON-NLS-1$ + declareRegistryImage(IMG_REFERENCE, OBJECT + "reference.svg"); //$NON-NLS-1$ declareRegistryImage(IMG_SUPERTYPE, ACTION + "super_co.png"); //$NON-NLS-1$ declareRegistryImage(IMG_SUBTYPE, ACTION + "sub_co.png"); //$NON-NLS-1$ declareRegistryImage(IMG_TERMINATE_CO, OBJECT + "terminate_co.png"); //$NON-NLS-1$ @@ -176,9 +176,6 @@ public static ImageRegistry getImageRegistry() { } public static @Nullable Image imageFromSymbolKind(@Nullable SymbolKind kind) { - if (kind == null) { - return EMPTY_IMAGE; - } return switch (kind) { case Array -> getImage(IMG_ARRAY); case Boolean -> getImage(IMG_BOOLEAN); @@ -203,7 +200,8 @@ public static ImageRegistry getImageRegistry() { case TypeParameter -> getImage(IMG_TYPE_PARAMETER); case Variable -> getImage(IMG_VARIABLE); case Null -> getImage(IMG_NULL); - default -> EMPTY_IMAGE; // when the SymbolKind is out the cases above + case Event, Key, Operator -> EMPTY_IMAGE; + case null -> EMPTY_IMAGE; }; } @@ -230,7 +228,10 @@ public static ImageRegistry getImageRegistry() { case File -> getSharedImage(ISharedImages.IMG_OBJ_FILE); case Folder -> getSharedImage(ISharedImages.IMG_OBJ_FOLDER); case Reference -> getImage(IMG_REFERENCE); - default -> null; + case Constant -> getImage(IMG_CONSTANT); + case TypeParameter -> getImage(IMG_TYPE_PARAMETER); + case Event, Operator -> null; + case null -> null; }; } diff --git a/svg/org.eclipse.languageserver/icons/full/etool16/mark_occurrences.svg b/svg/org.eclipse.languageserver/icons/full/etool16/mark_occurrences.svg deleted file mode 100644 index ce440fbc9..000000000 --- a/svg/org.eclipse.languageserver/icons/full/etool16/mark_occurrences.svg +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - -