Update to vscode-languageclient 7.0.0

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": {

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',

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';
 
 

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<Node> {
     picker.items = items;
     picker.buttons = [
       {
-        iconPath: '$(reload)',
+        iconPath: ThemeIconReload,
         tooltip: 'Load All Rules //... (this can be slow)',
       },
     ];

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;

src/bzl/view/workspaces.ts

@@ -183,7 +183,7 @@ export class BzlWorkspaceListView extends BzlClientTreeDataProvider<WorkspaceIte
 export class WorkspaceItem extends vscode.TreeItem {
     constructor(
         public label: string,
-        public iconPath: string,
+        public iconPath: vscode.Uri,
     ) {
         super(label);
         this.command = {
@@ -195,7 +195,7 @@ export class WorkspaceItem extends vscode.TreeItem {
 }
 
 class DefaultWorkspaceItem extends WorkspaceItem {
-    constructor(icon: string) {
+    constructor(icon: vscode.Uri) {
         super('DEFAULT', icon);
         this.description = 'workspace';
         this.tooltip = this.description;
@@ -206,7 +206,7 @@ class DefaultWorkspaceItem extends WorkspaceItem {
 class ExternalWorkspaceItem extends WorkspaceItem {
     constructor(
         public readonly external: ExternalWorkspace,
-        icon: string,
+        icon: vscode.Uri,
         private location: string,
     ) {
         super('@' + external.name, icon);

src/container.ts

@@ -28,8 +28,8 @@ export class Container {
         return Container._telemetry;
     }
 
-    static media(name: MediaIconName): string {
-        return path.join(Container._context.extensionPath, 'media', name);
+    static media(name: MediaIconName): vscode.Uri {
+        return vscode.Uri.file(path.join(Container._context.extensionPath, 'media', name));
     }
 
     static dispose() {

src/starlark/client.ts

@@ -3,7 +3,7 @@ import {
   LanguageClient,
   LanguageClientOptions,
   ServerOptions,
-} from 'vscode-languageclient';
+} from 'vscode-languageclient/node';
 import {
   TextDocumentPositionParams,
   Location,

src/test/integration/feature.starlark.test.ts

@@ -12,7 +12,7 @@ import { fail } from 'assert';
 import { expect } from 'chai';
 import { after, before, describe, it } from 'mocha';
 import * as lsclient from 'vscode-languageclient';
-import { LanguageClient } from 'vscode-languageclient';
+import { LanguageClient } from 'vscode-languageclient/node';
 import { platformBinaryName } from '../../constants';
 import { GitHubReleaseAssetDownloader } from '../../download';
 import { StardocLSPClient } from '../../starlark/client';
@@ -229,7 +229,7 @@ describe(StarlarkLSPFeatureName, function () {
 				const provider = client.getFeature(lsclient.HoverRequest.method).getProvider(document);
 				expect(provider).not.to.be.undefined;
 
-				const hover = await provider.provideHover(document, position, tokenSource.token);
+				const hover = await provider?.provideHover(document, position, tokenSource.token);
 				if (!hover) {
 					fail('expected defined hover result');
 				}
@@ -318,7 +318,7 @@ describe(StarlarkLSPFeatureName, function () {
 				const provider = client.getFeature(lsclient.DefinitionRequest.method).getProvider(document);
 				expect(provider).not.to.be.undefined;
 
-				const locs = await provider.provideDefinition(document, position, tokenSource.token);
+				const locs = await provider?.provideDefinition(document, position, tokenSource.token);
 				if (!locs) {
 					fail('expected defined locs result');
 				}