Migrate from lsp-editor-adapter to (stripped) lsp-ws-connection.

This allows us to:
- remove some dependencies, especially conflicting COdeMirror versions
- remove lots of unused code, since we got the adapter part rewritten
- start customizing the connection behaviout to our liking

Author: krassowski

package.json

@@ -10,7 +10,6 @@
     "eslint-plugin-prettier": "^3.0.1",
     "husky": "^3.0.9",
     "javascript-typescript-langserver": "^2.11.3",
-    "jsonrpc-ws-proxy": "0.0.5",
     "lerna": "^3.13.2",
     "precise-commits": "^1.0.2",
     "prettier": "^1.18.2",

packages/jupyterlab-lsp/package.json

@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@krassowski/jupyterlab_go_to_definition": "^0.7.1",
-    "lsp-editor-adapter": "0.0.10"
+    "lsp-ws-connection": "~0.1.0"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.4.3",

packages/jupyterlab-lsp/src/connection.ts

@@ -8,7 +8,7 @@ import {
   IPosition,
   ITokenInfo,
   LspWsConnection
-} from 'lsp-editor-adapter';
+} from 'lsp-ws-connection';
 import { CompletionTriggerKind } from './lsp';
 import { until_ready } from './utils';
 

packages/jupyterlab-lsp/src/index.ts

@@ -12,11 +12,11 @@ import { IDocumentManager } from '@jupyterlab/docmanager';
 import { FileEditorJumper } from '@krassowski/jupyterlab_go_to_definition/lib/jumpers/fileeditor';
 import { NotebookJumper } from '@krassowski/jupyterlab_go_to_definition/lib/jumpers/notebook';
 
-import 'codemirror/addon/hint/show-hint.css';
-import 'codemirror/addon/hint/show-hint';
+// TODO: make use of it for jump target selection (requires to be added to package.json)?
+// import 'codemirror/addon/hint/show-hint.css';
+// import 'codemirror/addon/hint/show-hint';
 import '../style/index.css';
 
-import 'lsp-editor-adapter/lib/codemirror-lsp.css';
 import { ICompletionManager } from '@jupyterlab/completer';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { NotebookAdapter } from './adapters/jupyterlab/notebook';

yarn.lock

@@ -2142,13 +2142,6 @@
     "@phosphor/signaling" "^1.3.1"
     "@phosphor/virtualdom" "^1.2.0"
 
-"@sourcegraph/vscode-ws-jsonrpc@0.0.3-fork":
-  version "0.0.3-fork"
-  resolved "https://registry.yarnpkg.com/@sourcegraph/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.0.3-fork.tgz#83728a14616ef0587298e7849d960b61853a9954"
-  integrity sha512-EJLq/ni66glk3xYyOZtUIEbjTCw8kMI6RvO0YQtPd+4um2+aTSM1LfN4NrsiVrRkG7EG/U2OkFlKqT8mGo6w4Q==
-  dependencies:
-    vscode-jsonrpc "^4.0.0"
-
 "@types/babel__core@^7.1.0":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30"
@@ -5718,16 +5711,6 @@ jsonparse@^1.2.0:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsonrpc-ws-proxy@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/jsonrpc-ws-proxy/-/jsonrpc-ws-proxy-0.0.5.tgz#e77c4fb4cbeda51a3865eb6314f8deafa8103655"
-  integrity sha512-Gz3Njkc4LdJ+wEtrgG5acZWKTH78kYRHCYwN/QKzoJjdQw1jEepwkWTXLRa3JifcIpxh+WjA6OJw8A8RvejzXw==
-  dependencies:
-    "@sourcegraph/vscode-ws-jsonrpc" "0.0.3-fork"
-    js-yaml "^3.12.0"
-    minimist "^1.2.0"
-    ws "^6.1.0"
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -5868,11 +5851,6 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash-es@^4.17.11:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
-  integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
-
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -6005,12 +5983,11 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-lsp-editor-adapter@0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/lsp-editor-adapter/-/lsp-editor-adapter-0.0.10.tgz#eaaa89e46c71e6856de11fe8cf403b0fbd15c08c"
-  integrity sha512-jfAQoakF/K2S0hpN4kQZWRH44Wu7UX0OqJGoUEcm52pBkQxKtCgmRC4EusRHX/wgzDCAJc8zi5fBwYlcqEjwBg==
+lsp-ws-connection@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/lsp-ws-connection/-/lsp-ws-connection-0.1.0.tgz#a5587d47f7f804f5c3c3a84e743b2b227849d447"
+  integrity sha512-0vQcRxBHnDDJ7dx/8Gaijo3IYt+d0he5zyreFZtW2JV9KmqBUuNVtPbA85Iz3Nfj7QxrL0nnswZ/gttLStjD5Q==
   dependencies:
-    lodash-es "^4.17.11"
     vscode-jsonrpc "^4.0.0"
     vscode-languageclient "^5.2.1"
     vscode-languageserver-protocol "^3.14.1"
@@ -9994,13 +9971,6 @@ ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
-  dependencies:
-    async-limiter "~1.0.0"
-
 ws@^7.0.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.0.tgz#422eda8c02a4b5dba7744ba66eebbd84bcef0ec7"