From 37a84a1449ad0104e0100a9840a4aec5e86c80ff Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Mon, 25 Sep 2017 18:15:59 -0400 Subject: [PATCH 1/6] Allow quick fixes --- .../atom-commons/lib/jar-language-client.js | 11 +++++++++++ atom-extensions/atom-commons/package.json | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/atom-extensions/atom-commons/lib/jar-language-client.js b/atom-extensions/atom-commons/lib/jar-language-client.js index 10ee372f9..edfb288d6 100644 --- a/atom-extensions/atom-commons/lib/jar-language-client.js +++ b/atom-extensions/atom-commons/lib/jar-language-client.js @@ -20,6 +20,17 @@ export class JarLanguageClient extends AutoLanguageClient { this.serverLauncherJar = serverLauncherJar; } + getInitializeParams(projectPath, process) { + const initParams = super.getInitializeParams(projectPath, process); + initParams.capabilities = { + workspace: { + executeCommand: { + } + } + }; + return initParams; + } + startServerProcess () { // //TODO: Remove when debugging is over atom.config.set('core.debugLSP', true); diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json index 615a6c76d..f33cff919 100644 --- a/atom-extensions/atom-commons/package.json +++ b/atom-extensions/atom-commons/package.json @@ -1,6 +1,6 @@ { "name": "pivotal-atom-languageclient-commons", - "version": "0.0.8", + "version": "0.0.10", "description": "Atom language client commons for STS4 language servers", "repository": "https://github.com/spring-projects/sts4", "license": "MIT", @@ -8,7 +8,7 @@ "atom": ">=1.17.0" }, "dependencies": { - "atom-languageclient": "0.6.2", + "atom-languageclient": "0.6.4", "decompress": "^4.2.0", "portfinder": "^1.0.13", "remote-file-size": "^3.0.3", From 884d0c8555d6feaa75dee24ccd47f35179b48218 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Mon, 25 Sep 2017 18:23:46 -0400 Subject: [PATCH 2/6] Update atom packages to atom 1.21. Allow quick-fixes --- atom-extensions/atom-boot-java/package.json | 34 +++++++++++------- atom-extensions/atom-bosh/package.json | 34 +++++++++++------- .../atom-cf-manifest-yaml/package.json | 34 +++++++++++------- atom-extensions/atom-concourse/package.json | 35 ++++++++++++------- .../reconcile/ProblemSeverity.java | 1 + .../util/SimpleLanguageServer.java | 2 ++ 6 files changed, 92 insertions(+), 48 deletions(-) diff --git a/atom-extensions/atom-boot-java/package.json b/atom-extensions/atom-boot-java/package.json index b713a11f6..821a7fdfe 100644 --- a/atom-extensions/atom-boot-java/package.json +++ b/atom-extensions/atom-boot-java/package.json @@ -7,7 +7,7 @@ "icon": "icon.png", "license": "MIT", "engines": { - "atom": ">=1.17.0" + "atom": ">=1.21.0" }, "files": [ "lib/", @@ -17,7 +17,7 @@ "dependencies": { "atom-package-deps": "^4.6.0", "download": "^6.2.5", - "pivotal-atom-languageclient-commons": "0.0.8" + "pivotal-atom-languageclient-commons": "0.0.10" }, "devDependencies": { "coffeelint": "^1.10.1" @@ -35,9 +35,9 @@ "2.0.0": "consumeLinterV2" } }, - "nuclide-datatip.provider": { + "datatip": { "versions": { - "0.0.0": "consumeDatatip" + "0.1.0": "consumeDatatip" } } }, @@ -47,24 +47,34 @@ "2.0.0": "provideAutocomplete" } }, - "nuclide-code-format.provider": { + "code-actions": { "versions": { - "0.0.0": "provideCodeFormat" + "0.1.0": "provideCodeActions" } }, - "nuclide-definition-provider": { + "code-format.range": { "versions": { - "0.0.0": "provideDefinitions" + "0.1.0": "provideCodeFormat" } }, - "nuclide-find-references.provider": { + "code-highlight": { "versions": { - "0.0.0": "provideFindReferences" + "0.1.0": "provideCodeHighlight" } }, - "nuclide-outline-view": { + "definitions": { "versions": { - "0.0.0": "provideOutlines" + "0.1.0": "provideDefinitions" + } + }, + "find-references": { + "versions": { + "0.1.0": "provideFindReferences" + } + }, + "outline-view": { + "versions": { + "0.1.0": "provideOutlines" } } } diff --git a/atom-extensions/atom-bosh/package.json b/atom-extensions/atom-bosh/package.json index 993ce897a..5a4bf2dbf 100644 --- a/atom-extensions/atom-bosh/package.json +++ b/atom-extensions/atom-bosh/package.json @@ -7,7 +7,7 @@ "icon": "icon.png", "license": "MIT", "engines": { - "atom": ">=1.17.0" + "atom": ">=1.21.0" }, "files": [ "grammars/", @@ -19,7 +19,7 @@ "dependencies": { "atom-package-deps": "^4.6.0", "download": "^6.2.5", - "pivotal-atom-languageclient-commons": "0.0.8" + "pivotal-atom-languageclient-commons": "0.0.10" }, "configSchema": { "bosh": { @@ -66,9 +66,9 @@ "2.0.0": "consumeLinterV2" } }, - "nuclide-datatip.provider": { + "datatip": { "versions": { - "0.0.0": "consumeDatatip" + "0.1.0": "consumeDatatip" } } }, @@ -78,24 +78,34 @@ "2.0.0": "provideAutocomplete" } }, - "nuclide-code-format.provider": { + "code-actions": { "versions": { - "0.0.0": "provideCodeFormat" + "0.1.0": "provideCodeActions" } }, - "nuclide-definition-provider": { + "code-format.range": { "versions": { - "0.0.0": "provideDefinitions" + "0.1.0": "provideCodeFormat" } }, - "nuclide-find-references.provider": { + "code-highlight": { "versions": { - "0.0.0": "provideFindReferences" + "0.1.0": "provideCodeHighlight" } }, - "nuclide-outline-view": { + "definitions": { "versions": { - "0.0.0": "provideOutlines" + "0.1.0": "provideDefinitions" + } + }, + "find-references": { + "versions": { + "0.1.0": "provideFindReferences" + } + }, + "outline-view": { + "versions": { + "0.1.0": "provideOutlines" } } } diff --git a/atom-extensions/atom-cf-manifest-yaml/package.json b/atom-extensions/atom-cf-manifest-yaml/package.json index 71016234a..3afce4510 100644 --- a/atom-extensions/atom-cf-manifest-yaml/package.json +++ b/atom-extensions/atom-cf-manifest-yaml/package.json @@ -7,7 +7,7 @@ "icon": "icon.png", "license": "MIT", "engines": { - "atom": ">=1.17.0" + "atom": ">=1.21.0" }, "files": [ "grammars/", @@ -19,7 +19,7 @@ "dependencies": { "atom-package-deps": "^4.6.0", "download": "^6.2.5", - "pivotal-atom-languageclient-commons": "0.0.8" + "pivotal-atom-languageclient-commons": "0.0.10" }, "devDependencies": { "coffeelint": "^1.10.1" @@ -37,9 +37,9 @@ "2.0.0": "consumeLinterV2" } }, - "nuclide-datatip.provider": { + "datatip": { "versions": { - "0.0.0": "consumeDatatip" + "0.1.0": "consumeDatatip" } } }, @@ -49,24 +49,34 @@ "2.0.0": "provideAutocomplete" } }, - "nuclide-code-format.provider": { + "code-actions": { "versions": { - "0.0.0": "provideCodeFormat" + "0.1.0": "provideCodeActions" } }, - "nuclide-definition-provider": { + "code-format.range": { "versions": { - "0.0.0": "provideDefinitions" + "0.1.0": "provideCodeFormat" } }, - "nuclide-find-references.provider": { + "code-highlight": { "versions": { - "0.0.0": "provideFindReferences" + "0.1.0": "provideCodeHighlight" } }, - "nuclide-outline-view": { + "definitions": { "versions": { - "0.0.0": "provideOutlines" + "0.1.0": "provideDefinitions" + } + }, + "find-references": { + "versions": { + "0.1.0": "provideFindReferences" + } + }, + "outline-view": { + "versions": { + "0.1.0": "provideOutlines" } } } diff --git a/atom-extensions/atom-concourse/package.json b/atom-extensions/atom-concourse/package.json index f786fd6f5..601fc20d7 100644 --- a/atom-extensions/atom-concourse/package.json +++ b/atom-extensions/atom-concourse/package.json @@ -7,7 +7,7 @@ "icon": "icon.png", "license": "MIT", "engines": { - "atom": ">=1.17.0" + "atom": ">=1.21.0" }, "files": [ "grammars/", @@ -19,7 +19,7 @@ "dependencies": { "atom-package-deps": "^4.6.0", "download": "^6.2.5", - "pivotal-atom-languageclient-commons": "0.0.8" + "pivotal-atom-languageclient-commons": "0.0.10" }, "devDependencies": { "coffeelint": "^1.10.1" @@ -37,9 +37,9 @@ "2.0.0": "consumeLinterV2" } }, - "nuclide-datatip.provider": { + "datatip": { "versions": { - "0.0.0": "consumeDatatip" + "0.1.0": "consumeDatatip" } } }, @@ -49,25 +49,36 @@ "2.0.0": "provideAutocomplete" } }, - "nuclide-code-format.provider": { + "code-actions": { "versions": { - "0.0.0": "provideCodeFormat" + "0.1.0": "provideCodeActions" } }, - "nuclide-definition-provider": { + "code-format.range": { "versions": { - "0.0.0": "provideDefinitions" + "0.1.0": "provideCodeFormat" } }, - "nuclide-find-references.provider": { + "code-highlight": { "versions": { - "0.0.0": "provideFindReferences" + "0.1.0": "provideCodeHighlight" } }, - "nuclide-outline-view": { + "definitions": { "versions": { - "0.0.0": "provideOutlines" + "0.1.0": "provideDefinitions" + } + }, + "find-references": { + "versions": { + "0.1.0": "provideFindReferences" + } + }, + "outline-view": { + "versions": { + "0.1.0": "provideOutlines" } } } + } diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java index 15a6c9947..004bab450 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java @@ -19,6 +19,7 @@ public enum ProblemSeverity { IGNORE, INFO, WARNING, + HINT, ERROR; } diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java index d76497ad0..3bbfcadeb 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java @@ -428,6 +428,8 @@ public abstract class SimpleLanguageServer implements LanguageServer, LanguageCl return DiagnosticSeverity.Warning; case INFO: return DiagnosticSeverity.Information; + case HINT: + return DiagnosticSeverity.Hint; case IGNORE: return null; default: From 1677134bf0293fcaf150c4a09e7323f77b38ca13 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Tue, 26 Sep 2017 11:54:21 +0200 Subject: [PATCH 3/6] updated product id to match plugin id + some extra bits --- .../org.springframework.boot.ide.branding/plugin.xml | 2 +- .../org.springframework.boot.ide.product | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/plugin.xml b/eclipse-distribution/org.springframework.boot.ide.branding/plugin.xml index b0b8f241f..e57cdb141 100644 --- a/eclipse-distribution/org.springframework.boot.ide.branding/plugin.xml +++ b/eclipse-distribution/org.springframework.boot.ide.branding/plugin.xml @@ -2,7 +2,7 @@ - + diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product index e7a2dc2f8..443c15599 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product +++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product @@ -1,12 +1,12 @@ - + - -product org.springframework.boot.ide + -product org.springframework.boot.ide.branding.sts4 --launcher.defaultAction openFile -Dosgi.requiredJavaVersion=1.8 From 7099d7781722df3b6d71c5ffe6deb5520255a17a Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Tue, 26 Sep 2017 11:54:56 +0200 Subject: [PATCH 4/6] updated product-based p2 repo to include updated category names --- .../category.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml index 13fe52d93..f90833096 100644 --- a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml +++ b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml @@ -1,7 +1,7 @@ - - The Spring Boot Tool Suite description + + Spring Tool Suite 4 @@ -43,36 +43,36 @@ - + - + - + - + - + - + - + From e8ff84003e7f8d49917e69f4ed91aee4c8ef332e Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Tue, 26 Sep 2017 13:27:08 +0200 Subject: [PATCH 5/6] updated remaining product id usages --- .../org.springframework.boot.ide.product.e47/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml index 517984a12..05241cd15 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml @@ -74,7 +74,7 @@ - org.springframework.boot.ide + org.springframework.boot.ide.branding.sts4 sts-${unqualifiedVersion}.${p2.qualifier} SpringToolSuite4.app @@ -110,7 +110,7 @@ - + From 4e8d6f154ecb46d51e4841e9591541cc34561be9 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Tue, 26 Sep 2017 15:19:30 +0200 Subject: [PATCH 6/6] updated remaining product id usages --- .../spring-tool-suite-4-dmg-config-e4.7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json b/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json index 77593155c..e92ee67f1 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json +++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/spring-tool-suite-4-dmg-config-e4.7.json @@ -2,7 +2,7 @@ "title": "Spring Tool Suite 4", "icon": "../org.springframework.boot.ide.branding/sts.icns", "contents": [ - { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide/macosx/cocoa/x86_64/SpringToolSuite4.app" }, + { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app" }, { "x": 448, "y": 100, "type": "link", "path": "/Applications" }, { "x": 1000, "y": 2000, "type": "file", "path": "../org.springframework.boot.ide.branding/sts.icns", "name": ".VolumeIcon.icns" } ],