Merge pull request #790 from rust-lang/bump-vscode

Bump required VSCode version and use LSP 3.15

Author: Xanewok

.github/workflows/nodejs.yml

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

.github/workflows/release.yml

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

CHANGELOG.md

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

package-lock.json

@@ -10,7 +10,7 @@
         "theme": "dark"
     },
     "engines": {
-        "vscode": "^1.36.0"
+        "vscode": "^1.43.0"
     },
     "license": "(MIT OR Apache-2.0)",
     "repository": {
@@ -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"
     },

package.json

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

src/extension.ts

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