Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finalize boot-hint optics change

Browse Source
This commit is contained in:
BoykoAlex
2018-08-01 15:28:13 -04:00
parent cc756ba2d4
commit 819ae52acf
12 changed files with 11 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/icons/boot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

2
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/BootInlineAnnotation.java
View File

@@ -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);

4
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LanguageServerCommonsActivator.java
View File

@@ -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) {

3
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
View File

@@ -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);