diff --git a/atom-extensions/atom-bosh/lib/bosh-yaml-client.ts b/atom-extensions/atom-bosh/lib/bosh-yaml-client.ts index de10801b7..b152322db 100644 --- a/atom-extensions/atom-bosh/lib/bosh-yaml-client.ts +++ b/atom-extensions/atom-bosh/lib/bosh-yaml-client.ts @@ -40,8 +40,7 @@ export class BoshYamlClient extends JavaProcessLanguageClient { launchVmArgs(jvm: JVM): Promise { return Promise.resolve([ - '-Dorg.slf4j.simpleLogger.logFile=bosh-yaml.log', - '-Dorg.slf4j.simpleLogger.defaultLogLevel=debug', + '-Dorg.slf4j.simpleLogger.logFile=bosh-yaml.log' ]); } diff --git a/atom-extensions/atom-bosh/package.json b/atom-extensions/atom-bosh/package.json index 0b977dfbb..fd79472f5 100644 --- a/atom-extensions/atom-bosh/package.json +++ b/atom-extensions/atom-bosh/package.json @@ -50,7 +50,7 @@ "dependencies": { "atom-package-deps": "^4.6.0", "download": "^6.2.5", - "@pivotal-tools/atom-languageclient-commons": "0.0.4" + "@pivotal-tools/atom-languageclient-commons": "0.0.5" }, "devDependencies": { "typescript": "^2.7.2", diff --git a/atom-extensions/atom-cf-manifest-yaml/lib/manifest-yaml-language-client.ts b/atom-extensions/atom-cf-manifest-yaml/lib/manifest-yaml-language-client.ts index b8c3c2821..bfe0d1ba4 100644 --- a/atom-extensions/atom-cf-manifest-yaml/lib/manifest-yaml-language-client.ts +++ b/atom-extensions/atom-cf-manifest-yaml/lib/manifest-yaml-language-client.ts @@ -10,6 +10,7 @@ export class ManifestYamlLanguageClient extends JavaProcessLanguageClient { path.join(__dirname, '..', 'server'), 'cf-manifest-language-server.jar' ); + // this.DEBUG = true; } getGrammarScopes() { @@ -34,8 +35,9 @@ export class ManifestYamlLanguageClient extends JavaProcessLanguageClient { launchVmArgs(jvm: JVM) { return Promise.resolve([ + // '-Xdebug', + // '-agentlib:jdwp=transport=dt_socket,server=y,address=7999,suspend=n', '-Dorg.slf4j.simpleLogger.logFile=manifest-yaml.log', - '-Dorg.slf4j.simpleLogger.defaultLogLevel=debug', ]); } diff --git a/atom-extensions/atom-cf-manifest-yaml/package.json b/atom-extensions/atom-cf-manifest-yaml/package.json index 75c3f5660..aba86593e 100644 --- a/atom-extensions/atom-cf-manifest-yaml/package.json +++ b/atom-extensions/atom-cf-manifest-yaml/package.json @@ -19,9 +19,9 @@ "properties.json" ], "dependencies": { + "@pivotal-tools/atom-languageclient-commons": "0.0.5", "atom-package-deps": "^4.6.0", - "download": "^6.2.5", - "@pivotal-tools/atom-languageclient-commons": "0.0.4" + "download": "^6.2.5" }, "devDependencies": { "typescript": "^2.7.2", diff --git a/atom-extensions/atom-cf-manifest-yaml/properties.json b/atom-extensions/atom-cf-manifest-yaml/properties.json index 8b84198ce..1bb9070ed 100644 --- a/atom-extensions/atom-cf-manifest-yaml/properties.json +++ b/atom-extensions/atom-cf-manifest-yaml/properties.json @@ -1,3 +1,3 @@ { - "jarUrl": "https://s3-us-west-1.amazonaws.com/s3-test.spring.io/sts4/fatjars/snapshots/manifest-yaml-language-server-0.1.5-201803080105.jar" + "jarUrl": "https://s3-us-west-1.amazonaws.com/s3-test.spring.io/sts4/fatjars/snapshots/manifest-yaml-language-server-0.2.1-201805102140.jar" } diff --git a/atom-extensions/atom-commons/lib/java-process-language-client.ts b/atom-extensions/atom-commons/lib/java-process-language-client.ts index 1006a7e43..ee78d9b46 100644 --- a/atom-extensions/atom-commons/lib/java-process-language-client.ts +++ b/atom-extensions/atom-commons/lib/java-process-language-client.ts @@ -7,6 +7,7 @@ import {ActiveServer, LanguageServerProcess} from 'atom-languageclient'; import {AutoLanguageClient} from 'atom-languageclient'; import {findJdk, findJvm, JVM} from '@pivotal-tools/jvm-launch-utils'; import {InitializeParams} from 'vscode-languageserver-protocol'; +import {Writable} from 'stream'; export class JavaProcessLanguageClient extends AutoLanguageClient { @@ -80,12 +81,35 @@ export class JavaProcessLanguageClient extends AutoLanguageClient { this.socket = connect({ port: 5007 }); - resolve( { + const stdout: any = { + setEncoding: () => { + return stdout; + }, + on: () => stdout + }; + const process: LanguageServerProcess = { + stdin: {}, + stdout: stdout, + stderr: stdout, pid: -1, kill: () => { console.log('fake shutdown'); - } - }) + }, + on: () => process, + addListener: () => process, + prependListener: () => process, + once: () => process, + prependOnceListener: () => process, + removeListener: () => process, + removeAllListeners: () => process, + setMaxListeners: () => process, + getMaxListeners: () => 0, + listeners: () => [], + emit: () => false, + eventNames: () => [], + listenerCount: () => 0 + }; + resolve(process); }); } diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json index 9ddbb592b..a86da9217 100644 --- a/atom-extensions/atom-commons/package.json +++ b/atom-extensions/atom-commons/package.json @@ -1,6 +1,6 @@ { "name": "@pivotal-tools/atom-languageclient-commons", - "version": "0.0.4", + "version": "0.0.5", "description": "Atom language client commons for STS4 language servers", "repository": "https://github.com/spring-projects/sts4", "license": "MIT", diff --git a/atom-extensions/atom-concourse/lib/concourse-ci-yaml-client.ts b/atom-extensions/atom-concourse/lib/concourse-ci-yaml-client.ts index b075a8779..022fea9a4 100644 --- a/atom-extensions/atom-concourse/lib/concourse-ci-yaml-client.ts +++ b/atom-extensions/atom-concourse/lib/concourse-ci-yaml-client.ts @@ -34,8 +34,7 @@ export class ConcourseCiYamlClient extends JavaProcessLanguageClient { launchVmArgs(jvm: JVM) { return Promise.resolve([ - '-Dorg.slf4j.simpleLogger.logFile=concourse-ci-yaml.log', - '-Dorg.slf4j.simpleLogger.defaultLogLevel=debug', + '-Dorg.slf4j.simpleLogger.logFile=concourse-ci-yaml.log' ]); } diff --git a/atom-extensions/atom-concourse/package.json b/atom-extensions/atom-concourse/package.json index d8e5ba088..ca2883273 100644 --- a/atom-extensions/atom-concourse/package.json +++ b/atom-extensions/atom-concourse/package.json @@ -21,7 +21,7 @@ "dependencies": { "atom-package-deps": "^4.6.0", "download": "^6.2.5", - "@pivotal-tools/atom-languageclient-commons": "0.0.4" + "@pivotal-tools/atom-languageclient-commons": "0.0.5" }, "devDependencies": { "typescript": "^2.7.2", diff --git a/atom-extensions/atom-spring-boot/lib/spring-boot-language-client.ts b/atom-extensions/atom-spring-boot/lib/spring-boot-language-client.ts index 1979d840e..29773b7f6 100644 --- a/atom-extensions/atom-spring-boot/lib/spring-boot-language-client.ts +++ b/atom-extensions/atom-spring-boot/lib/spring-boot-language-client.ts @@ -52,8 +52,7 @@ export class SpringBootLanguageClient extends JavaProcessLanguageClient { let vmargs = [ // '-Xdebug', // '-agentlib:jdwp=transport=dt_socket,server=y,address=7999,suspend=n', - '-Dorg.slf4j.simpleLogger.logFile=boot-java.log', - '-Dorg.slf4j.simpleLogger.defaultLogLevel=debug', + '-Dorg.slf4j.simpleLogger.logFile=boot-java.log' ]; if (!jvm.isJdk()) { this.showErrorMessage( diff --git a/atom-extensions/atom-spring-boot/package.json b/atom-extensions/atom-spring-boot/package.json index cbdc4e47f..09bce63ab 100644 --- a/atom-extensions/atom-spring-boot/package.json +++ b/atom-extensions/atom-spring-boot/package.json @@ -27,7 +27,7 @@ } }, "dependencies": { - "@pivotal-tools/atom-languageclient-commons": "0.0.4", + "@pivotal-tools/atom-languageclient-commons": "0.0.5", "atom-package-deps": "^4.6.0", "download": "^6.2.5" },