vscode-extension: strict and erasable typescript

Author: joshtynjala

vscode-extension/package-lock.json

@@ -36,14 +36,14 @@
     "vscode": "^1.82.0"
   },
   "devDependencies": {
-    "@types/node": "^18.19.48",
+    "@types/node": "^18.19.79",
     "@types/vscode": "^1.82.0",
-    "@vscode/vsce": "^3.0.0",
+    "@vscode/vsce": "^3.2.2",
     "json5": "^2.2.3",
-    "ts-loader": "^9.5.1",
-    "typescript": "^5.5.4",
-    "webpack": "^5.94.0",
-    "webpack-cli": "^5.1.4"
+    "ts-loader": "^9.5.2",
+    "typescript": "^5.8.2",
+    "webpack": "^5.98.0",
+    "webpack-cli": "^6.0.1"
   },
   "activationEvents": [
     "onDebugInitialConfigurations",

vscode-extension/package.json

@@ -0,0 +1 @@
+declare module "json5/dist/index.mjs";

vscode-extension/src/main/json5.d.ts

@@ -19,7 +19,7 @@ import SWFDebugConfigurationProvider from "./utils/SWFDebugConfigurationProvider
 import SWFDebugAdapterDescriptorFactory from "./utils/SWFDebugAdapterDescriptorFactory";
 import * as vscode from "vscode";
 
-let savedContext: vscode.ExtensionContext = null;
+let savedContext: vscode.ExtensionContext | null | undefined = null;
 
 export function activate(context: vscode.ExtensionContext) {
   savedContext = context;
@@ -42,7 +42,7 @@ export function activate(context: vscode.ExtensionContext) {
   context.subscriptions.push(
     vscode.debug.registerDebugAdapterDescriptorFactory(
       "swf",
-      new SWFDebugAdapterDescriptorFactory(savedContext, debugPathsCallback)
+      new SWFDebugAdapterDescriptorFactory(context, debugPathsCallback)
     )
   );
 }
@@ -51,7 +51,10 @@ export function deactivate() {
   savedContext = null;
 }
 
-function debugPathsCallback() {
+function debugPathsCallback(): {
+  javaPath: string | null | undefined;
+  sdkPath?: string | null | undefined;
+} {
   let sdkPath = undefined;
   let as3mxmlExtension = vscode.extensions.getExtension(
     "bowlerhatllc.vscode-as3mxml"
@@ -64,6 +67,9 @@ function debugPathsCallback() {
     .getConfiguration("as3mxml")
     .get("java.path") as string;
   let javaPath = findJava(javaPathSetting, (foundJavaPath) => {
+    if (!savedContext) {
+      return false;
+    }
     return validateJava(savedContext.extensionPath, foundJavaPath);
   });
 

vscode-extension/src/main/ts/extension.ts

@@ -18,17 +18,23 @@ import * as vscode from "vscode";
 import getJavaClassPathDelimiter from "../utils/getJavaClassPathDelimiter";
 
 export type SWFDebugAdapterPathsCallback = () => {
-  javaPath: string;
-  sdkPath?: string;
+  javaPath: string | null | undefined;
+  sdkPath?: string | null | undefined;
 };
 
 export default class SWFDebugAdapterDescriptorFactory
   implements vscode.DebugAdapterDescriptorFactory
 {
   constructor(
-    public extensionContext: vscode.ExtensionContext,
-    public pathsCallback: SWFDebugAdapterPathsCallback
-  ) {}
+    extensionContext: vscode.ExtensionContext,
+    pathsCallback: SWFDebugAdapterPathsCallback
+  ) {
+    this.extensionContext = extensionContext;
+    this.pathsCallback = pathsCallback;
+  }
+
+  extensionContext: vscode.ExtensionContext;
+  pathsCallback: SWFDebugAdapterPathsCallback;
 
   createDebugAdapterDescriptor(
     session: vscode.DebugSession,