Skip to content

Commit 39eebb8

Browse files
committed
java path
1 parent bec103e commit 39eebb8

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/extension.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function startClient() {
108108
}
109109
};
110110

111-
let socketMode = true;
111+
let socketMode = false;
112112
let serverOptions: ServerOptions;
113113
if (socketMode) {
114114
// The server is a started as a separate app and listens on port 5007
@@ -152,7 +152,7 @@ function startClient() {
152152

153153
onDidChangeActiveTextEditor(vscode.window.activeTextEditor);
154154
}).catch(reson => {
155-
vscode.window.showErrorMessage("Failed to start `EmmyLua` language server!", "Try again").then(item => {
155+
vscode.window.showErrorMessage(`Failed to start "EmmyLua" language server!\n${reson}`, "Try again").then(item => {
156156
startClient();
157157
});
158158
});

src/findJava.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ export default function(): string|null {
1515
var settingsPath = vscode.workspace.getConfiguration("emmylua").get("java.home");
1616
if (settingsPath) {
1717
let javaPath = path.join(<string>settingsPath, "bin", executableFile);
18-
if (validateJava(javaPath)) {
19-
return javaPath;
20-
}
18+
return javaPath;
2119
}
2220

2321
if("JAVA_HOME" in process.env) {

0 commit comments

Comments
 (0)