[WIP] Update language client to 10.1.0

package.json

@@ -1326,11 +1326,11 @@
             "default": false,
             "scope": "window"
           },
-		  "java.codeGeneration.generateCommentsInMarkdown": {
-		    "type": "boolean",
-		    "description": "Generate Javadoc comments in Markdown style (requires source compliance >= 23).",
-		    "default": false
-		  },
+          "java.codeGeneration.generateCommentsInMarkdown": {
+            "type": "boolean",
+            "description": "Generate Javadoc comments in Markdown style (requires source compliance >= 23).",
+            "default": false
+          },
           "java.codeGeneration.toString.template": {
             "type": "string",
             "description": "The template for generating the toString method.",
@@ -2166,7 +2166,7 @@
     "sinon": "^14.0.0",
     "tar": "^7.5.11",
     "ts-loader": "^9.4.2",
-    "typescript": "^4.6.4",
+    "typescript": "^6.0.3",
     "typescript-eslint": "^8.65.0",
     "webpack": "^5.105.0",
     "webpack-cli": "^7.2.1"
@@ -2185,15 +2185,12 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "semver": "^7.5.2",
-    "vscode-languageclient": "8.2.0-next.3",
+    "vscode-languageclient": "^10.1.0",
     "vscode-variables": "^1.0.1",
     "winreg-utf8": "^0.1.1",
     "winston": "^3.2.1",
     "winston-daily-rotate-file": "^4.7.1"
   },
-  "overrides": {
-    "vscode-languageserver-protocol": "3.17.6-next.1"
-  },
   "segmentWriteKey": "Y7Y5Xk8dKEhVZHTmAkFZkqgdN4d7c4lt",
   "segmentWriteKeyDebug": "BflPll7uuKOCm3y0g7JpfXLVBVFBivDE"
 }

src/extension.ts

@@ -285,9 +285,9 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
 			},
 			resolveCompletionItem: async (item, token, next): Promise<CompletionItem> => {
 				const completionItem = await next(item, token);
-				if (completionItem?.documentation instanceof MarkdownString) {
-					completionItem.documentation = fixJdtLinksInDocumentation(completionItem.documentation);
-				}
+				// if (completionItem?.documentation instanceof MarkdownString) {
+				// 	completionItem.documentation = fixJdtLinksInDocumentation(completionItem.documentation);
+				// }
 				return completionItem;
 			},
 			// https://github.com/redhat-developer/vscode-java/issues/2130

src/log.ts

@@ -1,5 +1,5 @@
 import { createLogger, format, transports } from 'winston';
-import * as DailyRotateFile from 'winston-daily-rotate-file';
+import DailyRotateFile from 'winston-daily-rotate-file';
 
 export function initializeLogFile(filename: string) {
 	logger.add(new DailyRotateFile({

src/outputInfoCollector.ts

@@ -1,11 +1,28 @@
-import { OutputChannel, window, ViewColumn } from "vscode";
+import { Event, LogLevel, LogOutputChannel, ViewColumn, window } from "vscode";
 import { logger } from "./log";
 
-export class OutputInfoCollector implements OutputChannel {
-	private channel: OutputChannel = null;
+export class OutputInfoCollector implements LogOutputChannel {
+	private channel: LogOutputChannel = null;
 
 	constructor(public name: string) {
-		this.channel = window.createOutputChannel(this.name);
+		this.channel = window.createOutputChannel(this.name, { log:true });
+	}
+	get logLevel(): LogLevel { return this.channel.logLevel; }
+	get onDidChangeLogLevel(): Event<LogLevel> { return this.channel.onDidChangeLogLevel; };
+	trace(message: string, ...args: any[]): void {
+		this.channel.trace(message, args);
+	}
+	debug(message: string, ...args: any[]): void {
+		this.channel.debug(message, args);
+	}
+	info(message: string, ...args: any[]): void {
+		this.channel.info(message, args);
+	}
+	warn(message: string, ...args: any[]): void {
+		this.channel.warn(message, args);
+	}
+	error(error: string | Error, ...args: any[]): void {
+		this.channel.error(error, args);
 	}
 
 	append(value: string): void {

src/providerDispatcher.ts

@@ -25,16 +25,13 @@ export function registerClientProviders(context: ExtensionContext, options: Prov
 	const symbolProvider = createDocumentSymbolProvider();
 	context.subscriptions.push(languages.registerDocumentSymbolProvider('java', symbolProvider));
 
-	const jdtProvider = createJDTContentProvider(options);
-	context.subscriptions.push(workspace.registerTextDocumentContentProvider('jdt', jdtProvider));
-
 	const classProvider = createClassContentProvider(options);
 	context.subscriptions.push(workspace.registerTextDocumentContentProvider('class', classProvider));
 
 	overwriteWorkspaceSymbolProvider(context);
 
 	return {
-		handles: [hoverProvider, symbolProvider, jdtProvider, classProvider]
+		handles: [hoverProvider, symbolProvider, classProvider]
 	};
 }
 

src/requirements.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-import * as expandHomeDir from 'expand-home-dir';
+import expandHomeDir from 'expand-home-dir';
 import * as fse from 'fs-extra';
 import { getRuntime, getSources, JAVAC_FILENAME, JAVA_FILENAME } from 'jdk-utils';
 import * as path from 'path';

src/webview/globals.d.ts

@@ -0,0 +1,2 @@
+/* silence warnings from typescript about not being able to analyse sideeffects of css imports */
+declare module "*.css" {}

test/lightweight-mode-suite/index.ts

@@ -11,7 +11,7 @@
 // a possible error to the callback or null if none.
 
 import * as path from 'path';
-import * as Mocha from 'mocha';
+import Mocha from 'mocha';
 import { glob } from 'glob';
 
 export async function run(testsRoot: string): Promise<void> {

test/standard-mode-suite/extension.test.ts

@@ -1,4 +1,4 @@
-import * as assert from 'assert';
+import assert from 'assert';
 import * as fs from 'fs';
 import * as path from 'path';
 import { env } from 'process';

test/standard-mode-suite/index.ts

@@ -11,7 +11,7 @@
 // a possible error to the callback or null if none.
 
 import * as path from 'path';
-import * as Mocha from 'mocha';
+import Mocha from 'mocha';
 import { glob } from 'glob';
 
 export async function run(testsRoot: string): Promise<void> {

tsconfig.base.json

@@ -1,14 +1,20 @@
 {
 	"compilerOptions": {
-		"target": "es6",
-		"moduleResolution": "node",
+		"target": "es2020",
+		"module": "nodenext",
 		"outDir": "out",
 		"sourceMap": true,
 		"skipLibCheck": true,
+		"strictFunctionTypes": false,
+		"strictNullChecks": false,
+		"noImplicitAny": false,
+		"noImplicitThis": false,
+		"useUnknownInCatchVariables": false,
 		"plugins": [
 			{
 				"name": "eslint"
 			}
 		],
+		"types": ["node", "vscode", "mocha"]
 	}
 }

tsconfig.webview.json

@@ -9,6 +9,7 @@
 		"jsx": "react-jsx",
 		"esModuleInterop": true,
 		"allowSyntheticDefaultImports": true,
+		"rootDir": "./src"
 	},
 	"include": [
 		"src/webview",