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

Cleanup JDK9 LS launch support for Atom extensions

Browse Source
This commit is contained in:
BoykoAlex
2017-10-11 11:57:25 -04:00
parent b7a3b4649b
commit 125a6cc6dd
11 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom-extensions/atom-boot-java/lib/main.js
View File

@@ -1,12 +1,12 @@
const path = require('path');
const { JarLanguageClient, StsAdapter } = require('pivotal-atom-languageclient-commons');
const { JavaProcessLanguageClient, StsAdapter } = require('pivotal-atom-languageclient-commons');
const { Convert } = require('atom-languageclient');
const PROPERTIES = require('../properties.json');
const BOOT_DATA_MARKER_TYPE = 'BootApp-Hint';
const BOOT_HINT_GUTTER_NAME = 'boot-hint-gutter';
class BootJavaLanguageClient extends JarLanguageClient {
class BootJavaLanguageClient extends JavaProcessLanguageClient {
constructor() {
//noinspection JSAnnotator

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

@@ -17,7 +17,7 @@
"dependencies": {
"atom-package-deps": "^4.6.0",
"download": "^6.2.5",
"pivotal-atom-languageclient-commons": "0.0.14"
"pivotal-atom-languageclient-commons": "0.0.15"
},
"devDependencies": {
"coffeelint": "^1.10.1"

4
atom-extensions/atom-bosh/lib/main.js
View File

@@ -1,8 +1,8 @@
const path = require('path');
const { JarLanguageClient } = require('pivotal-atom-languageclient-commons');
const { JavaProcessLanguageClient } = require('pivotal-atom-languageclient-commons');
const PROPERTIES = require('../properties.json');
class BoshYamlClient extends JarLanguageClient {
class BoshYamlClient extends JavaProcessLanguageClient {
constructor() {
//noinspection JSAnnotator

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

@@ -19,7 +19,7 @@
"dependencies": {
"atom-package-deps": "^4.6.0",
"download": "^6.2.5",
"pivotal-atom-languageclient-commons": "0.0.14"
"pivotal-atom-languageclient-commons": "0.0.15"
},
"configSchema": {
"bosh": {

4
atom-extensions/atom-cf-manifest-yaml/lib/main.js
View File

@@ -1,8 +1,8 @@
const path = require('path');
const { JarLanguageClient } = require('pivotal-atom-languageclient-commons');
const { JavaProcessLanguageClient } = require('pivotal-atom-languageclient-commons');
const PROPERTIES = require('../properties.json');
class ManifestYamlLanguageClient extends JarLanguageClient {
class ManifestYamlLanguageClient extends JavaProcessLanguageClient {
constructor() {
//noinspection JSAnnotator

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

@@ -19,7 +19,7 @@
"dependencies": {
"atom-package-deps": "^4.6.0",
"download": "^6.2.5",
"pivotal-atom-languageclient-commons": "0.0.14"
"pivotal-atom-languageclient-commons": "0.0.15"
},
"devDependencies": {
"coffeelint": "^1.10.1"

4
atom-extensions/atom-commons/lib/index.js
View File

@@ -1,4 +1,4 @@
import { JarLanguageClient } from './jar-language-client';
import { JavaProcessLanguageClient } from './jave-process-language-client';
import { StsAdapter } from './sts-adapter';
export { JarLanguageClient, StsAdapter };
export { JavaProcessLanguageClient, StsAdapter };

36
atom-extensions/atom-commons/lib/jar-language-client.js → atom-extensions/atom-commons/lib/jave-process-language-client.js
View File

@@ -11,7 +11,7 @@ const { Disposable } = require('atom');
import { StsAdapter } from './sts-adapter';
export class JarLanguageClient extends AutoLanguageClient {
export class JavaProcessLanguageClient extends AutoLanguageClient {
DEBUG = false;
@@ -88,17 +88,25 @@ export class JarLanguageClient extends AutoLanguageClient {
launchProcess(port) {
const command = this.findJavaFile('bin', this.correctBinname('java'));
return this.compatibleJavaVersion(command).then(version => {
return this.javaVesrion(command).then(version => {
if (version) {
return this.launchVmArgs(version).then(args => {
if (version >= 9) {
args.push('--add-modules=java.se.ee');
}
args.push(`-Dserver.port=${port}`);
return this.getOrInstallLauncher().then(launcher => this.doLaunchProcess(command, launcher, port, args));
});
} else {
this.logger.error('Java executable is not Java 8 or higher');
const notification = atom.notifications.addError('Cannot start Language Server', {
dismissable: true,
detail: 'No compatible Java Runtime Environment found',
description: 'The Java Runtime Environment is either below version "1.8" or is missing from the system',
buttons: [{
text: 'OK',
onDidClick: () => {
notification.dismiss()
},
}],
});
}
});
}
@@ -209,18 +217,16 @@ export class JarLanguageClient extends AutoLanguageClient {
return binname;
}
compatibleJavaVersion(javaExecutablePath) {
javaVesrion(javaExecutablePath) {
return new Promise((resolve, reject) => {
cp.execFile(javaExecutablePath, ['-version'], {}, (error, stdout, stderr) => {
cp.execFile(javaExecutablePath, ['-version'], {}, (error, stdout, stderr) => {
if (stderr.indexOf('1.8') >= 0) {
resolve(8);
} else if (stderr.indexOf('java version "9"') >= 0) {
resolve(9);
} else {
resolve(0);
}
});
if (stderr.indexOf('1.8') >= 0) {
resolve(8);
} else if (stderr.indexOf('java version "9"') >= 0) {
resolve(9);
} else {
resolve(0);
}
});
});
}

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

@@ -1,6 +1,6 @@
{
"name": "pivotal-atom-languageclient-commons",
"version": "0.0.14",
"version": "0.0.15",
"description": "Atom language client commons for STS4 language servers",
"repository": "https://github.com/spring-projects/sts4",
"license": "MIT",

4
atom-extensions/atom-concourse/lib/main.js
View File

@@ -1,8 +1,8 @@
const path = require('path');
const { JarLanguageClient } = require('pivotal-atom-languageclient-commons');
const { JavaProcessLanguageClient } = require('pivotal-atom-languageclient-commons');
const PROPERTIES = require('../properties.json');
class ConcourseCiYamlClient extends JarLanguageClient {
class ConcourseCiYamlClient extends JavaProcessLanguageClient {
constructor() {
//noinspection JSAnnotator

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

@@ -19,7 +19,7 @@
"dependencies": {
"atom-package-deps": "^4.6.0",
"download": "^6.2.5",
"pivotal-atom-languageclient-commons": "0.0.14"
"pivotal-atom-languageclient-commons": "0.0.15"
},
"devDependencies": {
"coffeelint": "^1.10.1"