Update vscode-languageclient to v7.0.0 (#153)

* Update vscode-languageclient to v7.0.0 * Fix build triggers According to actions/runner#491 we need to include an `always()` so that if statements evaluate to `true` even when one of the needed jobs is skipped.
swyddfa · Apr 25, 2021 · 7adb1df · 7adb1df
1 parent 10ab8e6
commit 7adb1df
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 39 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -69,7 +69,7 @@ jobs:
   vscode:
     name: VSCode Extension
     needs: [trigger, extensions]
-    if: ${{ needs.trigger.outputs.vscode }}
+    if: always() && needs.trigger.outputs.vscode
     runs-on: ubuntu-20.04 # TODO: Enable windows, macOS builds.
     steps:
     - uses: 'actions/checkout@v2'
@@ -164,7 +164,7 @@ jobs:
   extensions:
     name: "Sphinx Extensions -- Python v${{ matrix.python-version }}"
     needs: [trigger, lsp]
-    if: ${{ needs.trigger.outputs.extensions }}
+    if: always() && needs.trigger.outputs.extensions
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -264,7 +264,7 @@ jobs:
   lsp:
     name: "Language Server -- Python v${{ matrix.python-version }}"
     needs: trigger
-    if: ${{ needs.trigger.outputs.lsp }}
+    if: always() && needs.trigger.outputs.lsp
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -364,7 +364,7 @@ jobs:
   docs:
     name: Documentation
     needs: [trigger, vscode]
-    if: ${{ needs.trigger.outputs.docs }}
+    if: always() && needs.trigger.outputs.docs
     runs-on: ubuntu-20.04
     steps:
     - uses: 'actions/checkout@v2'

diff --git a/code/changes/152.misc.rst b/code/changes/152.misc.rst
@@ -0,0 +1 @@
+Update `vscode-languageclient` to v7.0.0
diff --git a/code/package-lock.json b/code/package-lock.json
diff --git a/code/package.json b/code/package.json
@@ -23,14 +23,14 @@
     "main": "dist/extension",
     "dependencies": {
         "semver": "^7.3.2",
-        "vscode-languageclient": "^6.1.3"
+        "vscode-languageclient": "^7.0.0"
     },
     "devDependencies": {
         "@types/glob": "^7.1.3",
         "@types/mocha": "^8.2.0",
         "@types/node": "^14.14.7",
         "@types/semver": "^7.3.4",
-        "@types/vscode": "^1.43.0",
+        "@types/vscode": "^1.52.0",
         "mocha": "^8.2.1",
         "ts-loader": "^8.0.11",
         "typescript": "^4.0.5",
@@ -41,7 +41,7 @@
         "webpack-cli": "^4.2.0"
     },
     "engines": {
-        "vscode": "^1.43.0"
+        "vscode": "^1.52.0"
     },
     "activationEvents": [
         "onLanguage:rst",
@@ -198,4 +198,4 @@
             }
         ]
     }
-}
+}
diff --git a/code/src/extension.ts b/code/src/extension.ts
@@ -1,6 +1,6 @@
 import * as semver from "semver";
 import * as vscode from "vscode";
-import { LanguageClient, } from "vscode-languageclient";
+import { LanguageClient, } from "vscode-languageclient/node";
 
 import { getPython, registerCommands, UPDATE_LANGUAGE_SERVER } from "./commands";
 import { LanguageServerBootstrap } from "./language-server";

diff --git a/code/src/language-server.ts b/code/src/language-server.ts
@@ -5,10 +5,12 @@ import * as vscode from "vscode";
 import { request, RequestOptions } from "https"
 import { join } from "path";
 import { promisify } from "util";
+import { LanguageClientOptions } from 'vscode-languageclient';
+import { Executable, LanguageClient, ServerOptions } from "vscode-languageclient/node";
 
 import { INSTALL_LANGUAGE_SERVER, UPDATE_LANGUAGE_SERVER } from "./commands"
 import { getOutputLogger } from "./log"
-import { Executable, LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient';
+
 
 const MIN_PYTHON = "3.6.0"
 const LAST_UPDATE = "server.lastUpdate"