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

Merge branch 'master' into live-hovers-v2

Browse Source
This commit is contained in:
Martin Lippert
2019-09-24 14:57:27 +02:00
parent 66c95991a9 79e7f66b2e
commit 1c02fe4ea7
117 changed files with 375 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom-extensions/atom-bosh/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "bosh-yaml",
"version": "1.11.0",
"version": "1.12.0",
"description": "Provides validation and content assist for various Bosh configuration files",
"repository": "https://github.com/spring-projects/atom-bosh",
"icon": "icon.png",

2
atom-extensions/atom-cf-manifest-yaml/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "cf-manifest-yaml",
"version": "1.11.0",
"version": "1.12.0",
"description": "Cloud Foundry Deployment Manifest YAML support for Atom",
"repository": "https://github.com/spring-projects/atom-cf-manifest-yaml",
"icon": "icon.png",

2
atom-extensions/atom-concourse/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "concourse-pipeline-yaml",
"version": "1.11.0",
"version": "1.12.0",
"description": "Provides validation and content assist for Concourse CI pipeline and task configuration yml files",
"repository": "https://github.com/spring-projects/atom-concourse",
"icon": "icon.png",

2
atom-extensions/atom-spring-boot/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "spring-boot",
"version": "1.11.0",
"version": "1.12.0",
"description": "Spring Boot support for Atom",
"repository": "https://github.com/spring-projects/atom-spring-boot",
"icon": "icon.png",

2
eclipse-distribution/org.springframework.boot.ide.branding.feature/feature.xml
View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.boot.ide.branding.feature"
label="Spring Tool Suite 4 Branding Feature"
version="4.4.0.qualifier"
version="4.4.1.qualifier"
provider-name="Pivotal, Inc.">
<plugin

2
eclipse-distribution/org.springframework.boot.ide.branding.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-distribution/org.springframework.boot.ide.branding/META-INF/MANIFEST.MF
View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.springframework.boot.ide.branding;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.ui,
org.eclipse.equinox.p2.ui,

2
eclipse-distribution/org.springframework.boot.ide.branding/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.4.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.4.1.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>

2
eclipse-distribution/org.springframework.boot.ide.product.e410/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-distribution/org.springframework.boot.ide.product.e411/org.springframework.boot.ide.product
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.4.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.4.1.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>

2
eclipse-distribution/org.springframework.boot.ide.product.e411/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml
View File

@@ -144,7 +144,7 @@
<category name="Uncategorized"/>
</bundle>
<feature id="tm-feature">
<feature id="org.eclipse.tm4e.feature">
<category name="Uncategorized"/>
</feature>

2
eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.4.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.4.1.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>

2
eclipse-distribution/org.springframework.boot.ide.product.e412/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-distribution/org.springframework.boot.ide.product.e413/category.xml
View File

@@ -138,7 +138,7 @@
<category name="Uncategorized"/>
</bundle>
<feature id="tm-feature">
<feature id="org.eclipse.tm4e.feature">
<category name="Uncategorized"/>
</feature>

2
eclipse-distribution/org.springframework.boot.ide.product.e413/org.springframework.boot.ide.product
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.4.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.4.1.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>

2
eclipse-distribution/org.springframework.boot.ide.product.e413/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.4.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.4.1.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>

2
eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

10
eclipse-distribution/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<organization>
@@ -71,12 +71,12 @@
<dist.pathpostfix>nightly</dist.pathpostfix>
<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix}</dist.path>
<eclipsecommons-p2-repo>https://dist.springsource.com/snapshot/TOOLS/eclipse-integration-commons/nightly</eclipsecommons-p2-repo>
<springide-p2-repo>https://dist.springframework.org/snapshot/IDE/nightly</springide-p2-repo>
<!-- <eclipsecommons-p2-repo>https://dist.springsource.com/snapshot/TOOLS/eclipse-integration-commons/nightly</eclipsecommons-p2-repo>
<springide-p2-repo>https://dist.springframework.org/snapshot/IDE/nightly</springide-p2-repo> -->
<!-- <eclipsecommons-p2-repo>https://dist.springsource.com/milestone/TOOLS/eclipse-integration-commons/3.9.7.RC1/</eclipsecommons-p2-repo>
<springide-p2-repo>https://dist.springframework.org/milestone/IDE/3.9.7.RC1</springide-p2-repo> -->
<!-- <eclipsecommons-p2-repo>https://dist.springsource.com/release/TOOLS/eclipse-integration-commons/3.9.9.RELEASE/</eclipsecommons-p2-repo>
<springide-p2-repo>https://dist.springframework.org/release/IDE/3.9.9.RELEASE</springide-p2-repo> -->
<eclipsecommons-p2-repo>https://dist.springsource.com/release/TOOLS/eclipse-integration-commons/3.9.10.RELEASE/</eclipsecommons-p2-repo>
<springide-p2-repo>https://dist.springframework.org/release/IDE/3.9.10.RELEASE</springide-p2-repo>
<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>

2
eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.boot.ide.main.feature"
label="Spring Tool Suite 4 Main Feature"
version="4.4.0.qualifier"
version="4.4.1.qualifier"
provider-name="Pivotal, Inc.">
<description>

2
eclipse-extensions/org.springframework.boot.ide.main.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../../eclipse-distribution/pom.xml</relativePath>
</parent>

2
eclipse-language-servers/org.springframework.tooling.boot.ls.feature/feature.xml
View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.tooling.boot.ls.feature"
label="Spring Boot Language Server Feature"
version="4.4.0.qualifier"
version="4.4.1.qualifier"
provider-name="Pivotal, Inc.">
<description>

2
eclipse-language-servers/org.springframework.tooling.boot.ls.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
View File

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Spring Boot Language Server
Bundle-Vendor: Pivotal, Inc.
Bundle-SymbolicName: org.springframework.tooling.boot.ls;singleton:=true
Bundle-Version: 1.11.0.qualifier
Bundle-Version: 1.12.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
org.eclipse.core.runtime;bundle-version="3.12.0",

4
eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
View File

@@ -7,12 +7,12 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.tooling.boot.ls</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>

2
eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/feature.xml
View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.tooling.bosh.ls.feature"
label="BOSH Language Server Feature"
version="4.4.0.qualifier"
version="4.4.1.qualifier"
provider-name="Pivotal, Inc.">
<description>

2
eclipse-language-servers/org.springframework.tooling.bosh.ls.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-language-servers/org.springframework.tooling.bosh.ls/META-INF/MANIFEST.MF
View File

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: BOSH Manifest Language Server
Bundle-Vendor: Pivotal, Inc.
Bundle-SymbolicName: org.springframework.tooling.bosh.ls;singleton:=true
Bundle-Version: 1.11.0.qualifier
Bundle-Version: 1.12.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
org.eclipse.core.runtime;bundle-version="3.12.0",

4
eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml
View File

@@ -7,12 +7,12 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.tooling.bosh.ls</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>

2
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml
View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.tooling.cloudfoundry.manifest.ls.feature"
label="%featureName"
version="4.4.0.qualifier"
version="4.4.1.qualifier"
provider-name="%providerName">
<description>

2
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/feature.xml
View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature"
label="Cloud Foundry Manifest Language Server Generic Editor Integration Feature"
version="4.4.0.qualifier"
version="4.4.1.qualifier"
provider-name="Pivotal, Inc.">
<description>

2
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/META-INF/MANIFEST.MF
View File

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Cloud Foundry Manifest Language Server Generic Editor Integration
Bundle-Vendor: Pivotal, Inc.
Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls.integration;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
org.eclipse.core.runtime;bundle-version="3.12.0",

2
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
View File

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Cloud Foundry Manifest Language Server
Bundle-Vendor: Pivotal, Inc.
Bundle-SymbolicName: org.springframework.tooling.cloudfoundry.manifest.ls;singleton:=true
Bundle-Version: 1.11.0.qualifier
Bundle-Version: 1.12.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
org.eclipse.core.runtime;bundle-version="3.12.0",

4
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml
View File

@@ -7,12 +7,12 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.tooling.cloudfoundry.manifest.ls</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>

2
eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/feature.xml
View File

@@ -2,7 +2,7 @@
<feature
id="org.springframework.tooling.concourse.ls.feature"
label="Concourse Pipeline Language Server Feature"
version="4.4.0.qualifier"
version="4.4.1.qualifier"
provider-name="Pivotal, Inc.">
<description>

2
eclipse-language-servers/org.springframework.tooling.concourse.ls.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-language-servers/org.springframework.tooling.concourse.ls/META-INF/MANIFEST.MF
View File

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Concourse Pipeline Language Server
Bundle-Vendor: Pivotal, Inc.
Bundle-SymbolicName: org.springframework.tooling.concourse.ls;singleton:=true
Bundle-Version: 1.11.0.qualifier
Bundle-Version: 1.12.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
org.eclipse.core.runtime;bundle-version="3.12.0",

4
eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml
View File

@@ -7,12 +7,12 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.springframework.tooling.concourse.ls</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>

2
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Language Server Commons
Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.commons;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Vendor: Pivotal, Inc.
Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
org.eclipse.ui,

2
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

4
eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
View File

@@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Goto Symbol Popup
Bundle-SymbolicName: org.springframework.tooling.ls.eclipse.gotosymbol;singleton:=true
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.workbench.texteditor,
org.eclipse.lsp4e;bundle-version="0.9.0",
org.eclipse.lsp4e;bundle-version="0.12.0",
org.eclipse.lsp4j;bundle-version="0.6.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.6.0",
org.eclipse.jface.text;bundle-version="3.12.0",

2
eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

7
eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java
View File

@@ -24,8 +24,8 @@ import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.resource.JFaceColors;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
import org.eclipse.jface.viewers.ISelection;
@@ -55,7 +55,6 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.TreeItem;
@@ -103,13 +102,13 @@ public class GotoSymbolDialog extends PopupDialog {
private Stylers stylers;
private SymbolsLabelProvider symbolsLabelProvider;
public GotoSymbolsLabelProvider(Font base) {
public GotoSymbolsLabelProvider(Font base) {
stylers = new Stylers(base);
boolean showSymbolsLabelProviderLocation = false; /* dont show full location. we show relative location in our own implementation below */
boolean showKindInformation = false;
symbolsLabelProvider = new SymbolsLabelProvider(showSymbolsLabelProviderLocation , showKindInformation) {
@Override
protected int getMaxSeverity(IResource resource, Range range)
protected int getMaxSeverity(IResource resource, IDocument doc, Range range)
throws CoreException, BadLocationException {
int maxSeverity = -1;
for (IMarker marker : resource.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO)) {

2
eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
View File

@@ -52,7 +52,7 @@
<category name="deps"/>
</bundle>
<feature id="tm-feature">
<feature id="org.eclipse.tm4e.feature">
<category name="deps"/>
</feature>

2
eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
eclipse-language-servers/org.springframework.tooling.ls.repository/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

49
eclipse-language-servers/pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>org.springframework.boot.ide</groupId>
<artifactId>org.springframework.boot.ide.servers</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<packaging>pom</packaging>
<organization>
@@ -185,16 +185,16 @@
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository</url>
</repository>
<!-- <repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>https://dist.springframework.org/release/IDE/3.9.9.RELEASE</url>
</repository> -->
<repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
<url>https://dist.springframework.org/release/IDE/3.9.10.RELEASE</url>
</repository>
<!-- <repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
</repository> -->
<repository>
<id>lsp4e</id>
<layout>p2</layout>
@@ -225,26 +225,21 @@
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2019-06/</url>
</repository>
<!-- <repository>
<id>2019-06-staging</id>
<layout>p2</layout>
<url>https://download.eclipse.org/staging/2019-06/</url>
</repository> -->
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository</url>
</repository>
<!-- <repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>https://dist.springframework.org/release/IDE/3.9.9.RELEASE</url>
</repository> -->
<repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
<url>https://dist.springframework.org/release/IDE/3.9.10.RELEASE</url>
</repository>
<!-- <repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
</repository> -->
<repository>
<id>lsp4e</id>
<layout>p2</layout>
@@ -275,26 +270,26 @@
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2019-09/</url>
</repository>
<!-- <repository>
<repository>
<id>2019-09-staging</id>
<layout>p2</layout>
<url>https://download.eclipse.org/staging/2019-09/</url>
</repository> -->
</repository>
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository</url>
<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository</url>
</repository>
<repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>https://dist.springframework.org/release/IDE/3.9.10.RELEASE</url>
</repository>
<!-- <repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>https://dist.springframework.org/release/IDE/3.9.9.RELEASE</url>
</repository> -->
<repository>
<id>e-i-commons</id>
<layout>p2</layout>
<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
</repository>
</repository> -->
<repository>
<id>lsp4e</id>
<layout>p2</layout>

2
headless-services/bosh-language-server/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../commons/pom.xml</relativePath>
</parent>

2
headless-services/commons/commons-boot-app-cli/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/commons-cf/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/commons-gradle/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/commons-java/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

5
headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jdtls/JdtLsIndex.java
View File

@@ -122,14 +122,15 @@ public class JdtLsIndex implements ClasspathIndex {
sourceTypeCache.put(fqName, type);
} else {
type = Optional.of(toType(data));
if (Classpath.isBinary(data.getClasspathEntry().getCpe())) {
if (data.getClasspathEntry() != null && Classpath.isBinary(data.getClasspathEntry().getCpe())) {
binaryTypeCache.put(fqName, type);
} else {
sourceTypeCache.put(fqName, type);
}
}
} catch (Exception e) {
log.error("{}", e);
log.error("Find type failed for `{}` with {}", fqName, e);
return null;
}
}
return type.orElse(null);

2
headless-services/commons/commons-language-server/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/commons-lsp-extensions/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/commons-maven/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/commons-util/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/commons-yaml/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/java-properties/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/language-server-starter/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/language-server-test-harness/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
headless-services/commons/pom.xml
View File

@@ -7,7 +7,7 @@
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<packaging>pom</packaging>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<name>commons-parent</name>
<parent>

2
headless-services/concourse-language-server/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../commons/pom.xml</relativePath>
</parent>

2
headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF
View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Commons
Bundle-SymbolicName: org.springframework.tooling.jdt.ls.commons.test
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Automatic-Module-Name: org.springframework.tooling.jdt.ls.commons.test
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.springframework.tooling.jdt.ls.commons,

2
headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/pom.xml
View File

@@ -5,7 +5,7 @@
<packaging>eclipse-test-plugin</packaging>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>org.springframework.tooling.jdt.ls.commons.test</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<name>org.springframework.tooling.jdt.ls.commons.test</name>
<parent>

2
headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/META-INF/MANIFEST.MF
View File

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Client-side JDT extension for language servers
Bundle-SymbolicName: org.springframework.tooling.jdt.ls.commons
Bundle-Version: 4.4.0.qualifier
Bundle-Version: 4.4.1.qualifier
Bundle-Vendor: Pivotal, Inc.
Automatic-Module-Name: org.springframework.tooling.jdt.ls.commons
Bundle-RequiredExecutionEnvironment: JavaSE-1.8

4
headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/pom.xml
View File

@@ -5,7 +5,7 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>org.springframework.tooling.jdt.ls.commons</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>4.4.1-SNAPSHOT</version>
<name>org.springframework.tooling.jdt.ls.commons</name>
<parent>
@@ -19,7 +19,7 @@
<dependency>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-lsp-extensions</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
</dependency>
</dependencies>

145
headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/ReusableClasspathListenerHandler.java
View File

@@ -14,11 +14,11 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Supplier;
import org.eclipse.core.resources.IProject;
@@ -88,62 +88,65 @@ public class ReusableClasspathListenerHandler {
class Subscriptions {
private Map<String, SendClasspathNotificationsJob> subscribers = null;
private ClasspathListenerManager classpathListener = null;
private CallbackJob callbackJob = new CallbackJob();
private ConcurrentMap<String, SendClasspathNotificationsJob> subscribers;
private ClasspathListenerManager classpathListener;
private CallbackJob callbackJob;
public synchronized void subscribe(String callbackCommandId, boolean isBatched) {
if (subscribers==null) {
//First subscriber
subscribers = new HashMap<>();
}
if (!subscribers.containsKey(callbackCommandId)) {
logger.log("subscribing to classpath changes: " + callbackCommandId +" isBatched = "+isBatched);
classpathListener = new ClasspathListenerManager(logger, new ClasspathListener() {
@Override
public void classpathChanged(IJavaProject jp) {
sendNotification(jp, subscribers.keySet());
}
public Subscriptions() {
this.subscribers = new ConcurrentHashMap<>();
this.callbackJob = new CallbackJob();
}
public void subscribe(String callbackCommandId, boolean isBatched) {
// keep put of synchronized block to avoid workspace locks
IProject[] sortedProjects = getSortedProjects();
@Override
public void projectBuilt(IJavaProject jp) {
sendNotificationOnProjectBuilt(jp, subscribers.keySet());
}
});
final SendClasspathNotificationsJob job = new SendClasspathNotificationsJob(logger, conn, callbackCommandId, isBatched);
subscribers.put(callbackCommandId, job);
job.addJobChangeListener(new JobChangeAdapter() {
@Override
public void done(IJobChangeEvent event) {
List<String> projectNames = job.notificationsSentForProjects;
if (projectNames != null) {
callbackJob.queueProjects(projectNames);
synchronized(this) {
if (!subscribers.containsKey(callbackCommandId)) {
logger.log("subscribing to classpath changes: " + callbackCommandId +" isBatched = "+isBatched);
classpathListener = new ClasspathListenerManager(logger, new ClasspathListener() {
@Override
public void classpathChanged(IJavaProject jp) {
sendNotification(jp, subscribers.keySet());
}
}
});
logger.log("subsribers = " + subscribers);
sendInitialEvents(callbackCommandId);
@Override
public void projectBuilt(IJavaProject jp) {
sendNotificationOnProjectBuilt(jp, subscribers.keySet());
}
});
final SendClasspathNotificationsJob job = new SendClasspathNotificationsJob(logger, conn, callbackCommandId, isBatched);
subscribers.put(callbackCommandId, job);
job.addJobChangeListener(new JobChangeAdapter() {
@Override
public void done(IJobChangeEvent event) {
List<String> projectNames = job.notificationsSentForProjects;
if (projectNames != null) {
callbackJob.queueProjects(projectNames);
}
}
});
logger.log("subsribers = " + subscribers);
sendInitialEvents(callbackCommandId, sortedProjects);
}
}
}
private void sendInitialEvents(String callbackCommandId) {
private void sendInitialEvents(String callbackCommandId, IProject[] projects) {
logger.log("Sending initial event for all projects ...");
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
if (projectSorterFactory != null) {
Arrays.sort(projects, projectSorterFactory.get());
}
Set<String> callbackIds = Collections.singleton(callbackCommandId);
for (IProject p : projects) {
logger.log("project "+p.getName() +" ..." );
try {
if (p.isAccessible() && p.hasNature(JavaCore.NATURE_ID)) {
IJavaProject jp = JavaCore.create(p);
sendNotification(jp, Collections.singleton(callbackCommandId));
sendNotification(jp, callbackIds);
} else {
logger.log("project "+p.getName() +" SKIPPED" );
}
@@ -153,52 +156,54 @@ public class ReusableClasspathListenerHandler {
}
logger.log("Sending initial event for all projects DONE");
}
private IProject[] getSortedProjects() {
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
if (projectSorterFactory != null) {
Arrays.sort(projects, projectSorterFactory.get());
}
return projects;
}
private synchronized void sendNotification(IJavaProject jp, Collection<String> callbackIds) {
if (subscribers!=null) {
for (String callbackId : callbackIds) {
SendClasspathNotificationsJob sendNotificationJob = subscribers.get(callbackId);
sendNotificationJob.queue.add(jp);
sendNotificationJob.schedule();
}
for (String callbackId : callbackIds) {
SendClasspathNotificationsJob sendNotificationJob = subscribers.get(callbackId);
sendNotificationJob.queue.add(jp);
sendNotificationJob.schedule();
}
}
private synchronized void sendNotificationOnProjectBuilt(IJavaProject jp, Collection<String> callbackIds) {
if (subscribers!=null) {
for (String callbackId : callbackIds) {
SendClasspathNotificationsJob sendNotificationJob = subscribers.get(callbackId);
sendNotificationJob.builtProjectQueue.add(jp);
sendNotificationJob.schedule();
}
for (String callbackId : callbackIds) {
SendClasspathNotificationsJob sendNotificationJob = subscribers.get(callbackId);
sendNotificationJob.builtProjectQueue.add(jp);
sendNotificationJob.schedule();
}
}
public synchronized void unsubscribe(String callbackCommandId) {
logger.log("unsubscribing from classpath changes: " + callbackCommandId);
if (subscribers != null) {
subscribers.remove(callbackCommandId);
if (subscribers.isEmpty()) {
subscribers = null;
if (classpathListener!=null) {
classpathListener.dispose();
classpathListener = null;
}
}
subscribers.remove(callbackCommandId);
if (subscribers.isEmpty() && classpathListener != null) {
classpathListener.dispose();
classpathListener = null;
}
logger.log("subsribers = " + subscribers);
}
public boolean isEmpty() {
return subscribers == null || subscribers.isEmpty();
return subscribers.isEmpty();
}
}
private Subscriptions subscribptions = new Subscriptions();
private Subscriptions subscriptions = new Subscriptions();
public Object removeClasspathListener(String callbackCommandId) {
logger.log("ClasspathListenerHandler removeClasspathListener " + callbackCommandId);
subscribptions.unsubscribe(callbackCommandId);
subscriptions.unsubscribe(callbackCommandId);
logger.log("ClasspathListenerHandler removeClasspathListener " + callbackCommandId + " => OK");
return "ok";
}
@@ -210,13 +215,13 @@ public class ReusableClasspathListenerHandler {
public Object addClasspathListener(String callbackCommandId, boolean isBatched) {
logger.log("ClasspathListenerHandler addClasspathListener " + callbackCommandId + "isBatched = "+isBatched);
subscribptions.subscribe(callbackCommandId, isBatched);
subscriptions.subscribe(callbackCommandId, isBatched);
logger.log("ClasspathListenerHandler addClasspathListener " + callbackCommandId + " => OK");
return "ok";
}
public boolean hasNoActiveSubscriptions() {
return subscribptions.isEmpty();
return subscriptions.isEmpty();
}
public void addNotificationsSentCallback(NotificationSentCallback callback) {

6
headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons/src/org/springframework/tooling/jdt/ls/commons/classpath/SendClasspathNotificationsJob.java
View File

@@ -126,14 +126,14 @@ public class SendClasspathNotificationsJob extends Job {
if (projectLoc==null) {
logger.log("Could not send event for project because no project location: "+jp.getElementName());
} else {
boolean exsits = projectExists(jp);
boolean exists = projectExists(jp);
boolean open = true; // WARNING: calling jp.isOpen is unreliable and subject to race condition. After a POST_CHAGE project open event
// this should be true but it typically is not unless you wait for some time. No idea how you would know
// how long you should wait (200ms is not enough, and that seems pretty long).
// So we will just pretend / assume project is always open. If resolving classpath fails because it is not
// open... so be it (there will be no classpath... this is expected for closed project, so that is fine).
boolean deleted = !(exsits && open);
logger.log("exists = "+exsits +" open = "+open +" => deleted = "+deleted);
boolean deleted = !(exists && open);
logger.log("exists = "+exists +" open = "+open +" => deleted = "+deleted);
String projectName = jp.getElementName();
Classpath classpath = Classpath.EMPTY;

2
headless-services/manifest-yaml-language-server/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../commons/pom.xml</relativePath>
</parent>

2
headless-services/spring-boot-language-server/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.ide.vscode</groupId>
<artifactId>commons-parent</artifactId>
<version>1.11.0-SNAPSHOT</version>
<version>1.12.0-SNAPSHOT</version>
<relativePath>../commons/pom.xml</relativePath>
</parent>

60
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/SpringSymbolIndex.java
View File

@@ -175,13 +175,16 @@ public class SpringSymbolIndex implements InitializingBean {
this.updateDocument(docURI, content, "didSave event");
}
});
config.addListener(evt -> {
this.configureIndexer(SymbolIndexConfig.builder()
.scanXml(config.isSpringXMLSupportEnabled())
.xmlScanFoldersGlobs(config.xmlBeansFoldersToScan())
.scanTestJavaSources(config.isScanJavaTestSourcesEnabled())
.build());
});
config.addListener(evt ->
server.getAsync().execute(() ->
configureIndexer(SymbolIndexConfig.builder()
.scanXml(config.isSpringXMLSupportEnabled())
.xmlScanFoldersGlobs(config.xmlBeansFoldersToScan())
.scanTestJavaSources(config.isScanJavaTestSourcesEnabled())
.build()
)
)
);
server.doOnInitialized(this::serverInitialized);
server.onShutdown(this::shutdown);
}
@@ -200,29 +203,27 @@ public class SpringSymbolIndex implements InitializingBean {
});
}
public CompletableFuture<Void> configureIndexer(SymbolIndexConfig config) {
List<CompletableFuture<?>> futuresList = new ArrayList<>();
public void configureIndexer(SymbolIndexConfig config) {
synchronized (this) {
if (config.isScanXml() && !(Arrays.asList(this.indexers).contains(springIndexerXML))) {
this.indexers = new SpringIndexer[] {springIndexerJava, springIndexerXML};
futuresList.add(CompletableFuture.runAsync(() -> springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs())));
this.indexers = new SpringIndexer[] { springIndexerJava, springIndexerXML };
springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs());
List<String> globPattern = Arrays.asList(springIndexerXML.getFileWatchPatterns());
watchXMLDeleteRegistration = getWorkspaceService().getFileObserver().onFileDeleted(globPattern, (file) -> {
deleteDocument(new TextDocumentIdentifier(file).getUri());
});
watchXMLCreatedRegistration = getWorkspaceService().getFileObserver().onFileCreated(globPattern, (file) -> {
createDocument(new TextDocumentIdentifier(file).getUri());
});
watchXMLChangedRegistration = getWorkspaceService().getFileObserver().onFileChanged(globPattern, (file) -> {
updateDocument(new TextDocumentIdentifier(file).getUri(), null, "xml changed");
});
}
else if (!config.isScanXml() && Arrays.asList(this.indexers).contains(springIndexerXML)) {
this.indexers = new SpringIndexer[] {springIndexerJava};
futuresList.add(CompletableFuture.runAsync(() -> springIndexerXML.setScanFolderGlobs(new String[0])));
watchXMLDeleteRegistration = getWorkspaceService().getFileObserver().onFileDeleted(globPattern,
(file) -> {
deleteDocument(new TextDocumentIdentifier(file).getUri());
});
watchXMLCreatedRegistration = getWorkspaceService().getFileObserver().onFileCreated(globPattern,
(file) -> {
createDocument(new TextDocumentIdentifier(file).getUri());
});
watchXMLChangedRegistration = getWorkspaceService().getFileObserver().onFileChanged(globPattern,
(file) -> {
updateDocument(new TextDocumentIdentifier(file).getUri(), null, "xml changed");
});
} else if (!config.isScanXml() && Arrays.asList(this.indexers).contains(springIndexerXML)) {
this.indexers = new SpringIndexer[] { springIndexerJava };
springIndexerXML.setScanFolderGlobs(new String[0]);
getWorkspaceService().getFileObserver().unsubscribe(watchXMLChangedRegistration);
getWorkspaceService().getFileObserver().unsubscribe(watchXMLCreatedRegistration);
@@ -232,11 +233,10 @@ public class SpringSymbolIndex implements InitializingBean {
watchXMLCreatedRegistration = null;
watchXMLDeleteRegistration = null;
} else if (config.isScanXml()) {
futuresList.add(CompletableFuture.runAsync(() -> springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs())));
springIndexerXML.setScanFolderGlobs(config.getXmlScanFoldersGlobs());
}
futuresList.add(CompletableFuture.runAsync(() -> springIndexerJava.setScanTestJavaSources(config.isScanTestJavaSources())));
springIndexerJava.setScanTestJavaSources(config.isScanTestJavaSources());
}
return CompletableFuture.allOf(futuresList.toArray(new CompletableFuture<?>[futuresList.size()]));
}
public void shutdown() {

8
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java
View File

@@ -600,9 +600,11 @@ public class TypeUtil {
public boolean isEnum(Type type) {
try {
IType eclipseType = findType(type.getErasure());
if (eclipseType!=null) {
return eclipseType.isEnum();
if (!isArray(type)) {
IType eclipseType = findType(type.getErasure());
if (eclipseType!=null) {
return eclipseType.isEnum();
}
}
} catch (Exception e) {
log.error("", e);

2
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerMultiProjectTest.java
View File

@@ -53,7 +53,7 @@ public class SpringIndexerMultiProjectTest {
@Before
public void setup() throws Exception {
harness.intialize(null);
indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build()).get(5, TimeUnit.SECONDS);
indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build());
projectUri1 = UriUtil.toUri(new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-large-multiproject-1/").toURI())).toString();
projectFinder.find(new TextDocumentIdentifier(projectUri1)).get();

6
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java
View File

@@ -60,7 +60,7 @@ public class SpringIndexerTest {
@Before
public void setup() throws Exception {
harness.intialize(null);
indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build()).get(5, TimeUnit.SECONDS);;
indexer.configureIndexer(SymbolIndexConfig.builder().scanXml(false).build());
directory = new File(ProjectsHarness.class.getResource("/test-projects/test-annotation-indexing-parent/test-annotation-indexing/").toURI());
projectDir = directory.toURI().toString();
@@ -96,14 +96,14 @@ public class SpringIndexerTest {
@Test
public void testScanTestJavaSources() throws Exception {
indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(true).build()).get(1, TimeUnit.SECONDS);
indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(true).build());
List<? extends SymbolInformation> allSymbols = indexer.getAllSymbols("");
assertEquals(8, allSymbols.size());
String docUri = directory.toPath().resolve("src/test/java/demo/ApplicationTests.java").toUri().toString();
assertTrue(containsSymbol(allSymbols, "@SpringBootTest", docUri, 8, 0, 8, 15));
indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(false).build()).get(1, TimeUnit.SECONDS);
indexer.configureIndexer(SymbolIndexConfig.builder().scanTestJavaSources(false).build());
allSymbols = indexer.getAllSymbols("");
assertEquals(7, allSymbols.size());
assertFalse(containsSymbol(allSymbols, "@SpringBootTest", docUri, 8, 0, 8, 15));

18
headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerXMLProjectTest.java
View File

@@ -59,8 +59,7 @@ public class SpringIndexerXMLProjectTest {
indexer.configureIndexer(SymbolIndexConfig.builder()
.scanXml(true)
.xmlScanFoldersGlobs(new String[] { "**/src/main/**", "**/config" })
.build())
.get(5, TimeUnit.SECONDS);;
.build());
project = projects.mavenProject("test-annotation-indexing-xml-project");
harness.useProject(project);
@@ -124,40 +123,35 @@ public class SpringIndexerXMLProjectTest {
indexer.configureIndexer(SymbolIndexConfig.builder()
.scanXml(true)
.build())
.get(2, TimeUnit.SECONDS);;
.build());
allSymbols = indexer.getAllSymbols("");
assertEquals(0, allSymbols.size());
indexer.configureIndexer(SymbolIndexConfig.builder()
.scanXml(true)
.xmlScanFoldersGlobs(new String[] { "**/src/main/**" })
.build())
.get(2, TimeUnit.SECONDS);
.build());
allSymbols = indexer.getAllSymbols("");
assertEquals(1, allSymbols.size());
indexer.configureIndexer(SymbolIndexConfig.builder()
.scanXml(true)
.xmlScanFoldersGlobs(new String[] { "**/config", "**/src/main/**" })
.build())
.get(2, TimeUnit.SECONDS);
.build());
allSymbols = indexer.getAllSymbols("");
assertEquals(5, allSymbols.size());
indexer.configureIndexer(SymbolIndexConfig.builder()
.scanXml(true)
.xmlScanFoldersGlobs(new String[] { "**/config" })
.build())
.get(2, TimeUnit.SECONDS);
.build());
allSymbols = indexer.getAllSymbols("");
assertEquals(4, allSymbols.size());
indexer.configureIndexer(SymbolIndexConfig.builder()
.scanXml(false)
.xmlScanFoldersGlobs(new String[] { "**/config", "**/src/main/**" })
.build())
.get(2, TimeUnit.SECONDS);
.build());
allSymbols = indexer.getAllSymbols("");
assertEquals(0, allSymbols.size());
}

2
headless-services/spring-boot-language-server/src/test/resources/test-projects/test-xml-hyperlinks/pom.xml
View File

@@ -8,7 +8,7 @@
<packaging>war</packaging>
<version>1.0.0-BUILD-SNAPSHOT</version>
<properties>
<java-version>1.6</java-version>
<java-version>1.7</java-version>
<org.springframework-version>3.1.1.RELEASE</org.springframework-version>
<org.aspectj-version>1.6.10</org.aspectj-version>
<org.slf4j-version>1.6.6</org.slf4j-version>

2
nodejs-packages/jvm-launch-utils/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "@pivotal-tools/jvm-launch-utils",
"version": "0.0.11",
"version": "0.0.13",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
nodejs-packages/jvm-launch-utils/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@pivotal-tools/jvm-launch-utils",
"version": "0.0.12",
"version": "0.0.14",
"description": "Provides utilities useful for launching Java processes from node packages.",
"files": [
"src",

20
nodejs-packages/jvm-launch-utils/src/jvm-util.ts
View File

@@ -55,15 +55,19 @@ export interface JVM {
* toolsjar and to check whether the JVM is a JDK.
*/
export function findJvm(javaHome?: string) : Promise<JVM | null> {
let javaExe = findJavaExe(javaHome);
if (javaExe) {
return getJavaInfo(javaExe).then(javaProps => new JVMImpl(
javaProps.get("java.home"),
javaExe,
getMajorVersion(javaProps)
));
try {
let javaExe = findJavaExe(javaHome);
if (javaExe) {
return getJavaInfo(javaExe).then(javaProps => new JVMImpl(
javaProps.get("java.home"),
javaExe,
getMajorVersion(javaProps)
));
}
return Promise.resolve(null);
} catch (e) {
return Promise.reject(e);
}
return Promise.resolve(null);
}
/**

2
theia-extensions/theia-bosh/bosh/README.md
View File

@@ -154,4 +154,4 @@ Please report bugs, issues and feature requests on the [Github STS4 issue tracke
[goto_symbol]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-bosh/bosh/readme-imgs/doc-symbol.png
**Version: 1.11.0**
**Version: 1.12.0**

2
theia-extensions/theia-bosh/bosh/package.json
View File

@@ -6,7 +6,7 @@
"keywords": [
"theia-extension"
],
"version": "1.11.0",
"version": "1.12.0",
"files": [
"lib",
"src",

2
theia-extensions/theia-bosh/browser-app/package.json
View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "browser-app",
"version": "1.11.0",
"version": "1.12.0",
"dependencies": {
"@pivotal-tools/theia-bosh": "file:../bosh",
"@theia/core": "latest",

2
theia-extensions/theia-bosh/electron-app/package.json
View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "electron-app",
"version": "1.11.0",
"version": "1.12.0",
"dependencies": {
"@pivotal-tools/theia-bosh": "file:../bosh",
"@theia/core": "latest",

2
theia-extensions/theia-bosh/lerna.json
View File

@@ -1,6 +1,6 @@
{
"lerna": "3.13.1",
"version": "1.11.0",
"version": "1.12.0",
"useWorkspaces": true,
"npmClient": "yarn",
"command": {

2
theia-extensions/theia-cf-manifest-yaml/browser-app/package.json
View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "browser-app",
"version": "1.11.0",
"version": "1.12.0",
"dependencies": {
"@pivotal-tools/theia-cf-manifest-yaml": "file:../cf-manifest-yaml",
"@theia/core": "latest",

2
theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/README.md
View File

@@ -47,4 +47,4 @@ read its detailed documentation.
[dcfca]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/readme-imgs/dynamic-ca.png
[hovers]: https://raw.githubusercontent.com/spring-projects/sts4/1bdd6f45aaf779252a2f0203f10da1a67b3c018e/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/readme-imgs/hovers.png
**Version: 1.11.0**
**Version: 1.12.0**

2
theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json
View File

@@ -6,7 +6,7 @@
"keywords": [
"theia-extension"
],
"version": "1.11.0",
"version": "1.12.0",
"files": [
"lib",
"src",

2
theia-extensions/theia-cf-manifest-yaml/electron-app/package.json
View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "electron-app",
"version": "1.11.0",
"version": "1.12.0",
"dependencies": {
"@pivotal-tools/theia-cf-manifest-yaml": "file:../cf-manifest-yaml",
"@theia/core": "latest",

2
theia-extensions/theia-cf-manifest-yaml/lerna.json
View File

@@ -1,6 +1,6 @@
{
"lerna": "3.13.1",
"version": "1.11.0",
"version": "1.12.0",
"useWorkspaces": true,
"npmClient": "yarn",
"command": {

2
theia-extensions/theia-concourse/browser-app/package.json
View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "browser-app",
"version": "1.11.0",
"version": "1.12.0",
"dependencies": {
"@pivotal-tools/theia-concourse": "file:../concourse",
"@theia/core": "latest",

2
theia-extensions/theia-concourse/concourse/README.md
View File

@@ -87,4 +87,4 @@ Please report bugs, issues and feature requests on the [Github STS4 issue tracke
[goto_symbol]: https://raw.githubusercontent.com/spring-projects/sts4/54cf0994b69ef1770ca597a8da325022b19cee69/theia-extensions/theia-concourse/concourse/readme-imgs/doc-symbols.png
**Version: 1.11.0**
**Version: 1.12.0**

2
theia-extensions/theia-concourse/concourse/package.json
View File

@@ -6,7 +6,7 @@
"keywords": [
"theia-extension"
],
"version": "1.11.0",
"version": "1.12.0",
"files": [
"lib",
"src",

2
theia-extensions/theia-concourse/electron-app/package.json
View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "electron-app",
"version": "1.11.0",
"version": "1.12.0",
"dependencies": {
"@pivotal-tools/theia-concourse": "file:../concourse",
"@theia/core": "latest",

Some files were not shown because too many files have changed in this diff Show More