Fixes #396, Prepare 2.8.3 release

Author: isc-bsaviano

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Changelog
 
-## [2.8.3] - 2026-XX-XX
+## [2.8.3] - 2026-04-14
 - Fix issue [#395](https://github.com/intersystems/language-server/issues/395): Hover info for method that takes no argument has extraneous * character
+- Fix issue [#396](https://github.com/intersystems/language-server/issues/396): Upgrade dependencies
 
 ## [2.8.2] - 2026-01-21
 - Fix issue [#392](https://github.com/intersystems/language-server/issues/392): Restore support for a wide array of Linux distros

client/package-lock.json

@@ -7,8 +7,7 @@
     "vscode": "^1.93.0"
   },
   "dependencies": {
-    "axios": "^1.13.2",
-    "vscode-cache": "^0.3.0",
+    "axios": "^1.15.0",
     "vscode-languageclient": "^9.0.1"
   },
   "devDependencies": {

client/package.json

@@ -11,7 +11,6 @@ import {
 	authentication
 } from 'vscode';
 
-import * as Cache from 'vscode-cache';
 import {
 	DocumentSelector,
 	LanguageClient,
@@ -40,11 +39,11 @@ export let client: LanguageClient;
 /**
  * Cache for cookies from REST requests to InterSystems servers.
  */
-let cookiesCache: Cache;
+const cookiesCache: Map<string, string[]> = new Map();
 
-export async function updateCookies(newCookies: string[], server: ServerSpec): Promise<string[]> {
+export function updateCookies(newCookies: string[], server: ServerSpec): string[] {
 	const key = `${server.username}@${server.host}:${server.port}${server.pathPrefix}`;
-	const cookies = cookiesCache.get(key, []);
+	const cookies = cookiesCache.get(key) ?? [];
 	newCookies.forEach((cookie) => {
 	  const [cookieName] = cookie.split("=");
 	  const index = cookies.findIndex((el) => el.startsWith(cookieName));
@@ -54,15 +53,15 @@ export async function updateCookies(newCookies: string[], server: ServerSpec): P
 		cookies.push(cookie);
 	  }
 	});
-	await cookiesCache.put(key, cookies);
+	cookiesCache.set(key, cookies);
 	return cookies;
 }
 
 export function getCookies(server: ServerSpec): string[] {
-	return cookiesCache.get(`${server.username}@${server.host}:${server.port}${server.pathPrefix}`, []);
+	return cookiesCache.get(`${server.username}@${server.host}:${server.port}${server.pathPrefix}`) ?? [];
 }
 
-let objectScriptApi;
+let objectScriptApi: any;
 let serverManagerApi: serverManager.ServerManagerAPI;
 
 /** Resolved connection information for each workspace folder */
@@ -80,10 +79,9 @@ type MakeRESTRequestParams = {
 
 export async function activate(context: ExtensionContext) {
 	// Get the main extension exported API
-	const objectScriptExt = extensions.getExtension("intersystems-community.vscode-objectscript");
+	const objectScriptExt = extensions.getExtension("intersystems-community.vscode-objectscript")!;
 	objectScriptApi = objectScriptExt.isActive ? objectScriptExt.exports : await objectScriptExt.activate();
 
-	cookiesCache = new Cache(context, "cookies");
 	// The server is implemented in node
 	let serverModule = context.asAbsolutePath(
 		path.join('server', 'out', 'server.js')
@@ -258,7 +256,7 @@ export async function activate(context: ExtensionContext) {
 					// Can't use the FileSystem with a DocumentContentProvider, so fetch the text directly from the server
 					const uriParams = new URLSearchParams(uri.query);
 					const fileName =
-						uriParams.has("csp") && ["", "1"].includes(uriParams.get("csp"))
+						uriParams.has("csp") && ["", "1"].includes(uriParams.get("csp") ?? "")
 							? uri.path.slice(1)
 							: uri.path.split("/").slice(1).join(".");
 					const docParams = 
@@ -303,7 +301,7 @@ export async function activate(context: ExtensionContext) {
 			"intersystems.language-server",
 			workspace.workspaceFolders != undefined ? workspace.workspaceFolders[0] : undefined
 		).get("suggestTheme") === true &&
-		!workbenchConfig.get<string>("colorTheme").startsWith("InterSystems Default ")
+		!workbenchConfig.get<string>("colorTheme")?.startsWith("InterSystems Default ")
 	) {
 		// Suggest an InterSystems default theme depending on the current active theme type
 		if (window.activeColorTheme.kind === ColorThemeKind.Light) {
@@ -393,7 +391,7 @@ export async function deactivate(): Promise<void> {
 			makeRESTRequest(
 				"HEAD",
 				0,
-				undefined,
+				"",
 				serverSpec,
 				undefined,
 				undefined,

client/src/extension.ts

@@ -86,7 +86,7 @@ export async function makeRESTRequest(method: "GET"|"POST"|"HEAD", api: number,
 					}
 				}
 			);
-			cookies = await updateCookies(respdata.headers['set-cookie'] || [], server);
+			cookies = updateCookies(respdata.headers['set-cookie'] || [], server);
 			if (respdata.status === 202) {
 				// The schema is being recalculated so we need to make another call to get it
 				respdata = await axios.request(
@@ -100,7 +100,7 @@ export async function makeRESTRequest(method: "GET"|"POST"|"HEAD", api: number,
 						}
 					},
 				);
-				await updateCookies(respdata.headers['set-cookie'] || [], server);
+				updateCookies(respdata.headers['set-cookie'] || [], server);
 				return respdata;
 			}
 			else if (respdata.status === 304) {
@@ -125,7 +125,7 @@ export async function makeRESTRequest(method: "GET"|"POST"|"HEAD", api: number,
   						httpsAgent
 					}
 				);
-				cookies = await updateCookies(respdata.headers['set-cookie'] || [], server);
+				cookies = updateCookies(respdata.headers['set-cookie'] || [], server);
 				if (respdata.status === 202) {
 					// The schema is being recalculated so we need to make another call to get it
 					respdata = await axios.request(
@@ -139,7 +139,7 @@ export async function makeRESTRequest(method: "GET"|"POST"|"HEAD", api: number,
 							}
 						}
 					);
-					await updateCookies(respdata.headers['set-cookie'] || [], server);
+					updateCookies(respdata.headers['set-cookie'] || [], server);
 					return respdata;
 				}
 				else if (respdata.status === 304) {
@@ -197,7 +197,7 @@ export async function makeRESTRequest(method: "GET"|"POST"|"HEAD", api: number,
 						}
 					);
 				}
-				await updateCookies(respdata.headers['set-cookie'] || [], server);
+				updateCookies(respdata.headers['set-cookie'] || [], server);
 			}
 			else {
 				respdata = await axios.request(
@@ -232,7 +232,7 @@ export async function makeRESTRequest(method: "GET"|"POST"|"HEAD", api: number,
 						}
 					);
 				}
-				await updateCookies(respdata.headers['set-cookie'] || [], server);
+				updateCookies(respdata.headers['set-cookie'] || [], server);
 			}
 			return respdata;
 		}

client/src/makeRESTRequest.ts

@@ -1,4 +1,4 @@
-import { commands, CompletionList, Hover, Position, SignatureHelp, TextDocumentContentProvider, Uri } from 'vscode';
+import { commands, CompletionList, Hover, Position, ProviderResult, SignatureHelp, TextDocumentContentProvider, Uri } from 'vscode';
 import { Middleware } from 'vscode-languageclient';
 import { client } from './extension';
 
@@ -136,7 +136,7 @@ export class ISCEmbeddedContentProvider implements TextDocumentContentProvider {
 
 	constructor() {}
 
-	provideTextDocumentContent(uri: Uri): Promise<string> {
+	provideTextDocumentContent(uri: Uri): ProviderResult<string> {
 		// Get the isclexer language number and position from the URI authority
 		const language: number = Number(uri.authority.split(":")[0]);
 		const positionText = uri.authority.split(":")[1];