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

Bump required VSCode version and use LSP 3.15 #790

Merged
merged 3 commits into from
May 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
# Lock to the version shipped with VSCode 1.36+
node-version: ['10.10']
# Lock to the version shipped with VSCode 1.43+
node-version: ['12.8.1']

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Use Node.js 12.8.1
uses: actions/setup-node@v1
with:
node-version: '12.8.1'
- name: Build extension package
run: |
npm ci
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### Unreleased

* Bump required VSCode version to 1.43, use language server protocol (LSP) v3.15

### 0.7.5 - 2020-05-06

* Remove redundant snippets and improve usability of select ones e.g. `if let`
Expand Down
62 changes: 35 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"theme": "dark"
},
"engines": {
"vscode": "^1.36.0"
"vscode": "^1.43.0"
},
"license": "(MIT OR Apache-2.0)",
"repository": {
Expand Down Expand Up @@ -50,21 +50,21 @@
"installDevExtension": "npm install && ./node_modules/.bin/vsce package -o ./out/rls-vscode-dev.vsix && code --install-extension ./out/rls-vscode-dev.vsix"
},
"dependencies": {
"vscode-languageclient": "^4.3.0"
"vscode-languageclient": "^6.0.0"
},
"devDependencies": {
"@types/chai": "^4.2.11",
"@types/glob": "^7.1.1",
"@types/mocha": "^5.2.6",
"@types/node": "^10.10",
"@types/vscode": "^1.31.0",
"@types/node": "^12.8.1",
"@types/vscode": "^1.43.0",
"chai": "^4.2.0",
"glob": "^7.1.4",
"mocha": "^6.2.3",
"prettier": "^1.16.4",
"prettier": "^1.19.1",
"tslint": "^5.14.0",
"tslint-config-prettier": "^1.18.0",
"typescript": "^3.0.0",
"typescript": "^3.8.3",
"vsce": "^1.63.0",
"vscode-test": "^1.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ export class ClientWorkspace {
if (this.config.logToFile) {
const logPath = path.join(this.folder.uri.fsPath, `rls${Date.now()}.log`);
const logStream = fs.createWriteStream(logPath, { flags: 'w+' });
childProcess.stderr.pipe(logStream);
childProcess.stderr?.pipe(logStream);
}

return childProcess;
Expand Down
6 changes: 5 additions & 1 deletion test/suite/extension.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,11 @@ async function fetchBriefTasks(): Promise<
return tasks.map(task => ({
subcommand: task.definition.subcommand,
group: task.group,
cwd: task.execution && task.execution.options && task.execution.options.cwd,
cwd:
((task.execution instanceof vscode.ProcessExecution ||
task.execution instanceof vscode.ShellExecution) &&
task.execution?.options?.cwd) ||
undefined,
}));
}

Expand Down