Merge branch 'master' of github.com:spring-projects/sts4

This commit is contained in:
Kris De Volder
2018-05-11 12:31:28 -07:00
11 changed files with 40 additions and 17 deletions

View File

@@ -40,8 +40,7 @@ export class BoshYamlClient extends JavaProcessLanguageClient {
launchVmArgs(jvm: JVM): Promise<string[]> {
return Promise.resolve([
'-Dorg.slf4j.simpleLogger.logFile=bosh-yaml.log',
'-Dorg.slf4j.simpleLogger.defaultLogLevel=debug',
'-Dorg.slf4j.simpleLogger.logFile=bosh-yaml.log'
]);
}

View File

@@ -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",

View File

@@ -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',
]);
}

View File

@@ -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",

View File

@@ -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"
}

View File

@@ -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(<LanguageServerProcess> {
const stdout: any = {
setEncoding: () => {
return stdout;
},
on: () => stdout
};
const process: LanguageServerProcess = {
stdin: <Writable>{},
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);
});
}

View File

@@ -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",

View File

@@ -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'
]);
}

View File

@@ -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",

View File

@@ -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(

View File

@@ -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"
},