diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java index 988d7f15a..ce0e3c943 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java @@ -54,9 +54,8 @@ public final class SourceLinkFactory { public static SourceLinks createSourceLinks(SimpleLanguageServer server, CompilationUnitCache cuCache, JavaProjectFinder projectFinder) { switch (LspClient.currentClient()) { case VSCODE: - return /*new VSCodeSourceLinks(cuCache);*/server == null ? new VSCodeSourceLinks(cuCache, projectFinder) :new JavaServerSourceLinks(server, projectFinder); case THEIA: - return new VSCodeSourceLinks(cuCache, projectFinder); + return /*new VSCodeSourceLinks(cuCache);*/server == null ? new VSCodeSourceLinks(cuCache, projectFinder) :new JavaServerSourceLinks(server, projectFinder); case ECLIPSE: return /*new EclipseSourceLinks();*/server == null ? new EclipseSourceLinks(projectFinder) : new JavaServerSourceLinks(server, projectFinder); case ATOM: diff --git a/theia-extensions/theia-bosh/bosh/package.json b/theia-extensions/theia-bosh/bosh/package.json index 8ae4ad0e7..1f335bb83 100644 --- a/theia-extensions/theia-bosh/bosh/package.json +++ b/theia-extensions/theia-bosh/bosh/package.json @@ -13,7 +13,7 @@ "@theia/core": "latest", "@theia/languages": "latest", "@theia/monaco": "latest", - "@pivotal-tools/theia-languageclient": "0.0.6" + "@pivotal-tools/theia-languageclient": "0.0.7" }, "devDependencies": { "rimraf": "^2.6.2", diff --git a/theia-extensions/theia-bosh/yarn.lock b/theia-extensions/theia-bosh/yarn.lock index 4e3709c28..78843af50 100644 --- a/theia-extensions/theia-bosh/yarn.lock +++ b/theia-extensions/theia-bosh/yarn.lock @@ -125,10 +125,10 @@ resolved "https://registry.yarnpkg.com/@pivotal-tools/jvm-launch-utils/-/jvm-launch-utils-0.0.11.tgz#11e8cc4850aa16a91c7579a8e3ed2a071acc36ba" integrity sha512-PSBzegFv+m1AaAlHBtWzfxdxZG3RFJaTNk0ognOjDV+URrPnMWkD2DBt4pgEGynpnnK8G5WZZGVu5flcIsKGyQ== -"@pivotal-tools/theia-languageclient@0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@pivotal-tools/theia-languageclient/-/theia-languageclient-0.0.6.tgz#58a28dfc4b02faae4ff100c037e8bbe0d9f38b17" - integrity sha512-cmsFulaixIrtTzlaBe+S7zKjrPnrulyBefnzl+9nyya/ja4yYog7BL40CI6JEZV/56rdnsBynRyqFRWDfHZV+A== +"@pivotal-tools/theia-languageclient@0.0.7": + version "0.0.7" + resolved "https://registry.yarnpkg.com/@pivotal-tools/theia-languageclient/-/theia-languageclient-0.0.7.tgz#d02d7ce308eb6abe4eddd7adc9f26eebcb64935b" + integrity sha512-sM7HJpIn0SbQWsqif8XbhdMZKS97e/0853A3M8jeLH6Y7uliA/wKBOJltoqpZz7MKl0PiHydQXrXay6AFuhNvA== dependencies: "@pivotal-tools/jvm-launch-utils" "0.0.11" "@theia/core" latest diff --git a/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json b/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json index 414411011..0b4778cdf 100644 --- a/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json +++ b/theia-extensions/theia-cf-manifest-yaml/cf-manifest-yaml/package.json @@ -14,7 +14,7 @@ "@theia/languages": "latest", "@theia/monaco": "latest", "@pivotal-tools/jvm-launch-utils": "0.0.11", - "@pivotal-tools/theia-languageclient": "0.0.6" + "@pivotal-tools/theia-languageclient": "0.0.7" }, "devDependencies": { "rimraf": "^2.6.2", diff --git a/theia-extensions/theia-cf-manifest-yaml/yarn.lock b/theia-extensions/theia-cf-manifest-yaml/yarn.lock index 4e3709c28..78843af50 100644 --- a/theia-extensions/theia-cf-manifest-yaml/yarn.lock +++ b/theia-extensions/theia-cf-manifest-yaml/yarn.lock @@ -125,10 +125,10 @@ resolved "https://registry.yarnpkg.com/@pivotal-tools/jvm-launch-utils/-/jvm-launch-utils-0.0.11.tgz#11e8cc4850aa16a91c7579a8e3ed2a071acc36ba" integrity sha512-PSBzegFv+m1AaAlHBtWzfxdxZG3RFJaTNk0ognOjDV+URrPnMWkD2DBt4pgEGynpnnK8G5WZZGVu5flcIsKGyQ== -"@pivotal-tools/theia-languageclient@0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@pivotal-tools/theia-languageclient/-/theia-languageclient-0.0.6.tgz#58a28dfc4b02faae4ff100c037e8bbe0d9f38b17" - integrity sha512-cmsFulaixIrtTzlaBe+S7zKjrPnrulyBefnzl+9nyya/ja4yYog7BL40CI6JEZV/56rdnsBynRyqFRWDfHZV+A== +"@pivotal-tools/theia-languageclient@0.0.7": + version "0.0.7" + resolved "https://registry.yarnpkg.com/@pivotal-tools/theia-languageclient/-/theia-languageclient-0.0.7.tgz#d02d7ce308eb6abe4eddd7adc9f26eebcb64935b" + integrity sha512-sM7HJpIn0SbQWsqif8XbhdMZKS97e/0853A3M8jeLH6Y7uliA/wKBOJltoqpZz7MKl0PiHydQXrXay6AFuhNvA== dependencies: "@pivotal-tools/jvm-launch-utils" "0.0.11" "@theia/core" latest diff --git a/theia-extensions/theia-commons/package.json b/theia-extensions/theia-commons/package.json index 2a988a3a0..38dd32634 100644 --- a/theia-extensions/theia-commons/package.json +++ b/theia-extensions/theia-commons/package.json @@ -1,6 +1,6 @@ { "name": "@pivotal-tools/theia-languageclient", - "version": "0.0.6", + "version": "0.0.7", "description": "Theia IDE language client for STS4 language servers", "repository": "https://github.com/spring-projects/sts4", "license": "MIT", diff --git a/theia-extensions/theia-commons/src/node/language-server-contribution.ts b/theia-extensions/theia-commons/src/node/language-server-contribution.ts index c7789e185..7222526b0 100644 --- a/theia-extensions/theia-commons/src/node/language-server-contribution.ts +++ b/theia-extensions/theia-commons/src/node/language-server-contribution.ts @@ -50,59 +50,53 @@ export abstract class StsLanguageServerContribution extends BaseLanguageServerCo } } - start(clientConnection: IConnection): void { + async start(clientConnection: IConnection) { const jarPath = this.getJarPath(); - this.findJvm() - .catch(error => { - throw new Error('Error trying to find JVM'); - }) - .then(jvm => { - this.validate(jvm); - this.startSocketServer().then(server => { - const socket = this.accept(server); + const jvm = await this.findJvm(); - const env = Object.create(process.env); - const addressInfo = server.address(); - if (typeof addressInfo === 'string') { - throw new Error(`Address info was string ${addressInfo}`); - } - env.CLIENT_HOST = addressInfo.address; - env.CLIENT_PORT = addressInfo.port; + this.validate(jvm); - const command = jvm.getJavaExecutable(); - const args = [ - '-Dsts.lsp.client=theia', - '-Dlsp.completions.indentation.enable=true', - '-Dlsp.yaml.completions.errors.disable=true', - `-Dserver.port=${env.CLIENT_PORT}` - ]; + const server = await this.startSocketServer(); + const socket = this.accept(server); + const env = Object.create(process.env); + const addressInfo = server.address(); + if (typeof addressInfo === 'string') { + throw new Error(`Address info was string ${addressInfo}`); + } - let toolsJar = jvm.getToolsJar(); - if (toolsJar) { - args.push("-Dloader.path="+toolsJar); - } + env.CLIENT_HOST = addressInfo.address; + env.CLIENT_PORT = addressInfo.port; - args.push(...this.jvmArguments); + const command = jvm.getJavaExecutable(); + const args = [ + '-Dsts.lsp.client=theia', + '-Dlsp.completions.indentation.enable=true', + '-Dlsp.yaml.completions.errors.disable=true', + `-Dserver.port=${env.CLIENT_PORT}` + ]; - if (DEBUG_MODE) { - args.push( - '-Xdebug', - '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7999', - '-Dlog.level=ALL' - ); - } + let toolsJar = jvm.getToolsJar(); + if (toolsJar) { + args.push("-Dloader.path="+toolsJar); + } - args.push( - '-jar', jarPath, - ); + args.push(...this.jvmArguments); - this.createProcessSocketConnection(socket, socket, command, args, { env }) - .then(serverConnection => this.forward(clientConnection, serverConnection)); + if (DEBUG_MODE) { + args.push( + '-Xdebug', + '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=7999', + '-Dlog.level=ALL' + ); + } - }); - - }); + args.push( + '-jar', + jarPath + ); + const serverConnection = await this.createProcessSocketConnection(socket, socket, command, args, { env }); + this.forward(clientConnection, serverConnection); } } \ No newline at end of file diff --git a/theia-extensions/theia-commons/yarn.lock b/theia-extensions/theia-commons/yarn.lock index abe8d372b..761b8f996 100644 --- a/theia-extensions/theia-commons/yarn.lock +++ b/theia-extensions/theia-commons/yarn.lock @@ -3,9 +3,9 @@ "@babel/runtime@^7.1.2": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f" - integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg== + version "7.3.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a" + integrity sha512-7jGW8ppV0ant637pIqAcFfQDDH1orEPGJb8aXfUozuCU3QqX7rX4DA8iwrbPrR1hcH0FTTHz47yQnk+bl5xHQA== dependencies: regenerator-runtime "^0.12.0" @@ -124,10 +124,10 @@ dependencies: execa "^0.2.2" -"@theia/application-package@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-0.3.18.tgz#8d8af55a6a220993502eb276d3e0db0ad3f25016" - integrity sha512-ZyrVnTCffh2KA39SyJCKHOiF2ygJt+MCohZfY90o5bbNumFONFGSCnP4W+mMG8BKOOGHGRxXK78zDEJ1emjAyA== +"@theia/application-package@^0.3.19": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-0.3.19.tgz#31c111e727b081ac0e8c7dc4d0cbfecc1cdec533" + integrity sha512-dQ4xvabtCpXl7NAqEl4akRubVgvyes1/Z7iDMJQyKFci+DE4u7AS8BDn5fg8jCTOi/Q5MnXjNCSSWYkv/KBVlw== dependencies: "@types/fs-extra" "^4.0.2" "@types/request" "^2.0.3" @@ -140,13 +140,13 @@ semver "^5.4.1" write-json-file "^2.2.0" -"@theia/core@^0.3.18", "@theia/core@latest": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/core/-/core-0.3.18.tgz#cd54014ae404f6a5e2bcf41fff8e6b2b305035e5" - integrity sha512-wH/8GuQY/7/YVowByGejtttmrNa5bSYdMyv4PW8edDlOTRgoX4bLcUD6L+6ZXTnt5LZMgwrBDHaOy1l0g+ih2A== +"@theia/core@^0.3.19", "@theia/core@latest": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/core/-/core-0.3.19.tgz#4bc0830224d94cef163a0dbe55042b9570d05f10" + integrity sha512-LS8UwImoWjVS2qBSuHF/6DZyNHJ3YdAboG8c0c2VAuVa1NCqlMCLag5WPyJ7aoQHpSyNbGcnuLa0hLS5EfRcEQ== dependencies: "@phosphor/widgets" "^1.5.0" - "@theia/application-package" "^0.3.18" + "@theia/application-package" "^0.3.19" "@types/body-parser" "^1.16.4" "@types/bunyan" "^1.8.0" "@types/express" "^4.16.0" @@ -184,23 +184,23 @@ ws "^5.2.2" yargs "^11.1.0" -"@theia/editor@^0.3.18", "@theia/editor@latest": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-0.3.18.tgz#98d4be830e48836108c63b550838433d4b565402" - integrity sha512-YM6QaT4QwbmjcC0Sv550EVlJkiS1rg1HELGTIztZ6LAfzYvY+NPU53UQ1r57J/eEGTApErg1AnB1YqBM7UmgzA== +"@theia/editor@^0.3.19", "@theia/editor@latest": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-0.3.19.tgz#d5c3233b0bd35dee3ea9f73d52f58fbc8fb7639b" + integrity sha512-Pc6DuTwEkm/qi/aTEoY5yohq64/fjvCSkJsdMlV8d5yLhKZLX1Ot2u2ahE2j1a+ybi+ZF1XjO/5RpoElP6aumQ== dependencies: - "@theia/core" "^0.3.18" - "@theia/languages" "^0.3.18" - "@theia/variable-resolver" "^0.3.18" + "@theia/core" "^0.3.19" + "@theia/languages" "^0.3.19" + "@theia/variable-resolver" "^0.3.19" "@types/base64-arraybuffer" "0.1.0" base64-arraybuffer "^0.1.5" -"@theia/filesystem@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-0.3.18.tgz#b8620d194a61ed71f624065ee98310bf94e05f71" - integrity sha512-uYD9esav4pnoGIGJ/Xh14q5sNuro+hcOJQzb+J5mFjajU3z4JjGxCQH799tArl9SLw9ikui+ESfIXXIBBq6i6Q== +"@theia/filesystem@^0.3.19": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-0.3.19.tgz#d1dce1c8a4f8c65c6ce949fee60205121e4af885" + integrity sha512-NdAA1HaZTmrrazooSEVcJBK2rAyCQSXHZsl5qN//qvoXueuLTm4OPwOEQymtHJEHBfDuTsC9kHb+AYVMMB4nxA== dependencies: - "@theia/core" "^0.3.18" + "@theia/core" "^0.3.19" "@types/base64-js" "^1.2.5" "@types/body-parser" "^1.17.0" "@types/fs-extra" "^4.0.2" @@ -224,96 +224,97 @@ uuid "^3.2.1" zip-dir "^1.0.2" -"@theia/languages@^0.3.18", "@theia/languages@latest": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/languages/-/languages-0.3.18.tgz#bc8e3363460d23d599745f05e98b9c2ee6b1df78" - integrity sha512-Bb92cgsiOKpoAeVUxyZCIwzd6AnJbl+7HJBNTZ4LTb0wS12I7796m2plovnSQJBK6DAVVts67OyRWuRSB5SCOw== +"@theia/languages@^0.3.19", "@theia/languages@latest": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/languages/-/languages-0.3.19.tgz#564f30434ea9377787d56dbb26742a2e6bfa1607" + integrity sha512-EVVmukMAv/QYYx0ILK0XrP3NtjLeUJmp++IL0PGV92QYEK9R1x2nASXe0CWXEjeoPOqyYtq0SNWu+hGWsjlWVg== dependencies: - "@theia/core" "^0.3.18" - "@theia/output" "^0.3.18" - "@theia/process" "^0.3.18" - "@theia/workspace" "^0.3.18" + "@theia/core" "^0.3.19" + "@theia/output" "^0.3.19" + "@theia/process" "^0.3.19" + "@theia/workspace" "^0.3.19" "@typefox/monaco-editor-core" "^0.14.6" "@types/uuid" "^3.4.3" monaco-languageclient "^0.9.0" uuid "^3.2.1" -"@theia/markers@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-0.3.18.tgz#035182c2a586aace5d07f43334e98f8501043dc1" - integrity sha512-TFZi/2E0538GJJcwVRDPPTa41rx1BDyoXKtjVpTnhq9o4NdfxoUBCGjrB56HH4IcJfGNP/ZhEyhUXQAcQb4cmQ== +"@theia/markers@^0.3.19": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-0.3.19.tgz#e13be2405c241cf263b036e6f0d648d532759601" + integrity sha512-gIi3MsukAwiNdII8JdxyOFxJFFV1q9YFpToZBkK9zNogFpxgXTwPLrk/chpXel10+Le9ed85of3EQ+0kvjQSAg== dependencies: - "@theia/core" "^0.3.18" - "@theia/filesystem" "^0.3.18" - "@theia/navigator" "^0.3.18" - "@theia/workspace" "^0.3.18" + "@theia/core" "^0.3.19" + "@theia/filesystem" "^0.3.19" + "@theia/navigator" "^0.3.19" + "@theia/workspace" "^0.3.19" "@theia/monaco@latest": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-0.3.18.tgz#af14b35d7786e0255f382c947a754197e5415498" - integrity sha512-Xp+DvHnrfFqcjhixG6zcy0oqt2elNVL0ngcOhLrD18ewnrkJqjFCJRA4XqJm3r2KJPI8FidSMLuzsaq+jYFE4Q== + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-0.3.19.tgz#51e80e1a3e640fc54cccd047ba69fee799a067ea" + integrity sha512-nW/LNBCjJoLUKk37boVdBLH5ODXvqvkyCi/HC8sZPqeYLMWydgBfeN4Z8ch+t1PBds+sQpLlE7ozdz5xWnuqdw== dependencies: - "@theia/core" "^0.3.18" - "@theia/editor" "^0.3.18" - "@theia/filesystem" "^0.3.18" - "@theia/languages" "^0.3.18" - "@theia/markers" "^0.3.18" - "@theia/outline-view" "^0.3.18" - "@theia/workspace" "^0.3.18" + "@theia/core" "^0.3.19" + "@theia/editor" "^0.3.19" + "@theia/filesystem" "^0.3.19" + "@theia/languages" "^0.3.19" + "@theia/markers" "^0.3.19" + "@theia/outline-view" "^0.3.19" + "@theia/workspace" "^0.3.19" + jsonc-parser "^2.0.2" monaco-css "^2.0.1" monaco-html "^2.0.2" onigasm "^2.1.0" vscode-textmate "^4.0.1" -"@theia/navigator@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-0.3.18.tgz#9b0ad1623fd2fd522fed451e017666dd08027863" - integrity sha512-a9ExZ77yr7vai4ljjyUojfD0XCD5vdh88KsCyIaf9ck7SFEp7wy+TkJfg4cTJOKyKn1Q9KHcshYrTjt+xvHE0Q== +"@theia/navigator@^0.3.19": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-0.3.19.tgz#0f392938021456bd8d47ae2c33b0890ec60ad3b0" + integrity sha512-7Rb8jJSHl5VxDGO6Y+HH8+rutSPxM7LNAwKtD69VFp7giE6nQHnYdlyyHBhBxYDonPVP2MsSA8R3MfTXmosHyA== dependencies: - "@theia/core" "^0.3.18" - "@theia/filesystem" "^0.3.18" - "@theia/workspace" "^0.3.18" + "@theia/core" "^0.3.19" + "@theia/filesystem" "^0.3.19" + "@theia/workspace" "^0.3.19" fuzzy "^0.1.3" minimatch "^3.0.4" -"@theia/outline-view@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-0.3.18.tgz#b53e0ea8f7568168f839e5b121242eb92d1189e4" - integrity sha512-Dm5EoCZAzxfU6WiAVQaWUbgroQjl/fD9PgV/nflG1d12lSkh/SnTFWYfkEmbzT5Dz1ZRvVm3ouU0zP6AY4M1Cg== +"@theia/outline-view@^0.3.19": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-0.3.19.tgz#4880519797bc8997837080833090d60c129f63e8" + integrity sha512-BOwqsc2u0ou2v5gboqGlZ38CUgX23mHatbAQenOntEilHNYi4pcXdA6ogzfwgu+MigQGy+5aNa+vduJiGu77ew== dependencies: - "@theia/core" "^0.3.18" + "@theia/core" "^0.3.19" -"@theia/output@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/output/-/output-0.3.18.tgz#3bd4ca0286a1093b94906d03525c666ef3cd2cc2" - integrity sha512-JLcroYx4VSWbsRBe0+whXAmTIuPJ3g8GEnuIlnbvGm1tOCe9hyeLAejcRbmHxI8ZbMAyLJNxrkWMSoMKfspKWw== +"@theia/output@^0.3.19": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/output/-/output-0.3.19.tgz#2d7bce2e568acf1a6a2eaac9a12eac0b30b3b896" + integrity sha512-5lK9N+ZQz8/O1Fq+ivFhQbDyg+FVNtW68RcTKWyT10N/Z9dlmoJ7QnwsEw/7njEleCB9W22ugmyyjJp7ik0L5w== dependencies: - "@theia/core" "^0.3.18" + "@theia/core" "^0.3.19" -"@theia/process@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/process/-/process-0.3.18.tgz#921c734b259ec5f35a18867c780a17cb89fb2010" - integrity sha512-YzyzUYISw/3MH1CfP3ag0EM7pXTtP+favhx7DQfDtAQScg4K4xxp3UYiOYJaBUQqnpng3lvF1dcu0Nrdvg9TfQ== +"@theia/process@^0.3.19": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/process/-/process-0.3.19.tgz#1dddd0d3dfc4e6b87c76157fb10f33fb76179b70" + integrity sha512-H/hje3afKKaCq0rUXux/ZoXnJE6peP7TkhTlULfloAq1Yfjv7dH6CqBW8TLHc4ExJbCSoYqAQVmlG69WcqWCLQ== dependencies: - "@theia/core" "^0.3.18" + "@theia/core" "^0.3.19" node-pty "0.7.6" string-argv "^0.1.1" -"@theia/variable-resolver@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-0.3.18.tgz#ec2ad578d1e4df580c27df6f05c16782e5f907d0" - integrity sha512-oDosZkReXAelPqG9+p0JgKKTnQw9m+zLhPN6fTGuL+Nfd1Xab1J5otS7ZCora99yr666+BXmV+PUDupZmA3mWw== +"@theia/variable-resolver@^0.3.19": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-0.3.19.tgz#215671143c843f6187c414159a19208308972a07" + integrity sha512-6dMugQgsGs5ERnrjElFfvTglG+IxgQp0nYUkWGIfZkvbDo6zVe0coXY9pikIFxAJyrq1kkngCr6QwrNqq8gGRA== dependencies: - "@theia/core" "^0.3.18" + "@theia/core" "^0.3.19" -"@theia/workspace@^0.3.18": - version "0.3.18" - resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-0.3.18.tgz#c044fda2a968cc37f7a8edc1560f9cc5a648eef2" - integrity sha512-fo4K0R2jit3Hg2fS17kWrmWSYKONx6LuAOQqMyWfAo+P05P0kyGqot/lcuDg9WsU29vab8kY260lVD4i5MhhSA== +"@theia/workspace@^0.3.19": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-0.3.19.tgz#ad4f3234286371435345461f0577bec8f52f2132" + integrity sha512-qkCc/xfJT62ytSL+BcYU0BiVinn+d0jIYNxAb0KIvkk8S1uapkehJc60PZhYiTxramdQTo98b333iVCjMIIuEA== dependencies: - "@theia/core" "^0.3.18" - "@theia/filesystem" "^0.3.18" - "@theia/variable-resolver" "^0.3.18" + "@theia/core" "^0.3.19" + "@theia/filesystem" "^0.3.19" + "@theia/variable-resolver" "^0.3.19" "@types/fs-extra" "^4.0.2" ajv "^6.5.3" fs-extra "^4.0.2" @@ -364,23 +365,22 @@ "@types/node" "*" "@types/events@*": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86" - integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA== + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" + integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g== "@types/express-serve-static-core@*": - version "4.16.0" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz#fdfe777594ddc1fe8eb8eccce52e261b496e43e7" - integrity sha512-lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w== + version "4.16.1" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.1.tgz#35df7b302299a4ab138a643617bd44078e74d44e" + integrity sha512-QgbIMRU1EVRry5cIu1ORCQP4flSYqLM1lS5LYyGWfKnFT3E58f0gKto7BR13clBFVrVZ0G0rbLZ1hUpSkgQQOA== dependencies: - "@types/events" "*" "@types/node" "*" "@types/range-parser" "*" "@types/express@^4.16.0": - version "4.16.0" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.0.tgz#6d8bc42ccaa6f35cf29a2b7c3333cb47b5a32a19" - integrity sha512-TtPEYumsmSTtTetAPXlJVf3kEqb6wZK0bZojpJQrnD/djV4q1oB6QQ8aKvKqwNPACoe02GNiy5zDzcYivR5Z2w== + version "4.16.1" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.1.tgz#d756bd1a85c34d87eaf44c888bad27ba8a4b7cf0" + integrity sha512-V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg== dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "*" @@ -433,9 +433,9 @@ "@types/lodash" "*" "@types/lodash@*": - version "4.14.119" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.119.tgz#be847e5f4bc3e35e46d041c394ead8b603ad8b39" - integrity sha512-Z3TNyBL8Vd/M9D9Ms2S3LmFq2sSMzahodD6rCS9V2N44HUMINb75jNkSuwAx7eo2ufqTdfOdtGQpNbieUjPQmw== + version "4.14.120" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.120.tgz#cf265d06f6c7a710db087ed07523ab8c1a24047b" + integrity sha512-jQ21kQ120mo+IrDs1nFNVm/AsdFxIx2+vZ347DbogHJPd/JzKNMOqU6HCYin1W6v8l5R9XSO2/e9cxmn7HAnVw== "@types/mime-types@^2.1.0": version "2.1.0" @@ -443,9 +443,9 @@ integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= "@types/mime@*": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b" - integrity sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA== + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d" + integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw== "@types/minimatch@*": version "3.0.3" @@ -453,9 +453,9 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "10.12.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67" - integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ== + version "10.12.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e" + integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ== "@types/node@^8.0.24": version "8.10.39" @@ -473,24 +473,24 @@ integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== "@types/react-dom@^16.0.6": - version "16.0.11" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.0.11.tgz#bd10ccb0d9260343f4b9a49d4f7a8330a5c1f081" - integrity sha512-x6zUx9/42B5Kl2Vl9HlopV8JF64wLpX3c+Pst9kc1HgzrsH+mkehe/zmHMQTplIrR48H2gpU7ZqurQolYu8XBA== + version "16.8.0" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.0.tgz#c565f43f9d2ec911f9e0b8f3b74e25e67879aa3f" + integrity sha512-Jp4ufcEEjVJEB0OHq2MCZcE1u3KYUKO6WnSuiU/tZeYeiZxUoQavfa/TZeiIT+1XoN6l0lQVNM30VINZFDeolQ== dependencies: "@types/react" "*" "@types/react-virtualized@^9.18.3": - version "9.18.11" - resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.11.tgz#921d20bea4f18de533f89539f313f7688aededdf" - integrity sha512-KT2FzDtV9YT2uN+5g9HPaME4Dtdlh7tEHEqTsOExWYzJGZjGKqHgBHTZC0vnHkzU1rXF9rVDxpi5MZuApoO7rA== + version "9.18.12" + resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.12.tgz#541e65c5e0b4629d6a1c6f339171c7943e016ecb" + integrity sha512-Msdpt9zvYlb5Ul4PA339QUkJ0/z2O+gaFxed1rG+2rZjbe6XdYo7jWfJe206KBnjj84DwPPIbPFQCtoGuNwNTQ== dependencies: "@types/prop-types" "*" "@types/react" "*" "@types/react@*", "@types/react@^16.4.1": - version "16.7.18" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.7.18.tgz#f4ce0d539a893dd61e36cd11ae3a5e54f5a48337" - integrity sha512-Tx4uu3ppK53/iHk6VpamMP3f3ahfDLEVt3ZQc8TFm30a1H3v9lMsCntBREswZIW/SKrvJjkb3Hq8UwO6GREBng== + version "16.8.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.2.tgz#3b7a7f7ea89d1c7d68b00849fb5de839011c077b" + integrity sha512-6mcKsqlqkN9xADrwiUz2gm9Wg4iGnlVGciwBRYFQSMWG6MQjhOZ/AVnxn+6v8nslFgfYTV8fNdE6XwKu6va5PA== dependencies: "@types/prop-types" "*" csstype "^2.2.0" @@ -544,9 +544,9 @@ integrity sha1-ECidQugFMPOZfzQT6rGsbvkCfQw= "@types/tough-cookie@*": - version "2.3.4" - resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.4.tgz#821878b81bfab971b93a265a561d54ea61f9059f" - integrity sha512-Set5ZdrAaKI/qHdFlVMgm/GsAv/wkXhSTuZFkJ+JI7HK+wIkIlOaUXSXieIvJ0+OvGIqtREFoE+NHJtEq0gtEw== + version "2.3.5" + resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.5.tgz#9da44ed75571999b65c37b60c9b2b88db54c585d" + integrity sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg== "@types/uuid@^3.4.3": version "3.4.4" @@ -587,9 +587,9 @@ accepts@~1.3.5: negotiator "0.6.1" ajv@^6.5.3, ajv@^6.5.5: - version "6.6.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" - integrity sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g== + version "6.8.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.8.1.tgz#0890b93742985ebf8973cd365c5b23920ce3cb20" + integrity sha512-eqxCp82P+JfqL683wwsL73XmFs1eG6qjw+RD3YHx+Jll1r0jNd4dh8QG9NYAeNGA/hnZjeEDgtTskgJULbxpWQ== dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -641,11 +641,6 @@ array-uniq@^1.0.1: resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= -arrify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= - asn1@~0.2.3: version "0.2.4" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" @@ -719,9 +714,11 @@ bcrypt-pbkdf@^1.0.0: tweetnacl "^0.14.3" bindings@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.1.tgz#21fc7c6d67c18516ec5aaa2815b145ff77b26ea5" - integrity sha512-i47mqjF9UbjxJhxGf+pZ6kSxrnI3wBLlnGI2ArWJ4r0VrvDS7ZYXkprq/pLaBWYq4GM0r4zdHY+NNRqEMU7uew== + version "1.4.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.4.0.tgz#909efa49f2ebe07ecd3cb136778f665052040127" + integrity sha512-7znEVX22Djn+nYjxCWKDne0RRloa9XfYa84yk3s+HkE3LpDYZmhArYr9O9huBoHY3/oXispx5LorIX7Sl2CgSQ== + dependencies: + file-uri-to-path "1.0.0" bl@^1.0.0: version "1.2.2" @@ -778,11 +775,6 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== -builtin-modules@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -893,9 +885,9 @@ cookie@0.3.1: integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= core-js@^2.4.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042" - integrity sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg== + version "2.6.3" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.3.tgz#4b70938bdffdaf64931e66e2db158f0892289c49" + integrity sha512-l00tmFFZOBHtYhN4Cz7k32VM7vTn3rE2ANjQDxdEN6zmXZ/xq1jQuutnmHvMG1ZJ7xd72+TA5YpUK8wz3rWsfQ== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -939,9 +931,9 @@ cross-spawn@^6.0.0: which "^1.2.9" csstype@^2.2.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.0.tgz#6cf7b2fa7fc32aab3d746802c244d4eda71371a2" - integrity sha512-by8hi8BlLbowQq0qtkx54d9aN73R9oUW20HISpka5kmgsR9F7nnxgfsemuR2sdCKZh+CDNf5egW9UZMm4mgJRg== + version "2.6.2" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.2.tgz#3043d5e065454579afc7478a18de41909c8a2f01" + integrity sha512-Rl7PvTae0pflc1YtxtKbiSqq20Ts6vpIYOD5WBafl4y123DyHUeLrRdQP66sQW8/6gmX8jrYJLXwNeMqYVJcow== currently-unhandled@^0.4.1: version "0.4.1" @@ -1029,11 +1021,10 @@ detect-libc@^1.0.3: integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= dir-glob@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" - integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag== + version "2.2.2" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" + integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== dependencies: - arrify "^1.0.1" path-type "^3.0.0" "dom-helpers@^2.4.0 || ^3.0.0": @@ -1044,9 +1035,9 @@ dir-glob@^2.0.0: "@babel/runtime" "^7.1.2" drivelist@^6.4.3: - version "6.4.3" - resolved "https://registry.yarnpkg.com/drivelist/-/drivelist-6.4.3.tgz#b6bf640d26e77ccba2f90c47134bd3b6a34f9709" - integrity sha512-VwQ/7jQeEvZkDNMOUzqcI7ADx25wSxPK9hPD7HubTLPMBcBhIyAAoYb+fhH1XP2TOmGx7wcZ5+Zb22Xiq2fGkQ== + version "6.4.6" + resolved "https://registry.yarnpkg.com/drivelist/-/drivelist-6.4.6.tgz#3d092dd8b771fbcfda170784ba0d72db58c7554a" + integrity sha512-FVeQE8GQppabnXm5J3tz3+nNZUWBixLYl2jGuLnCI/LhpopOj6+/fvPMgaWXC/SW/gceVALCx/EBRk8HiXqB5w== dependencies: bindings "^1.3.0" debug "^3.1.0" @@ -1083,9 +1074,9 @@ electron-download@^3.0.1: sumchecker "^1.2.0" electron@^2.0.14: - version "2.0.16" - resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.16.tgz#cf338fdc0ff4e2df4f6536c968338d6f8b621820" - integrity sha512-mlC91VDuBU8x9tdGGISznrBCsnPKO1tBskXtBQhceBt0zWUZtV6eURVF5RaY5QK5Q+eBzVJbFT4+LUVupNwhSg== + version "2.0.17" + resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.17.tgz#871c02eabcdfe11f7452c01b2f36510241b6de19" + integrity sha512-lbACWEiuiHFeSps3rB9DclD2zvwAIrTc2wmHUjZ3NAS64/jY5zXZuGxw0E28zVzCvMLtvvfF5wc5m1PIlz2TGA== dependencies: "@types/node" "^8.0.24" electron-download "^3.0.1" @@ -1273,6 +1264,11 @@ file-icons-js@^1.0.3: resolved "https://registry.yarnpkg.com/file-icons-js/-/file-icons-js-1.0.3.tgz#d0765dc1d86aba4b2d7664a39e4ef7af9f12c5af" integrity sha512-n4zoKEpMaAxBTUB7wtgrFBa4dM3b7mBLLA1VI/Q5Cdk/k2UA8S8oaxvnECp3QOzg0Dn+KKRzfIHF7qSdRkA65Q== +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + filename-reserved-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" @@ -1599,13 +1595,6 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74= - dependencies: - builtin-modules "^1.0.0" - is-electron@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.0.tgz#8943084f09e8b731b3a7a0298a7b5d56f6b7eef0" @@ -1696,9 +1685,9 @@ json-stringify-safe@~5.0.1: integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= jsonc-parser@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.2.tgz#42fcf56d70852a043fadafde51ddb4a85649978d" - integrity sha512-TSU435K5tEKh3g7bam1AFf+uZrISheoDsLlpmAo6wWZYqjsnd09lHYK1Qo+moK4Ikifev1Gdpa69g4NELKnCrQ== + version "2.0.3" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.3.tgz#6d4199ccab7f21ff5d2a4225050c54e981fb21a2" + integrity sha512-WJi9y9ABL01C8CxTKxRRQkkSpY/x2bo4Gy0WuiZGrInxQqgxQpvkBCLNcDYcHOSdhx4ODgbFcgAvfL49C+PHgQ== jsonfile@^2.1.0: version "2.4.0" @@ -1909,9 +1898,9 @@ mkdirp@0.5.1, mkdirp@^0.5.1, mkdirp@~0.5.1: minimist "0.0.8" moment@^2.21.0: - version "2.23.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.23.0.tgz#759ea491ac97d54bac5ad776996e2a58cc1bc225" - integrity sha512-3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA== + version "2.24.0" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" + integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== monaco-css@^2.0.1: version "2.3.0" @@ -1987,9 +1976,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-abi@^2.2.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.5.1.tgz#bb17288fc3b2f68fea0ed9897c66979fd754ed47" - integrity sha512-oDbFc7vCFx0RWWCweTer3hFm1u+e60N5FtGnmRV6QqvgATGFH/XRR6vqWIeBVosCYCqt6YdIr2L0exLZuEdVcQ== + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.7.0.tgz#e2f814088ab97c85504ae2bacb8f93d5d77cbc2b" + integrity sha512-egTtvNoZLMjwxkL/5iiJKYKZgn2im0zP+G+PncMxICYGiD3aZtXUvEsDmu0pF8gpASvLZyD8v53qi1/ELaRZpg== dependencies: semver "^5.4.1" @@ -2013,12 +2002,12 @@ nopt@~1.0.10: abbrev "1" normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" - integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== dependencies: hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" + resolve "^1.10.0" semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" @@ -2151,9 +2140,9 @@ p-try@^1.0.0: integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= pako@~1.0.2: - version "1.0.7" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27" - integrity sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ== + version "1.0.8" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4" + integrity sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA== parse-json@^2.2.0: version "2.2.0" @@ -2194,6 +2183,11 @@ path-key@^2.0.0, path-key@^2.0.1: resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -2377,14 +2371,14 @@ rc@^1.1.2, rc@^1.1.6: strip-json-comments "~2.0.1" react-dom@^16.4.1: - version "16.7.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.7.0.tgz#a17b2a7ca89ee7390bc1ed5eb81783c7461748b8" - integrity sha512-D0Ufv1ExCAmF38P2Uh1lwpminZFRXEINJe53zRAbm4KPwSyd6DY/uDoS0Blj9jvPpn1+wivKpZYc8aAAN/nAkg== + version "16.8.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.1.tgz#ec860f98853d09d39bafd3a6f1e12389d283dbb4" + integrity sha512-N74IZUrPt6UiDjXaO7UbDDFXeUXnVhZzeRLy/6iqqN1ipfjrhR60Bp5NuBK+rv3GMdqdIuwIl22u1SYwf330bg== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.12.0" + scheduler "^0.13.1" react-lifecycles-compat@^3.0.4: version "3.0.4" @@ -2404,14 +2398,14 @@ react-virtualized@^9.20.0: react-lifecycles-compat "^3.0.4" react@^16.4.1: - version "16.7.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381" - integrity sha512-StCz3QY8lxTb5cl2HJxjwLFOXPIFQp+p+hxQfc8WE0QiLfCtIlKj8/+5tjjKm8uSTlAW+fCPaavGFS06V9Ar3A== + version "16.8.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.8.1.tgz#ae11831f6cb2a05d58603a976afc8a558e852c4a" + integrity sha512-wLw5CFGPdo7p/AgteFz7GblI2JPOos0+biSoxf1FPsGxWQZdN/pj6oToJs1crn61DL3Ln7mN86uZ4j74p31ELQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.12.0" + scheduler "^0.13.1" read-pkg-up@^1.0.1: version "1.0.1" @@ -2477,9 +2471,9 @@ redent@^1.0.0: strip-indent "^1.0.1" reflect-metadata@^0.1.10: - version "0.1.12" - resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2" - integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A== + version "0.1.13" + resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" + integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== regenerator-runtime@^0.11.0: version "0.11.1" @@ -2534,6 +2528,13 @@ require-main-filename@^1.0.1: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= +resolve@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" + integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg== + dependencies: + path-parse "^1.0.6" + rimraf@^2.2.8, rimraf@^2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -2570,10 +2571,10 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, s resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -scheduler@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.12.0.tgz#8ab17699939c0aedc5a196a657743c496538647b" - integrity sha512-t7MBR28Akcp4Jm+QoR63XgAi9YgCUmgvDHqf5otgAj4QvdoBE4ImCX0ffehefePPG+aitiYHp0g/mW6s4Tp+dw== +scheduler@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.1.tgz#1a217df1bfaabaf4f1b92a9127d5d732d85a9591" + integrity sha512-VJKOkiKIN2/6NOoexuypwSrybx13MY7NSy9RNt8wPvZDMRT1CW6qlpF5jXRToXNHz3uWzbm2elNpZfXfGPqP9A== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -2720,9 +2721,9 @@ speedometer@~0.1.2: integrity sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0= sshpk@^1.7.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de" - integrity sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ== + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -2926,9 +2927,9 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= typescript@^3.1.3: - version "3.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5" - integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg== + version "3.3.1" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.1.tgz#6de14e1db4b8a006ac535e482c8ba018c55f750b" + integrity sha512-cTmIDFW7O0IHbn1DPYjkiebHxwtCMU+eTy30ZtJNBPF9j2O1ITu5XH2YnBeVRKWHqF+3JQwWJv0Q0aUgX8W7IA== universalify@^0.1.0: version "0.1.2" @@ -3095,9 +3096,9 @@ wrappy@1: integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= write-file-atomic@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" - integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA== + version "2.4.2" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9" + integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g== dependencies: graceful-fs "^4.1.11" imurmurhash "^0.1.4" diff --git a/theia-extensions/theia-concourse/concourse/package.json b/theia-extensions/theia-concourse/concourse/package.json index 586093180..79a1b3844 100644 --- a/theia-extensions/theia-concourse/concourse/package.json +++ b/theia-extensions/theia-concourse/concourse/package.json @@ -12,7 +12,7 @@ "dependencies": { "@theia/core": "latest", "@theia/languages": "latest", - "@pivotal-tools/theia-languageclient": "0.0.6" + "@pivotal-tools/theia-languageclient": "0.0.7" }, "devDependencies": { "rimraf": "^2.6.2", diff --git a/theia-extensions/theia-concourse/yarn.lock b/theia-extensions/theia-concourse/yarn.lock index 4e3709c28..78843af50 100644 --- a/theia-extensions/theia-concourse/yarn.lock +++ b/theia-extensions/theia-concourse/yarn.lock @@ -125,10 +125,10 @@ resolved "https://registry.yarnpkg.com/@pivotal-tools/jvm-launch-utils/-/jvm-launch-utils-0.0.11.tgz#11e8cc4850aa16a91c7579a8e3ed2a071acc36ba" integrity sha512-PSBzegFv+m1AaAlHBtWzfxdxZG3RFJaTNk0ognOjDV+URrPnMWkD2DBt4pgEGynpnnK8G5WZZGVu5flcIsKGyQ== -"@pivotal-tools/theia-languageclient@0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@pivotal-tools/theia-languageclient/-/theia-languageclient-0.0.6.tgz#58a28dfc4b02faae4ff100c037e8bbe0d9f38b17" - integrity sha512-cmsFulaixIrtTzlaBe+S7zKjrPnrulyBefnzl+9nyya/ja4yYog7BL40CI6JEZV/56rdnsBynRyqFRWDfHZV+A== +"@pivotal-tools/theia-languageclient@0.0.7": + version "0.0.7" + resolved "https://registry.yarnpkg.com/@pivotal-tools/theia-languageclient/-/theia-languageclient-0.0.7.tgz#d02d7ce308eb6abe4eddd7adc9f26eebcb64935b" + integrity sha512-sM7HJpIn0SbQWsqif8XbhdMZKS97e/0853A3M8jeLH6Y7uliA/wKBOJltoqpZz7MKl0PiHydQXrXay6AFuhNvA== dependencies: "@pivotal-tools/jvm-launch-utils" "0.0.11" "@theia/core" latest diff --git a/theia-extensions/theia-spring-boot/spring-boot/package.json b/theia-extensions/theia-spring-boot/spring-boot/package.json index feb80ddba..9f838cae4 100644 --- a/theia-extensions/theia-spring-boot/spring-boot/package.json +++ b/theia-extensions/theia-spring-boot/spring-boot/package.json @@ -12,7 +12,7 @@ ], "dependencies": { "@pivotal-tools/jvm-launch-utils": "0.0.11", - "@pivotal-tools/theia-languageclient": "0.0.6", + "@pivotal-tools/theia-languageclient": "0.0.7", "@theia/core": "latest", "@theia/editor": "latest", "@theia/java": "latest", diff --git a/theia-extensions/theia-spring-boot/spring-boot/src/browser/java-data.ts b/theia-extensions/theia-spring-boot/spring-boot/src/browser/java-data.ts new file mode 100644 index 000000000..6a99d1715 --- /dev/null +++ b/theia-extensions/theia-spring-boot/spring-boot/src/browser/java-data.ts @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2019 Pivotal, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Pivotal, Inc. - initial API and implementation + *******************************************************************************/ +import {injectable, inject} from 'inversify'; +import {CommandRegistry} from '@theia/core/lib/common'; +import {ILanguageClient} from '@theia/languages/lib/browser'; + +export const JAVA_TYPE_REQUEST_TYPE = 'sts/javaType'; +export const JAVADOC_HOVER_LINK_REQUEST_TYPE = 'sts/javadocHoverLink'; +export const JAVA_LOCATION_REQUEST_TYPE = 'sts/javaLocation'; +export const JAVADOC_REQUEST_TYPE = 'sts/javadoc'; + +@injectable() +export class JavaDataService { + + constructor( + @inject(CommandRegistry) protected readonly commands: CommandRegistry + ) { + } + + attach(client: ILanguageClient) { + client.onRequest(JAVA_TYPE_REQUEST_TYPE, (params: JavaDataParams) => this.commands.executeCommand('sts.java.type', params)); + client.onRequest(JAVADOC_HOVER_LINK_REQUEST_TYPE, (params: JavaDataParams) => this.commands.executeCommand('sts.java.javadocHoverLink', params)); + client.onRequest(JAVA_LOCATION_REQUEST_TYPE, (params: JavaDataParams) => this.commands.executeCommand('sts.java.location', params)); + client.onRequest(JAVADOC_REQUEST_TYPE, (params: JavaDataParams) => this.commands.executeCommand('sts.java.javadoc', params)); + } + +} + +interface JavaDataParams { + projectUri?: string; + bindingKey: string; + lookInOtherProjects?: boolean +} \ No newline at end of file diff --git a/theia-extensions/theia-spring-boot/spring-boot/src/browser/language-client-contribution.ts b/theia-extensions/theia-spring-boot/spring-boot/src/browser/language-client-contribution.ts index 024a9d365..1d55aeeb3 100644 --- a/theia-extensions/theia-spring-boot/spring-boot/src/browser/language-client-contribution.ts +++ b/theia-extensions/theia-spring-boot/spring-boot/src/browser/language-client-contribution.ts @@ -27,6 +27,7 @@ import {Disposable} from '@theia/core'; import {OpenerService} from '@theia/core/lib/browser'; import URI from '@theia/core/lib/common/uri'; import {JavaClientContribution} from '@theia/java/lib/browser'; +import {JavaDataService} from './java-data'; const HIGHLIGHTS_NOTIFICATION_TYPE = 'sts/highlight'; @@ -47,7 +48,8 @@ export class SpringBootClientContribution extends StsLanguageClientContribution< @inject(ClasspathService) protected readonly classpathService: ClasspathService, @inject(BootPreferences) protected readonly preferences: BootPreferences, @inject(OpenerService) private readonly openerService: OpenerService, - @inject(JavaClientContribution) private readonly javaClientContribution: JavaClientContribution + @inject(JavaClientContribution) private readonly javaClientContribution: JavaClientContribution, + @inject(JavaDataService) private readonly javaDataService: JavaDataService ) { super(workspace, languages, languageClientFactory); } @@ -62,6 +64,7 @@ export class SpringBootClientContribution extends StsLanguageClientContribution< } }); this.classpathService.attach(client); + this.javaDataService.attach(client); this.preferences.onPreferenceChanged(event => { if (event.preferenceName === CODELENS_PREF_NAME diff --git a/theia-extensions/theia-spring-boot/spring-boot/src/browser/spring-boot-frontend-module.ts b/theia-extensions/theia-spring-boot/spring-boot/src/browser/spring-boot-frontend-module.ts index b84294023..5dec21a55 100644 --- a/theia-extensions/theia-spring-boot/spring-boot/src/browser/spring-boot-frontend-module.ts +++ b/theia-extensions/theia-spring-boot/spring-boot/src/browser/spring-boot-frontend-module.ts @@ -19,6 +19,7 @@ import { LanguageGrammarDefinitionContribution } from '@theia/monaco/lib/browser import { BootPropertiesGrammarContribution } from './boot-properties-grammar-contribution'; import { BootYamlGrammarContribution } from './boot-yaml-grammar-contribution'; import { ClasspathService } from './classpath-service'; +import {JavaDataService} from './java-data'; export default new ContainerModule(bind => { // add your contribution bindings here @@ -29,4 +30,5 @@ export default new ContainerModule(bind => { bind(HighlightService).toSelf().inSingletonScope(); bind(HighlightCodeLensService).toSelf().inSingletonScope(); bind(ClasspathService).toSelf().inSingletonScope(); + bind(JavaDataService).toSelf().inRequestScope(); }); \ No newline at end of file diff --git a/theia-extensions/theia-spring-boot/yarn.lock b/theia-extensions/theia-spring-boot/yarn.lock index 0bc992b21..e99606825 100644 --- a/theia-extensions/theia-spring-boot/yarn.lock +++ b/theia-extensions/theia-spring-boot/yarn.lock @@ -125,10 +125,10 @@ resolved "https://registry.yarnpkg.com/@pivotal-tools/jvm-launch-utils/-/jvm-launch-utils-0.0.11.tgz#11e8cc4850aa16a91c7579a8e3ed2a071acc36ba" integrity sha512-PSBzegFv+m1AaAlHBtWzfxdxZG3RFJaTNk0ognOjDV+URrPnMWkD2DBt4pgEGynpnnK8G5WZZGVu5flcIsKGyQ== -"@pivotal-tools/theia-languageclient@0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@pivotal-tools/theia-languageclient/-/theia-languageclient-0.0.6.tgz#58a28dfc4b02faae4ff100c037e8bbe0d9f38b17" - integrity sha512-cmsFulaixIrtTzlaBe+S7zKjrPnrulyBefnzl+9nyya/ja4yYog7BL40CI6JEZV/56rdnsBynRyqFRWDfHZV+A== +"@pivotal-tools/theia-languageclient@0.0.7": + version "0.0.7" + resolved "https://registry.yarnpkg.com/@pivotal-tools/theia-languageclient/-/theia-languageclient-0.0.7.tgz#d02d7ce308eb6abe4eddd7adc9f26eebcb64935b" + integrity sha512-sM7HJpIn0SbQWsqif8XbhdMZKS97e/0853A3M8jeLH6Y7uliA/wKBOJltoqpZz7MKl0PiHydQXrXay6AFuhNvA== dependencies: "@pivotal-tools/jvm-launch-utils" "0.0.11" "@theia/core" latest