From 819ae52acf6ad3ec40117c097de466b2ba16d03f Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Wed, 1 Aug 2018 15:28:13 -0400 Subject: [PATCH] Finalize boot-hint optics change --- .../atom-spring-boot/lib/boot-sts-adapter.ts | 25 +----------------- .../styles/hints.atom-text-editor.less | 22 +++------------ .../icons/boot.png | Bin .../eclipse/commons/BootInlineAnnotation.java | 2 +- .../LanguageServerCommonsActivator.java | 4 +-- .../commons/STS4LanguageClientImpl.java | 3 ++- .../spring-boot-language-server/build.sh | 2 +- .../commons-vscode/icons/boot-12.png | Bin 1996 -> 0 bytes .../commons-vscode/icons/boot-12h.png | Bin 0 -> 696 bytes .../commons-vscode/icons/boot-16.png | Bin 2376 -> 0 bytes .../commons-vscode/icons/boot-icon.svg | 8 ------ .../commons-vscode/src/highlight-service.ts | 6 +---- 12 files changed, 11 insertions(+), 61 deletions(-) rename {vscode-extensions/commons-vscode => eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons}/icons/boot.png (100%) delete mode 100644 vscode-extensions/commons-vscode/icons/boot-12.png create mode 100644 vscode-extensions/commons-vscode/icons/boot-12h.png delete mode 100644 vscode-extensions/commons-vscode/icons/boot-16.png delete mode 100644 vscode-extensions/commons-vscode/icons/boot-icon.svg 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 aeabf950b994c68c8397efbd2d6ebc081d638bec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1996 zcmeHHdpOg382?ReP71qdNG4Zhg0M>$uE-t=A0s#Q*dW!Jj`#0e=o!ZFphClY=4qBf~ zu5nf|QaK-BUBzzA92r3#qPrspxA0>`pL#Do?X|ONTdwlK_);vV%Qd_1w`3U@FRBeW zvCV&0G#czTFm_^p&GF@*t`?LzSd|f58%JY5QRXiRFQY;Jy~Hl!-hPtPR0)>97Yqm+6pbj+nQJ>vH_BP+~?7FRtjgCqLU%^z!& zXlFp5uj6}CK*z-;`p(lKKZv6FEtb2w%#YvU65c%|J7p9RezpBp7ii~Um4RWR~Qv0F|je?as9eH z>drA;r3w=VNYvY##)s(TCF;(Qv%{l|o7L(KBF64U;V zDGGl+mkyVgUb|45qt%r|%dB$UE#ghAG!E}uzeYC!_Q5^V?A$M^q2`m}q-uVjhqAV9 zzrF`lAkM~CuA-YyCuQ9XhSd8N7WoXq?@kMr{JML!DNM>qWPNrfN2Pfk*!ZGFe!HSq z&>Hm^<6V$3=)nHk990NHvq4k$R76#r_D0?V$2k_rEsvvlRjlZc$9JH6~3G5Jm> zpiMAoF$?-ScDDXx7(v51!_-#Jd8@9$hTn7genPm5N{%2vThdNBdWp_&YSM@iiU;-` z#QfxF`*!(Wp%u2e95Z6iZmW!3wc6nshI_{{RlS{O*t1;%4sVw}if9a*GPU))J)wK4 zHL!OnVo4xHh)kpjSI0Bo2hO%6Jq~%^*5vtc=3o#x6%QjpCZV5SmUS0&>&+jTeIKai znn8bB#=E%??ihU7Ox2Zj0W3~f3efc~LbDcf7V_Dq?c1ov%a7V$P@hp>POH1!aOWwEFGGr(-J>LKfv0z+3=v&574AeB-bwrF}F=wfw0GKAe-JG zkU*K{mv`!^67)Y_mxOW50zd_lM!5yA6+GU5DzS9CUcg~5JI-#6!XI5?3QLjxU+x6X zS8e&(=L43w9_N75sBP@ut(MLLJWCswrj zIRXGE&)3r*6WC}S#74?2pvmU1%|By6^WRs^-!lKV|F#3GtE&gpIZd)rQIfIVI2nGo zP-EPk>uRJk%Pd9TMRDJopm)6zk-rw_ichEgLywvc?PKCkZf!%zv0EOq63WNdZo;9R z;{w-#Dc&%K`}NV%Fq%7^CYHodzAUB?rIHNj{Xt*sQD59>rw(>eP zCZn#oqj&o&ydy+LYOZI2K%1ks#zCO!FBve)BLxhY`}P0`lBgSOp9aPl#cJVGAU2CI z6)!kRFT5Q_T?273BxvBQ$Vwh22R4R6+CtLh_il^V4z&G(QiJq`m><@Ua9+)NP|1kQ zJNw(OpJ`9THT;VMcaG)db}_ELFYRY96y`lQg%rj;(#qe`24!uD pLLlK5)+h^$EM_+MI|1o%3^6Y4-vzUs_Te%C;EwS|-`Ep*;!iU*g+KrR 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 0000000000000000000000000000000000000000..3e4d5295afb12eef9f4d93ab41801b7f0e2c1f98 GIT binary patch literal 696 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^@!3-o*<7!?2DVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^T3dz%_P8LEKrS&T6|4-R5m|luUZ`ovf6v}hBlm=7=0UgO%f1EY zyfgN><{bCPKkb!$)IIx{N8TyVtV8aZ2i!6bx#a;BA8{|b2<%06}FRr zAsbK<A?v9wR> z@!davW}5we`r&Zc^Iy3iBU;v&80G!^7pu8)aX{*}khtXbtqYR)H@E|1k71{$i(?4K zb>6eAPE3vrtQYvX&*;f=t!OFHP+Z}mCFFHJ=fc88Lf`Ef_Hf%UJe)CO+S4f&ubY_V zj!2p-ryN_$T)^ZxH>BqEbnc(>al8tLd3v9@uU}+VhMZ!4D)v{^UmaO+v85H6v~D--S+nwfJ4YqH$G`{d@2yzSg>dl&6y`V${r zdorc!ROjl~#Vrro`YP*umd@sOU^WlT)Vx|Xefott3}+N%pVsI(_=bFM9O0XzfMqDXl8Cl^{`+s!(cAL{Lh_QmNR>Q+rWM(JGA!ZRqQ0Yk7(& zwN@?lD30>fQhPOoC$+pFiDWV}@6372%$fOT{+oNg_q(0%=X>t?-g|DQqx~fzep!A1 z0EDcq;0TTt<80Bx+#IbjF&7K~hj;?b%^d?V7yvLB$U%8tmq$sMv_u3bof<+0>7_-! zFcnf3%6HK#BQ+<^%s_+j*3hYwE55Xip+`Rs8R)hglsQ;9#_3RsCAvErlN42d5t%k2 zoqfo!JT<1MYC_seaa_4uzE)(UTNKz_JL|U*xBZy)&)#ZUz^#7uiWv$1*dMC ziU&kX=HbN~xcJxd^V9g^yrZVP_dm}PYRZpN;T~1fd=>4)XVnc^Clbi1&~1%H&5U6f zxgXg%QCX4SQ_>mL-Kg)rwPkeZZD#Wo!sh#M1`hdTi@Z$HCk({Kz?t;c7%N(QIPu)i zt8pvasd!C3=3fd6QjT?}WF(eZn$gIMtlH0)MY(0Lvdh+qS`WS#zH)ZS6IZ@6Y$GTI z8&j~6T%#u=O4;!GyWvSSZoHLF**OkVnr|p;`%XPWQgOt%G-zdVV!KfN5gye?+Uafl zcCOq^BXO)O^!T zZcEn5GIOgWNBuS{(>yTZrU@D_F4NO8iei%~!&f2Jw7f6~=wwWmu^la6zE0eiN}sqK zWO3CPHh$2Wt&1oxwwO6bYAN+*>#Es$AU{=U2*19gG;oH&TJ8#gIpt`QL;GRCCP6iMLn54;O(%@FK7|V z1pJRhqIIc+A^5i4baS1dwU|o+@bXE? z@0Eh3hx_?vc?`Bwr|PCV!Fg730`p_L>$DC!XkmaUf-1jEixd@VA}WY_`!Wsu|~1HAf=sksSNyCEvhcygAO5#$si0 zL&@yE4-~^AFUXCXHmGkTN;N<7mvx78Uo0HvbPBnZ8ErWZmEcW{zy{;7QL( zI(^(lWvm~JqOqH_l`dPI&}-jy=dV~Q4#GWIt`RU;T{GrRXR)%m!OhHrHpMOh%sA)h zARn7c@E(kSdNe0E5^CiZ0RRHxf7>8{P$JDq@+jkXO+3YuvBmqEa+Z_AWYt9l1M&5!PikP+@SGJw);0H~OYT$;PnOI#zY;AOCWO!8A&4}IaXggx3LlpMt z`+SFZdD2twq+L>kWIe@*%1N;a_a7CMJRsn6vu*o*YU?7x^9sEjGoCJrwLV11I9_$i zte_C4cAM$ErFjIx$j7O17AP(%GV12{&kO1Fg}jm4%}i@=ECKHCuLJ9N)kJEo zYwq=qH!tXhHUj>!0ns7sc>x1sF_i}fCJWEB1p^$0Pfg|^$Wn#uN%SY!#}aklVCqKV zVAoQ<#t5vy{B~Do`@m<;)RZGFTqAw2Mfw?H!u>b~fN1L&XllbWb#$F|^bPfN3?WcW nZ9PM6?IdFI!tVfFh;N{O%)bXV-<|X10D!fHJ^Y7@-nah>;1N5k 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)',