Addressed review comments

Achal1607 · Achal1607 · commit 35d6776dcffd · 2024-10-22T15:12:58.000+05:30
diff --git a/vscode/l10n/bundle.l10n.en.json b/vscode/l10n/bundle.l10n.en.json
@@ -46,7 +46,7 @@
   "jdk.extension.fileSelector.label.testFilesOrSourceFiles": "Test files or source files associated to each other",
   "jdk.extension.fileSelector.label.noFileSelected": "No file selected",
   "jdk.extension.fileSelector.label.noTestFound": "No Test or Tested class found",
-  "jdk.extension.cache.message.confirmToDeleteCache": "Are you sure you want to delete cache for this workspace and reload the window ?",
+  "jdk.extension.cache.message.confirmToDeleteCache": "Are you sure you want to delete the cache for this workspace and reload the window?",
   "jdk.extension.cache.label.confirmation.yes":"Yes",
   "jdk.extension.cache.label.confirmation.cancel":"Cancel",
   "jdk.extension.cache.message.cacheCleared":"Cache cleared successfully for this workspace",
diff --git a/vscode/src/commands/commands.ts b/vscode/src/commands/commands.ts
@@ -79,5 +79,8 @@ export const nbCommands = {
     debuggerConfigurations: appendPrefixToCommand('java.attachDebugger.configurations'),
     runProjectAction: appendPrefixToCommand('project.run.action'),
     buildWorkspace: appendPrefixToCommand('build.workspace'),
-    cleanWorkspace: appendPrefixToCommand('clean.workspace')
+    cleanWorkspace: appendPrefixToCommand('clean.workspace'),
+    clearProjectCaches: appendPrefixToCommand('clear.project.caches'),
+    javaProjectPackages: appendPrefixToCommand('java.get.project.packages'),
+    openStackTrace: appendPrefixToCommand('open.stacktrace')
 }
diff --git a/vscode/src/configurations/configuration.ts b/vscode/src/configurations/configuration.ts
@@ -25,6 +25,7 @@ export const configKeys = {
     formatPrefs: 'format',
     hintPrefs: 'hints',
     importPrefs: 'java.imports',
+    runConfig: 'runCofig',
     runConfigVmOptions: 'runConfig.vmOptions',
     runConfigCwd: 'runConfig.cwd',
     verbose: 'verbose',
diff --git a/vscode/src/configurations/handlers.ts b/vscode/src/configurations/handlers.ts
@@ -14,7 +14,7 @@
   limitations under the License.
 */
 
-import { extensions, workspace } from "vscode";
+import { extensions, workspace, WorkspaceConfiguration } from "vscode";
 import { builtInConfigKeys, configKeys } from "./configuration";
 import { extConstants, NODE_WINDOWS_LABEL } from "../constants";
 import * as os from 'os';
@@ -23,6 +23,10 @@ import { LOGGER } from "../logger";
 import * as path from 'path';
 import * as fs from 'fs';
 
+export const getConfiguration = (key: string = extConstants.COMMAND_PREFIX): WorkspaceConfiguration => {
+    return workspace.getConfiguration(key);
+}
+
 export const getConfigurationValue = <T>(key: string, defaultValue: T | undefined = undefined): T => {
     const conf = workspace.getConfiguration(extConstants.COMMAND_PREFIX);
     return defaultValue != undefined ? conf.get(key, defaultValue) : conf.get(key) as T;
diff --git a/vscode/src/debugger/debugger.ts b/vscode/src/debugger/debugger.ts
@@ -36,7 +36,6 @@ export function registerDebugger(context: ExtensionContext): void {
     context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider(extConstants.COMMAND_PREFIX, configDynamicProvider, vscode.DebugConfigurationProviderTriggerKind.Dynamic));
     let configResolver = new NetBeansConfigurationResolver();
     context.subscriptions.push(vscode.debug.registerDebugConfigurationProvider(extConstants.COMMAND_PREFIX, configResolver));
-    context.subscriptions.push(vscode.debug.onDidTerminateDebugSession(((session) => onDidTerminateSession(session))));
     let debugDescriptionFactory = new NetBeansDebugAdapterDescriptionFactory();
     context.subscriptions.push(vscode.debug.registerDebugAdapterDescriptorFactory(extConstants.COMMAND_PREFIX, debugDescriptionFactory));
     initializeRunConfiguration().then(initialized => {
@@ -267,14 +266,3 @@ class RunConfigurationProvider implements vscode.DebugConfigurationProvider {
     }
 
 }
-
-
-function onDidTerminateSession(session: vscode.DebugSession): any {
-    const config = session.configuration;
-    if (config.env) {
-        const file = config.env["MICRONAUT_CONFIG_FILES"];
-        if (file) {
-            vscode.workspace.fs.delete(vscode.Uri.file(file));
-        }
-    }
-}
diff --git a/vscode/src/extension.ts b/vscode/src/extension.ts
@@ -83,8 +83,9 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
 
 
 export function deactivate(): Thenable<void> {
-    if (globalVars.nbProcessManager?.getProcess() != null) {
-        globalVars.nbProcessManager?.getProcess()?.kill();
+    const process = globalVars.nbProcessManager;
+    if (process?.getProcess() != null) {
+        process?.getProcess()?.kill();
     }
     return globalVars.clientPromise.stopClient();
 }
diff --git a/vscode/src/logger.ts b/vscode/src/logger.ts
@@ -31,15 +31,18 @@ export class ExtensionLogger {
     }
 
     public log(message: string): void {
-        this.outChannel.appendLine(`[${LogLevel.INFO}]: ${message}`);
+        const formattedMessage = `[${LogLevel.INFO}]: ${message}`;
+        this.printLog(formattedMessage);
     }
 
     public warn(message: string): void {
-        this.outChannel.appendLine(`[${LogLevel.WARN}]: ${message}`);
+        const formattedMessage = `[${LogLevel.WARN}]: ${message}`;
+        this.printLog(formattedMessage);
     }
 
     public error(message: string): void {
-        this.outChannel.appendLine(`[${LogLevel.ERROR}]: ${message}`);
+        const formattedMessage = `[${LogLevel.ERROR}]: ${message}`;
+        this.printLog(formattedMessage);
     }
 
     public logNoNL(message: string): void {
@@ -57,6 +60,11 @@ export class ExtensionLogger {
     public dispose(): void {
         this.outChannel.dispose();
     }
+
+    private printLog(message: string): void{
+        const timestamp = new Date().toISOString();
+        this.outChannel.appendLine(`[${timestamp}] ${message}`);
+    }
 }
 
 export const LOGGER = new ExtensionLogger(extConstants.SERVER_NAME);
diff --git a/vscode/src/lsp/nbLanguageClient.ts b/vscode/src/lsp/nbLanguageClient.ts
@@ -63,8 +63,8 @@ export class NbLanguageClient extends LanguageClient {
                     'wantsJavaSupport': true,
                     'wantsGroovySupport': false,
                     'commandPrefix': extConstants.COMMAND_PREFIX,
-                    'configurationPrefix': 'jdk.',
-                    'altConfigurationPrefix': 'jdk.'
+                    'configurationPrefix': `${extConstants.COMMAND_PREFIX}.`,
+                    'altConfigurationPrefix': `${extConstants.COMMAND_PREFIX}.`
                 }
             },
             errorHandler: {
diff --git a/vscode/src/test/launchNbcode.ts b/vscode/src/test/launchNbcode.ts
@@ -4,24 +4,7 @@ import * as os from 'os';
 import { env } from 'process';
 import { ChildProcessByStdio, spawn } from 'child_process';
 import { Readable } from 'stream';
-
-const findNbcode = (extensionPath: string): string => {
-    let nbcode = os.platform() === 'win32' ?
-        os.arch() === 'x64' ? 'nbcode64.exe' : 'nbcode.exe'
-        : 'nbcode.sh';
-    let nbcodePath = path.join(extensionPath, "nbcode", "bin", nbcode);
-
-    let nbcodePerm = fs.statSync(nbcodePath);
-    if (!nbcodePerm.isFile()) {
-        throw `Cannot execute ${nbcodePath}`;
-    }
-    if (os.platform() !== 'win32') {
-        fs.chmodSync(path.join(extensionPath, "nbcode", "bin", nbcode), "744");
-        fs.chmodSync(path.join(extensionPath, "nbcode", "platform", "lib", "nbexec.sh"), "744");
-        fs.chmodSync(path.join(extensionPath, "nbcode", "java", "maven", "bin", "mvn.sh"), "744");
-    }
-    return nbcodePath;
-}
+import { findNbcode } from '../lsp/utils';
 
 if (typeof process === 'object' && process.argv0 === 'node') {
     let extension = path.join(process.argv[1], '..', '..', '..');
diff --git a/vscode/src/test/suite/general/extension.test.ts b/vscode/src/test/suite/general/extension.test.ts
@@ -30,7 +30,7 @@ import * as myExplorer from '../../../views/projects';
 import { CodeAction, commands, extensions, Selection, Uri, window, workspace, TreeItem } from 'vscode';
 import { assertWorkspace, awaitClient, dumpJava, findClusters, getFilePaths, openFile, prepareProject, replaceCode } from '../../testutils';
 import { FORMATTED_POM_XML, SAMPLE_CODE_FORMAT_DOCUMENT, SAMPLE_CODE_SORT_IMPORTS, SAMPLE_CODE_UNUSED_IMPORTS } from '../../constants';
-import { extConstants } from '../../../constants';
+import { extCommands } from '../../../commands/commands';
 
 suite('Extension Test Suite', function () {
   window.showInformationMessage('Start all tests.');
@@ -166,7 +166,7 @@ suite('Extension Test Suite', function () {
     if (refactorActions && refactorActions.length > 0) {
       for await (const action of refactorActions) {
         if (action.command && action.command.arguments) {
-          if (action.command.command === extConstants.COMMAND_PREFIX + ".surround.with") {
+          if (action.command.command === extCommands.surroundWith) {
             //this action has a popup where the user needs to
             //select a template that should be used for the surround:
             continue;
@@ -197,7 +197,7 @@ suite('Extension Test Suite', function () {
       assert.strictEqual(tests[1].tests[0].name, 'testTrue', `Invalid test name returned`);
 
       console.log("Test: run all workspace tests");
-      await vscode.commands.executeCommand(extConstants.COMMAND_PREFIX + '.run.test', workspaceFolder.uri.toString());
+      await vscode.commands.executeCommand(extCommands.runTest, workspaceFolder.uri.toString());
       console.log(`Test: run all workspace tests finished`);
     } catch (error) {
       dumpJava();
diff --git a/vscode/src/test/testutils.ts b/vscode/src/test/testutils.ts
@@ -35,6 +35,7 @@ import { NbLanguageClient } from "../lsp/nbLanguageClient";
 import { extConstants } from "../constants";
 import { l10n } from "../localiser";
 import { globalVars } from "../extension";
+import { nbCommands } from "../commands/commands";
 
 /**
  * Folder path currently opened in VSCode workspace
@@ -164,12 +165,12 @@ export async function waitProjectRecognized(someJavaFile: string): Promise<void>
 		const u: vscode.Uri = vscode.Uri.file(someJavaFile);
 		// clear out possible bad or negative caches.
 		return vscode.commands
-			.executeCommand(extConstants.COMMAND_PREFIX + ".clear.project.caches")
+			.executeCommand(nbCommands.clearProjectCaches)
 			.then(
 				// this should assure opening the root with the created project.
 				() =>
 					vscode.commands.executeCommand(
-						extConstants.COMMAND_PREFIX + ".java.get.project.packages",
+						nbCommands.javaProjectPackages,
 						u.toString()
 					)
 			);
diff --git a/vscode/src/views/TestViewController.ts b/vscode/src/views/TestViewController.ts
@@ -24,8 +24,7 @@
 import { commands, debug, tests, workspace, CancellationToken, TestController, TestItem, TestRunProfileKind, TestRunRequest, Uri, TestRun, TestMessage, Location, Position, MarkdownString } from "vscode";
 import * as path from 'path';
 import { asRange, TestCase, TestSuite } from "../lsp/protocol";
-import { extConstants } from "../constants";
-import { extCommands, builtInCommands } from "../commands/commands"
+import { extCommands, builtInCommands, nbCommands } from "../commands/commands"
 
 export class NbTestAdapter {
 
@@ -313,7 +312,7 @@ export class NbTestAdapter {
             }
             const result = regExp.exec(line);
             if (result) {
-                message.appendText(result[1]).appendText('(').appendMarkdown(`[${result[3]}](command:${extConstants.COMMAND_PREFIX}.open.stacktrace?${encodeURIComponent(JSON.stringify([currentTestUri, result[2], result[4], +result[5]]))})`).appendText(')');
+                message.appendText(result[1]).appendText('(').appendMarkdown(`[${result[3]}](command:${nbCommands.openStackTrace}?${encodeURIComponent(JSON.stringify([currentTestUri, result[2], result[4], +result[5]]))})`).appendText(')');
             } else {
                 message.appendText(line);
             }
diff --git a/vscode/src/views/runConfiguration.ts b/vscode/src/views/runConfiguration.ts
@@ -22,6 +22,8 @@
 import * as vscode from 'vscode';
 import { homedir } from 'os';
 import { l10n } from '../localiser';
+import { getConfiguration } from '../configurations/handlers';
+import { configKeys } from '../configurations/configuration';
 
 
 
@@ -108,7 +110,7 @@ class RunConfigurationNode extends vscode.TreeItem {
 	}
 
 	getConfig(): vscode.WorkspaceConfiguration {
-		return vscode.workspace.getConfiguration('jdk.runConfig');
+		return getConfiguration(configKeys.runConfig);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,9 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {`
`83`	`83`
`84`	`84`
`85`	`85`	`export function deactivate(): Thenable<void> {`
`86`		`- if (globalVars.nbProcessManager?.getProcess() != null) {`
`87`		`- globalVars.nbProcessManager?.getProcess()?.kill();`
	`86`	`+ const process = globalVars.nbProcessManager;`
	`87`	`+ if (process?.getProcess() != null) {`
	`88`	`+ process?.getProcess()?.kill();`
`88`	`89`	`}`
`89`	`90`	`return globalVars.clientPromise.stopClient();`
`90`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,18 @@ export class ExtensionLogger {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public log(message: string): void {`
`34`		- this.outChannel.appendLine(`[${LogLevel.INFO}]: ${message}`);
	`34`	+ const formattedMessage = `[${LogLevel.INFO}]: ${message}`;
	`35`	`+ this.printLog(formattedMessage);`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`public warn(message: string): void {`
`38`		- this.outChannel.appendLine(`[${LogLevel.WARN}]: ${message}`);
	`39`	+ const formattedMessage = `[${LogLevel.WARN}]: ${message}`;
	`40`	`+ this.printLog(formattedMessage);`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`public error(message: string): void {`
`42`		- this.outChannel.appendLine(`[${LogLevel.ERROR}]: ${message}`);
	`44`	+ const formattedMessage = `[${LogLevel.ERROR}]: ${message}`;
	`45`	`+ this.printLog(formattedMessage);`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`public logNoNL(message: string): void {`
`@@ -57,6 +60,11 @@ export class ExtensionLogger {`
`57`	`60`	`public dispose(): void {`
`58`	`61`	`this.outChannel.dispose();`
`59`	`62`	`}`
	`63`	`+`
	`64`	`+ private printLog(message: string): void{`
	`65`	`+ const timestamp = new Date().toISOString();`
	`66`	+ this.outChannel.appendLine(`[${timestamp}] ${message}`);
	`67`	`+ }`
`60`	`68`	`}`
`61`	`69`
`62`	`70`	`export const LOGGER = new ExtensionLogger(extConstants.SERVER_NAME);`