New typescript and node types

Author: isc-bsaviano

package-lock.json

@@ -1770,7 +1770,7 @@
     "@types/istextorbinary": "2.3.1",
     "@types/minimatch": "5.1.2",
     "@types/mocha": "^7.0.2",
-    "@types/node": "^14.18.0",
+    "@types/node": "^20.16.5",
     "@types/semver": "7.5.4",
     "@types/vscode": "1.91.0",
     "@types/ws": "8.5.4",
@@ -1792,7 +1792,7 @@
     "path-browserify": "^1.0.1",
     "prettier": "^3.3.1",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.4.5",
+    "typescript": "^5.6.2",
     "@vscode/debugadapter-testsupport": "^1.67.0",
     "webpack": "^5.94.0",
     "webpack-cli": "^5.1.4"
@@ -1809,7 +1809,7 @@
     "@vscode/debugadapter": "^1.65.0",
     "@vscode/debugprotocol": "^1.65.0",
     "vscode-extension-telemetry": "^0.1.6",
-    "ws": "^8.17.1"
+    "ws": "^8.18.0"
   },
   "extensionDependencies": [
     "intersystems-community.servermanager"

package.json

@@ -28,8 +28,6 @@ import { addIsfsFileToProject, modifyProject } from "../../commands/project";
 import { DocumentContentProvider } from "../DocumentContentProvider";
 import { Document, UserAction } from "../../api/atelier";
 
-declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timeout;
-
 export type Entry = File | Directory;
 
 export function generateFileContent(
@@ -177,7 +175,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
 
   private _emitter = new vscode.EventEmitter<vscode.FileChangeEvent[]>();
   private _bufferedEvents: vscode.FileChangeEvent[] = [];
-  private _fireSoonHandle?: NodeJS.Timer;
+  private _fireSoonHandle?: NodeJS.Timeout;
 
   public constructor() {
     this.onDidChangeFile = this._emitter.event;

src/providers/FileSystemProvider/FileSystemProvider.ts

@@ -89,7 +89,7 @@ function searchMatchToLine(
                 line = memend + (match.attrline ?? 1);
               } else {
                 // This is a keyword with a multiline value
-                line = i + (match.attrline - 1 ?? 0);
+                line = i + (match.attrline - 1 || 0);
               }
             } else {
               // This is in the class member definition