Align versions

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
TypeFox · May 28, 2020 · 73c2104 · 73c2104
1 parent 16601c3
commit 73c2104
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 36 deletions.
diff --git a/client/package.json b/client/package.json
@@ -19,7 +19,7 @@
     "dependencies": {
         "glob-to-regexp": "^0.3.0",
         "vscode-jsonrpc": "^5.0.1",
-        "vscode-languageclient": "^6.1.3",
+        "vscode-languageclient": "^6.1.0",
         "vscode-uri": "^2.1.1"
     },
     "scripts": {

diff --git a/client/src/vscode-api.ts b/client/src/vscode-api.ts
@@ -7,7 +7,7 @@ import * as vscode from "vscode";
 import { URI } from "vscode-uri"
 import { Disposable } from "./disposable";
 import {
-    Services, Event, DiagnosticCollection, Diagnostic, WorkspaceEdit, isDocumentSelector,
+    Services, Event, DiagnosticCollection, WorkspaceEdit, isDocumentSelector,
     MessageType, OutputChannel, CompletionTriggerKind, DocumentIdentifier,
     SignatureHelpTriggerKind
 } from "./services";
@@ -303,20 +303,13 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
                 // */
             }
 
-            function toInternalCode(code: vscode.Diagnostic['code']): Diagnostic['code']  {
-                if (code != null && typeof code === 'object') {
-                    return code.value as Diagnostic['code']
-                }
-                return code as Diagnostic['code'];
-            }
-
             if (isVsCodeUri(arg0)) {
                 if (this.collection) {
                     if (arg1) {
                         this.collection.set(arg0.toString(), arg1.map(diag => {
                             return {
                                 range: diag.range,
-                                code: toInternalCode(diag.code),
+                                code: diag.code,
                                 source: diag.source,
                                 message: diag.message,
                                 tags: diag.tags,
@@ -694,7 +687,6 @@ export function createVSCodeApi(servicesProvider: Services.Provider): typeof vsc
                 }
             });
         },
-        registerEvaluatableExpressionProvider: unsupported,
         registerDocumentSemanticTokensProvider (selector: vscode.DocumentSelector, provider: vscode.DocumentSemanticTokensProvider, legend: vscode.SemanticTokensLegend) {
             if (!isDocumentSelector(selector)) {
                 throw new Error('unexpected selector: ' + JSON.stringify(selector));

diff --git a/example/package.json b/example/package.json
@@ -5,14 +5,14 @@
   "dependencies": {
     "express": "^4.15.2",
     "file-loader": "^4.3.0",
-    "monaco-editor-core": "^0.19.3",
+    "monaco-editor-core": "^0.20.0",
     "monaco-languageclient": "^0.13.0",
     "normalize-url": "^2.0.1",
     "reconnecting-websocket": "^3.2.2",
     "request-light": "^0.2.2",
-    "vscode-json-languageservice": "^3.4.11",
-    "vscode-jsonrpc": "^5.0.0",
-    "vscode-languageserver": "^6.0.0",
+    "vscode-json-languageservice": "^3.4.12",
+    "vscode-jsonrpc": "^5.0.1",
+    "vscode-languageserver": "^6.1.0",
     "vscode-uri": "^2.1.1",
     "vscode-ws-jsonrpc": "^0.2.0",
     "ws": "^5.0.0"

diff --git a/examples/browser/package.json b/examples/browser/package.json
@@ -5,8 +5,8 @@
   "dependencies": {
     "file-loader": "^4.3.0",
     "monaco-languageclient": "^0.13.0",
-    "vscode-json-languageservice": "^3.3.1",
-    "vscode-languageserver-types": "^3.15.0-next"
+    "vscode-json-languageservice": "^3.4.12",
+    "vscode-languageserver-types": "^3.15.1"
   },
   "scripts": {
     "prepare": "yarn run clean && yarn run build",

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "@types/node": "^13.1.7",
     "@types/normalize-url": "^1.9.1",
     "@types/ws": "0.0.39",
-    "@types/vscode": "1.43.0",
+    "@types/vscode": "1.41.0",
     "css-loader": "^0.28.11",
     "lerna": "^3.16.4",
     "monaco-editor-core": "^0.20.0",

diff --git a/yarn.lock b/yarn.lock
@@ -904,10 +904,10 @@
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-"@types/vscode@1.43.0":
-  version "1.43.0"
-  resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.43.0.tgz#22276e60034c693b33117f1068ffaac0e89522db"
-  integrity sha512-kIaR9qzd80rJOxePKpCB/mdy00mz8Apt2QA5Y6rdrKFn13QNFNeP3Hzmsf37Bwh/3cS7QjtAeGSK7wSqAU0sYQ==
+"@types/vscode@1.41.0":
+  version "1.41.0"
+  resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.41.0.tgz#b0d75920220f84e07093285e59180c0f11d336cd"
+  integrity sha512-7SfeY5u9jgiELwxyLB3z7l6l/GbN9CqpCQGkcRlB7tKRFBxzbz2PoBfGrLxI1vRfUCIq5+hg5vtDHExwq5j3+A==
 
 "@types/ws@0.0.39":
   version "0.0.39"
@@ -4492,11 +4492,6 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-monaco-editor-core@^0.19.3:
-  version "0.19.3"
-  resolved "https://registry.yarnpkg.com/monaco-editor-core/-/monaco-editor-core-0.19.3.tgz#6d2b36f42f0f42be6def5604810fafc288c9cc3e"
-  integrity sha512-Fd6bTTaAxDAulh3q9Hordj80DSFZFGhjKX/Z3K/kElA9xkPyNwyaOjphYp8254nhUEKCk56TKP7qfRkUjjZF3w==
-
 monaco-editor-core@^0.20.0:
   version "0.20.0"
   resolved "https://registry.yarnpkg.com/monaco-editor-core/-/monaco-editor-core-0.20.0.tgz#d5ce01307d298dbca6ab9194812812b32b50433f"
@@ -7075,23 +7070,23 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
   integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
 
-vscode-json-languageservice@^3.3.1, vscode-json-languageservice@^3.4.11:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.5.2.tgz#4b898140a8e581359c10660845a4cae15dcbb4f9"
-  integrity sha512-9cUvBq00O08lpWVVOx6tQ1yLxCHss79nsUdEAVYGomRyMbnPBmc0AkYPcXI9WK1EM6HBo0R9Zo3NjFhcICpy4A==
+vscode-json-languageservice@^3.4.12:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.6.0.tgz#133a1e2c3a3dffe38564a1ba948516805c3c1869"
+  integrity sha512-dXzFywypUZ9T0tjr4fREZiknXDz6vAGx1zsxbQY1+9DOpjMfbz0VLP873KmcbuvL4K3nseKTxc4TKHu8kLXRMw==
   dependencies:
     jsonc-parser "^2.2.1"
     vscode-languageserver-textdocument "^1.0.1"
     vscode-languageserver-types "^3.15.1"
-    vscode-nls "^4.1.1"
+    vscode-nls "^4.1.2"
     vscode-uri "^2.1.1"
 
 vscode-jsonrpc@^5.0.0, vscode-jsonrpc@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz#9bab9c330d89f43fc8c1e8702b5c36e058a01794"
   integrity sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==
 
-vscode-languageclient@^6.1.3:
+vscode-languageclient@^6.1.0:
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz#c979c5bb5855714a0307e998c18ca827c1b3953a"
   integrity sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==
@@ -7112,23 +7107,28 @@ vscode-languageserver-textdocument@^1.0.1:
   resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f"
   integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==
 
-vscode-languageserver-types@3.15.1, vscode-languageserver-types@^3.15.0-next, vscode-languageserver-types@^3.15.1:
+vscode-languageserver-types@3.15.1, vscode-languageserver-types@^3.15.1:
   version "3.15.1"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de"
   integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==
 
-vscode-languageserver@^6.0.0:
+vscode-languageserver@^6.1.0:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz#d76afc68172c27d4327ee74332b468fbc740d762"
   integrity sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==
   dependencies:
     vscode-languageserver-protocol "^3.15.3"
 
-vscode-nls@^4.0.0, vscode-nls@^4.1.1:
+vscode-nls@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
   integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
 
+vscode-nls@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
+  integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
+
 vscode-uri@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.1.tgz#5aa1803391b6ebdd17d047f51365cf62c38f6e90"