Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.lsp4e/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions org.eclipse.lsp4e/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@
<image
commandId="org.eclipse.lsp4e.collapseAllOutline"
disabledIcon="platform:/plugin/org.eclipse.ui/icons/full/dlcl16/collapseall.png"
icon="platform:/plugin/org.eclipse.ui/icons/full/elcl16/collapseall.png" />
icon="platform:/plugin/org.eclipse.ui/icons/full/elcl16/collapseall.svg" />
<image
commandId="org.eclipse.lsp4e.toggleSortOutline"
disabledIcon="icons/full/dlcl16/alphab_sort_co.png"
Expand All @@ -986,7 +986,7 @@
<image
commandId="org.eclipse.lsp4e.toggleLinkWithEditor"
disabledIcon="icons/full/dlcl16/link_to_editor.png"
icon="icons/full/elcl16/link_to_editor.png" />
icon="icons/full/elcl16/link_to_editor.svg" />
</extension>

<!-- outline: register commands as toolbar buttons -->
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.lsp4e/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>
<artifactId>org.eclipse.lsp4e</artifactId>
<packaging>eclipse-plugin</packaging>
<version>0.19.4-SNAPSHOT</version>
<version>0.19.5-SNAPSHOT</version>

<build>
<plugins>
Expand Down
57 changes: 29 additions & 28 deletions org.eclipse.lsp4e/src/org/eclipse/lsp4e/ui/LSPImages.java
Original file line number Diff line number Diff line change
Expand Up @@ -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$
Expand Down Expand Up @@ -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);
Expand All @@ -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;
};
}

Expand All @@ -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;
};
}

Expand Down
224 changes: 0 additions & 224 deletions svg/org.eclipse.languageserver/icons/full/etool16/mark_occurrences.svg

This file was deleted.