diff --git a/atom-extensions/atom-spring-boot/lib/boot-sts-adapter.ts b/atom-extensions/atom-spring-boot/lib/boot-sts-adapter.ts index 2c0bb9532..37f036a5e 100644 --- a/atom-extensions/atom-spring-boot/lib/boot-sts-adapter.ts +++ b/atom-extensions/atom-spring-boot/lib/boot-sts-adapter.ts @@ -8,10 +8,9 @@ const BOOT_HINT_GUTTER_NAME = 'boot-hint-gutter'; const DECORATION_OPTIONS: DecorationOptions = { type: 'highlight', class: 'boot-hint', - // gutterName: BOOT_HINT_GUTTER_NAME + gutterName: BOOT_HINT_GUTTER_NAME }; - export class BootStsAdapter extends StsAdapter { constructor() { @@ -24,10 +23,6 @@ export class BootStsAdapter extends StsAdapter { private markHintsForEditor(editor: TextEditor, ranges: Range[]) { editor.getDecorations(DECORATION_OPTIONS).map(decoration => decoration.getMarker()).forEach(m => m.destroy()); - editor.getDecorations({ - type: 'block', - class: 'boot-hint-icon' - }).map(decoration => decoration.getMarker()).forEach(m => m.destroy()); if (Array.isArray(ranges)) { ranges.forEach(range => this.createHintMarker(editor, range)); } @@ -42,30 +37,12 @@ export class BootStsAdapter extends StsAdapter { } private createHintMarker(editor: TextEditor, range: Range) { - // Create marker model const marker = editor.markBufferRange(Convert.lsRangeToAtomRange(range)); // Marker around the text in the editor editor.decorateMarker(marker, DECORATION_OPTIONS); - const element = document.createElement('img'); - // element.textContent = '🐲'; - element.src = 'atom://spring-boot/styles/boot-icon.png'; - - const AUX_DECORATION_OPTIONS: DecorationOptions = { - type: 'block', - position: 'before', - item: element, - class: 'boot-hint-icon' - }; - const auxMarker = editor.markBufferRange(Convert.lsRangeToAtomRange({ - start: range.start, - end: range.start - })); - - editor.decorateMarker(auxMarker, AUX_DECORATION_OPTIONS); - // Marker in the diagnostic gutter let gutter = editor.gutterWithName(BOOT_HINT_GUTTER_NAME); if (!gutter) { diff --git a/atom-extensions/atom-spring-boot/styles/hints.atom-text-editor.less b/atom-extensions/atom-spring-boot/styles/hints.atom-text-editor.less index 1514f6461..3a4ace587 100644 --- a/atom-extensions/atom-spring-boot/styles/hints.atom-text-editor.less +++ b/atom-extensions/atom-spring-boot/styles/hints.atom-text-editor.less @@ -3,27 +3,11 @@ border-color: rgba(109,179,63,0.25); border-radius: 4px; border-spacing: 4px; + //border-color: #32BA56; + //border-style: dotted; + //border-width: 1px; } -.boot-hint-icon { - //background-image: url("atom://spring-boot/styles/boot-icon.png"); - //width: 10px; - //height: 10px; - display: inline; -} - -//.boot-hint .region::before { -// content: url("atom://spring-boot/styles/boot-icon.png"); -// display: block; -//} - -//before: { -// contentIconPath: path.resolve(__dirname, "../icons/boot-12.png"), -// margin: '0px 2px 0px 0px', -// height: '18pt' -//}, - - atom-text-editor.editor { .gutter-boot-hint:before { content: url("atom://spring-boot/styles/boot-icon.png"); diff --git a/vscode-extensions/commons-vscode/icons/boot.png b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/icons/boot.png similarity index 100% rename from vscode-extensions/commons-vscode/icons/boot.png rename to eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/icons/boot.png diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/BootInlineAnnotation.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/BootInlineAnnotation.java index 3120dd27f..eb5fdc71d 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/BootInlineAnnotation.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/BootInlineAnnotation.java @@ -39,7 +39,7 @@ public class BootInlineAnnotation extends LineContentAnnotation { FontMetrics fontMetrics = gc.getFontMetrics(); int height = fontMetrics.getHeight(); - Image bootImage = LanguageServerCommonsActivator.getInstance().getImageRegistry().get(LanguageServerCommonsActivator.BOOT_ICON_2X_KEY); + Image bootImage = LanguageServerCommonsActivator.getInstance().getImageRegistry().get(LanguageServerCommonsActivator.BOOT_KEY); Rectangle bootImgBounds = bootImage.getBounds(); int width = (int) Math.round(bootImgBounds.width / (double) bootImgBounds.height * height); diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LanguageServerCommonsActivator.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LanguageServerCommonsActivator.java index 382f95889..519652e5d 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LanguageServerCommonsActivator.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LanguageServerCommonsActivator.java @@ -26,7 +26,7 @@ public class LanguageServerCommonsActivator extends AbstractUIPlugin { public static final String PLUGIN_ID = "org.springframework.tooling.ls.eclipse.commons"; - public static final String BOOT_ICON_2X_KEY = "boot-icon-key"; + public static final String BOOT_KEY = "boot-key"; private static LanguageServerCommonsActivator instance; @@ -37,7 +37,7 @@ public class LanguageServerCommonsActivator extends AbstractUIPlugin { public void start(BundleContext context) throws Exception { instance = this; super.start(context); - getImageRegistry().put(BOOT_ICON_2X_KEY, getImageDescriptor("icons/boot-icon@2x.png")); + getImageRegistry().put(BOOT_KEY, getImageDescriptor("icons/boot.png")); } public final static ImageDescriptor getImageDescriptor(String path) { diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java index f084f9229..cca0bd791 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java @@ -188,7 +188,8 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La for (Range rng : highlights) { try { int start = LSPEclipseUtils.toOffset(rng.getStart(), doc); - Position colorPos = new Position(start, 0); + int end = LSPEclipseUtils.toOffset(rng.getEnd(), doc); + Position colorPos = new Position(start, end - start); BootInlineAnnotation colorAnnotation = support.findExistingAnnotation(colorPos); if (colorAnnotation == null) { colorAnnotation = new BootInlineAnnotation(colorPos, sourceViewer); diff --git a/headless-services/spring-boot-language-server/build.sh b/headless-services/spring-boot-language-server/build.sh index 9c5bf4644..995aac236 100755 --- a/headless-services/spring-boot-language-server/build.sh +++ b/headless-services/spring-boot-language-server/build.sh @@ -4,4 +4,4 @@ set -e -f ../pom.xml \ -pl spring-boot-language-server \ -am \ - clean install -DskipTests + clean install diff --git a/vscode-extensions/commons-vscode/icons/boot-12.png b/vscode-extensions/commons-vscode/icons/boot-12.png deleted file mode 100644 index aeabf950b..000000000 Binary files a/vscode-extensions/commons-vscode/icons/boot-12.png and /dev/null differ diff --git a/vscode-extensions/commons-vscode/icons/boot-12h.png b/vscode-extensions/commons-vscode/icons/boot-12h.png new file mode 100644 index 000000000..3e4d5295a Binary files /dev/null and b/vscode-extensions/commons-vscode/icons/boot-12h.png differ diff --git a/vscode-extensions/commons-vscode/icons/boot-16.png b/vscode-extensions/commons-vscode/icons/boot-16.png deleted file mode 100644 index 15035059d..000000000 Binary files a/vscode-extensions/commons-vscode/icons/boot-16.png and /dev/null differ diff --git a/vscode-extensions/commons-vscode/icons/boot-icon.svg b/vscode-extensions/commons-vscode/icons/boot-icon.svg deleted file mode 100644 index 3183d7108..000000000 --- a/vscode-extensions/commons-vscode/icons/boot-icon.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - Asset 1 - - \ No newline at end of file diff --git a/vscode-extensions/commons-vscode/src/highlight-service.ts b/vscode-extensions/commons-vscode/src/highlight-service.ts index a6e4b4310..e55545b4c 100644 --- a/vscode-extensions/commons-vscode/src/highlight-service.ts +++ b/vscode-extensions/commons-vscode/src/highlight-service.ts @@ -27,12 +27,8 @@ export class HighlightService { constructor() { this.DECORATION = VSCode.window.createTextEditorDecorationType({ - // textDecoration: "underline", - // gutterIconPath: path.resolve(__dirname, "../icons/boot-icon.png"), - // gutterIconSize: "contain", - // outline: "#32BA56 dotted thin", before: { - contentIconPath: path.resolve(__dirname, "../icons/boot-12.png"), + contentIconPath: path.resolve(__dirname, "../icons/boot-12h.png"), margin: '2px 2px 0px 0px' }, backgroundColor: 'rgba(109,179,63,0.25)',