From 3f6f32894383fa8af1053bb8238d70a39240e910 Mon Sep 17 00:00:00 2001 From: Paul Code Johnston Date: Tue, 26 Jan 2021 09:19:24 -0700 Subject: [PATCH] Update to vscode-languageclient 7.0.0 --- package-lock.json | 109 +++++++++++------- package.json | 6 +- src/bzl/constants.ts | 1 + src/bzl/server.ts | 2 +- src/bzl/view/packages.ts | 3 +- src/bzl/view/repositories.ts | 2 +- src/bzl/view/workspaces.ts | 6 +- src/container.ts | 4 +- src/starlark/client.ts | 2 +- src/test/integration/feature.starlark.test.ts | 6 +- 10 files changed, 82 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index 07a04785..b91107e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "uuid": "8.3.0", "vscode-common": "1.50.0", "vscode-extension-telemetry": "^0.1.6", - "vscode-languageclient": "6.1.3", + "vscode-languageclient": "^7.0.0", "vscode-languageserver-protocol": "3.16.0" }, "devDependencies": { @@ -659,10 +659,11 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.47.0.tgz", - "integrity": "sha512-nJA37ykkz9FYA0ZOQUSc3OZnhuzEW2vUhUEo4MiduUo82jGwwcLfyvmgd/Q7b0WrZAAceojGhZybg319L24bTA==", - "dev": true + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.52.0.tgz", + "integrity": "sha512-Kt3bvWzAvvF/WH9YEcrCICDp0Z7aHhJGhLJ1BxeyNP6yRjonWqWnAIh35/pXAjswAnWOABrYlF7SwXR9+1nnLA==", + "dev": true, + "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "2.34.0", @@ -6185,10 +6186,12 @@ } }, "node_modules/semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true, + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "dependencies": { + "lru-cache": "^6.0.0" + }, "bin": { "semver": "bin/semver.js" }, @@ -6196,6 +6199,22 @@ "node": ">=10" } }, + "node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/serialize-javascript": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", @@ -7449,23 +7468,17 @@ } }, "node_modules/vscode-languageclient": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz", - "integrity": "sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz", + "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==", + "license": "MIT", "dependencies": { - "semver": "^6.3.0", - "vscode-languageserver-protocol": "^3.15.3" + "minimatch": "^3.0.4", + "semver": "^7.3.4", + "vscode-languageserver-protocol": "3.16.0" }, "engines": { - "vscode": "^1.41.0" - } - }, - "node_modules/vscode-languageclient/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "bin": { - "semver": "bin/semver.js" + "vscode": "^1.52.0" } }, "node_modules/vscode-languageserver-protocol": { @@ -7654,6 +7667,7 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "dev": true, + "hasInstallScript": true, "optional": true, "os": [ "darwin" @@ -8795,9 +8809,9 @@ "dev": true }, "@types/vscode": { - "version": "1.47.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.47.0.tgz", - "integrity": "sha512-nJA37ykkz9FYA0ZOQUSc3OZnhuzEW2vUhUEo4MiduUo82jGwwcLfyvmgd/Q7b0WrZAAceojGhZybg319L24bTA==", + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.52.0.tgz", + "integrity": "sha512-Kt3bvWzAvvF/WH9YEcrCICDp0Z7aHhJGhLJ1BxeyNP6yRjonWqWnAIh35/pXAjswAnWOABrYlF7SwXR9+1nnLA==", "dev": true }, "@typescript-eslint/eslint-plugin": { @@ -13444,10 +13458,27 @@ } }, "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true + "version": "7.3.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", + "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "requires": { + "lru-cache": "^6.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } }, "serialize-javascript": { "version": "4.0.0", @@ -14506,19 +14537,13 @@ "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==" }, "vscode-languageclient": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz", - "integrity": "sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz", + "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==", "requires": { - "semver": "^6.3.0", - "vscode-languageserver-protocol": "^3.15.3" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } + "minimatch": "^3.0.4", + "semver": "^7.3.4", + "vscode-languageserver-protocol": "3.16.0" } }, "vscode-languageserver-protocol": { diff --git a/package.json b/package.json index c06600ec..eddc615a 100644 --- a/package.json +++ b/package.json @@ -842,10 +842,6 @@ "when": "view == bsv.bzl.package && viewItem != 'source file'", "group": "inline@2" }, - { - "when": "view == bsv.bzl.package && viewItem != 'source file'", - "group": "inline@3" - }, { "command": "bsv.bzl.package.explore", "when": "view == bsv.bzl.package", @@ -1178,7 +1174,7 @@ "uuid": "8.3.0", "vscode-common": "1.50.0", "vscode-extension-telemetry": "^0.1.6", - "vscode-languageclient": "6.1.3", + "vscode-languageclient": "^7.0.0", "vscode-languageserver-protocol": "3.16.0" }, "devDependencies": { diff --git a/src/bzl/constants.ts b/src/bzl/constants.ts index 1adcac06..757ff310 100644 --- a/src/bzl/constants.ts +++ b/src/bzl/constants.ts @@ -161,6 +161,7 @@ export const ThemeIconReport = new vscode.ThemeIcon('report'); export const ThemeIconSymbolEvent = new vscode.ThemeIcon('symbol-event'); export const ThemeIconSymbolInterface = new vscode.ThemeIcon('symbol-interface'); export const ThemeIconVerified = new vscode.ThemeIcon('verified'); +export const ThemeIconReload = new vscode.ThemeIcon('reload'); export enum ContextValue { ProblemFile = 'problem-file', diff --git a/src/bzl/server.ts b/src/bzl/server.ts index fcdf09ab..c4e6239e 100644 --- a/src/bzl/server.ts +++ b/src/bzl/server.ts @@ -1,5 +1,5 @@ import * as vscode from 'vscode'; -import * as vlc from 'vscode-languageclient'; +import * as vlc from 'vscode-languageclient/node'; import { Server } from './constants'; diff --git a/src/bzl/view/packages.ts b/src/bzl/view/packages.ts index 00991cf6..8cc3b3cb 100644 --- a/src/bzl/view/packages.ts +++ b/src/bzl/view/packages.ts @@ -19,6 +19,7 @@ import { ContextValue, FileName, ruleClassIconUri, + ThemeIconReload, ViewName } from '../constants'; import { BzlClientTreeDataProvider } from './bzlclienttreedataprovider'; @@ -94,7 +95,7 @@ export class BzlPackageListView extends BzlClientTreeDataProvider { picker.items = items; picker.buttons = [ { - iconPath: '$(reload)', + iconPath: ThemeIconReload, tooltip: 'Load All Rules //... (this can be slow)', }, ]; diff --git a/src/bzl/view/repositories.ts b/src/bzl/view/repositories.ts index 4830365e..2fcdb7c4 100644 --- a/src/bzl/view/repositories.ts +++ b/src/bzl/view/repositories.ts @@ -140,7 +140,7 @@ export class RepositoryItem extends vscode.TreeItem { public readonly client: BzlClient, public readonly repo: Workspace, public readonly desc: string, - public iconPath: string, + public iconPath: vscode.Uri, ) { super(desc); this.description = this.repo.cwd; diff --git a/src/bzl/view/workspaces.ts b/src/bzl/view/workspaces.ts index 7dab3de7..90015913 100644 --- a/src/bzl/view/workspaces.ts +++ b/src/bzl/view/workspaces.ts @@ -183,7 +183,7 @@ export class BzlWorkspaceListView extends BzlClientTreeDataProvider