Skip to content
This repository was archived by the owner on Nov 18, 2022. It is now read-only.

Commit 38a4d73

Browse files
committed
Require VSCode ^1.43 and bump vscode-languageclient to ^6.0
1 parent c11e86c commit 38a4d73

File tree

4 files changed

+47
-35
lines changed

4 files changed

+47
-35
lines changed

package-lock.json

Lines changed: 35 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"theme": "dark"
1111
},
1212
"engines": {
13-
"vscode": "^1.36.0"
13+
"vscode": "^1.43.0"
1414
},
1515
"license": "(MIT OR Apache-2.0)",
1616
"repository": {
@@ -50,21 +50,21 @@
5050
"installDevExtension": "npm install && ./node_modules/.bin/vsce package -o ./out/rls-vscode-dev.vsix && code --install-extension ./out/rls-vscode-dev.vsix"
5151
},
5252
"dependencies": {
53-
"vscode-languageclient": "^4.3.0"
53+
"vscode-languageclient": "^6.0.0"
5454
},
5555
"devDependencies": {
5656
"@types/chai": "^4.2.11",
5757
"@types/glob": "^7.1.1",
5858
"@types/mocha": "^5.2.6",
59-
"@types/node": "^10.10",
60-
"@types/vscode": "^1.31.0",
59+
"@types/node": "^12.8.1",
60+
"@types/vscode": "^1.43.0",
6161
"chai": "^4.2.0",
6262
"glob": "^7.1.4",
6363
"mocha": "^6.2.3",
64-
"prettier": "^1.16.4",
64+
"prettier": "^1.19.1",
6565
"tslint": "^5.14.0",
6666
"tslint-config-prettier": "^1.18.0",
67-
"typescript": "^3.0.0",
67+
"typescript": "^3.8.3",
6868
"vsce": "^1.63.0",
6969
"vscode-test": "^1.3.0"
7070
},

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ export class ClientWorkspace {
433433
if (this.config.logToFile) {
434434
const logPath = path.join(this.folder.uri.fsPath, `rls${Date.now()}.log`);
435435
const logStream = fs.createWriteStream(logPath, { flags: 'w+' });
436-
childProcess.stderr.pipe(logStream);
436+
childProcess.stderr?.pipe(logStream);
437437
}
438438

439439
return childProcess;

test/suite/extension.test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ async function fetchBriefTasks(): Promise<
8585
return tasks.map(task => ({
8686
subcommand: task.definition.subcommand,
8787
group: task.group,
88-
cwd: task.execution && task.execution.options && task.execution.options.cwd,
88+
cwd:
89+
((task.execution instanceof vscode.ProcessExecution ||
90+
task.execution instanceof vscode.ShellExecution) &&
91+
task.execution?.options?.cwd) ||
92+
undefined,
8993
}));
9094
}
9195

0 commit comments

Comments
 (0)