Merge pull request #424 from berberman/languageclient-7.0

jneira · web-flow · commit ae8056ce8a08 · 2021-08-06T11:04:38.000+02:00
Update vscode-languageclient to 7.0.0
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "publisher": "haskell",
   "engines": {
-    "vscode": "^1.39.0"
+    "vscode": "^1.52.0"
   },
   "keywords": [
     "language",
@@ -379,7 +379,7 @@
     "lru-cache": "^4.1.5",
     "request": "^2.88.2",
     "request-promise-native": "^1.0.8",
-    "vscode-languageclient": "6.1.3",
+    "vscode-languageclient": "^7.0.0",
     "yauzl": "^2.10.0"
   }
 }
diff --git a/src/docsBrowser.ts b/src/docsBrowser.ts
@@ -108,7 +108,7 @@ export namespace DocsBrowser {
     });
   }
 
-  function processLink(ms: MarkedString): string | MarkdownString {
+  function processLink(ms: MarkdownString | MarkedString): string | MarkdownString {
     function transform(s: string): string {
       return s.replace(
         /\[(.+)\]\((file:.+\/doc\/(?:.*html\/libraries\/)?([^\/]+)\/(src\/)?(.+\.html#?.*))\)/gi,
diff --git a/src/extension.ts b/src/extension.ts
@@ -19,7 +19,7 @@ import {
   RevealOutputChannelOn,
   ServerOptions,
   TransportKind,
-} from 'vscode-languageclient';
+} from 'vscode-languageclient/node';
 import { CommandNames } from './commands/constants';
 import { ImportIdentifier } from './commands/importIdentifier';
 import { DocsBrowser } from './docsBrowser';

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ export namespace DocsBrowser {`
`108`	`108`	`});`
`109`	`109`	`}`
`110`	`110`
`111`		`- function processLink(ms: MarkedString): string \| MarkdownString {`
	`111`	`+ function processLink(ms: MarkdownString \| MarkedString): string \| MarkdownString {`
`112`	`112`	`function transform(s: string): string {`
`113`	`113`	`return s.replace(`
`114`	`114`	`/\[(.+)\]\((file:.+\/doc\/(?:.html\/libraries\/)?([^\/]+)\/(src\/)?(.+\.html#?.))\)/gi,`