fixed disableNbJavac issue, refactored server startup code into multiple files

Achal1607 · Achal1607 · commit ed7b018a6d4f · 2024-10-25T16:14:06.000+05:30
diff --git a/vscode/src/configurations/configuration.ts b/vscode/src/configurations/configuration.ts
@@ -28,6 +28,7 @@ export const configKeys = {
     runConfigCwd: 'runConfig.cwd',
     verbose: 'verbose',
     userdir: 'userdir',
+    revealInActivteProj: "revealActiveInProjects"
 };
 
 export const builtInConfigKeys = {
diff --git a/vscode/src/configurations/handlers.ts b/vscode/src/configurations/handlers.ts
@@ -136,5 +136,5 @@ export const userdirHandler = (): string => {
 }
 
 export const isNbJavacDisabledHandler = (): boolean => {
-    return getConfigurationValue(configKeys.verbose, false);
+    return getConfigurationValue(configKeys.disableNbJavac, false);
 }
diff --git a/vscode/src/extension.ts b/vscode/src/extension.ts
@@ -45,7 +45,7 @@ import { ExtensionInfo } from './extensionInfo';
 import { ClientPromise } from './lsp/clientPromise';
 import { ExtensionLogger } from './logger';
 import { NbProcessManager } from './lsp/nbProcessManager';
-import { initializeServer } from './lsp/initializer';
+import { clientInit, serverOptionsBuilder } from './lsp/initializer';
 import { NbLanguageClient } from './lsp/nbLanguageClient';
 import { subscribeCommands } from './commands/register';
 import { VSNetBeansAPI } from './lsp/types';
@@ -90,7 +90,7 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
 
     globalVars.clientPromise.initialize();
     registerListenersBeforeClientInit();
-    doActivateWithJDK();
+    clientInit();
 
     //register debugger:
     let debugTrackerFactory =new NetBeansDebugAdapterTrackerFactory();
@@ -242,53 +242,6 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
     });
 }
 
-function doActivateWithJDK(): void {
-        const connection: () => Promise<StreamInfo> = initializeServer();
-        const client = NbLanguageClient.build(connection, LOGGER);
-        
-        LOGGER.log('Language Client: Starting');
-        client.start().then(() => {
-            globalVars.testAdapter = new NbTestAdapter();
-            registerListenersAfterClientInit();
-            registerNotificationListeners(client);
-            registerRequestListeners(client);
-            LOGGER.log('Language Client: Ready');
-            globalVars.clientPromise.initializedSuccessfully(client);
-        
-            createProjectView(client);
-        }).catch(globalVars.clientPromise.setClient[1]);
-}
-    async function createProjectView(client : NbLanguageClient) {
-        const ts : TreeViewService = client.findTreeViewService();
-        let tv : vscode.TreeView<Visualizer> = await ts.createView('foundProjects', 'Projects', { canSelectMany : false });
-
-        async function revealActiveEditor(ed? : vscode.TextEditor) {
-            const uri = window.activeTextEditor?.document?.uri;
-            if (!uri || uri.scheme.toLowerCase() !== 'file') {
-                return;
-            }
-            if (!tv.visible) {
-                return;
-            }
-            let vis : Visualizer | undefined = await ts.findPath(tv, uri.toString());
-            if (!vis) {
-                return;
-            }
-            tv.reveal(vis, { select : true, focus : false, expand : false });
-        }
-        const netbeansConfig = workspace.getConfiguration(extConstants.COMMAND_PREFIX);
-        globalVars.extensionInfo.pushSubscription(window.onDidChangeActiveTextEditor(ed => {
-            if (netbeansConfig.get("revealActiveInProjects")) {
-                revealActiveEditor(ed);
-            }
-        }));
-        globalVars.extensionInfo.pushSubscription(vscode.commands.registerCommand(extConstants.COMMAND_PREFIX + ".select.editor.projects", () => revealActiveEditor()));
-
-        // attempt to reveal NOW:
-        if (netbeansConfig.get("revealActiveInProjects")) {
-            revealActiveEditor();
-        }
-    }
 
 
 export function deactivate(): Thenable<void> {
diff --git a/vscode/src/lsp/clientPromise.ts b/vscode/src/lsp/clientPromise.ts
@@ -71,7 +71,7 @@ export class ClientPromise {
             await this.stopClient();
             await nbProcessManager.killProcess(notifyKill);
             this.initialize();
-            initializeServer();
+            clientInit();
         } catch (error) {
             LOGGER.log(`Error during activation: ${error}`, LogLevel.ERROR);
             throw error;
diff --git a/vscode/src/lsp/initializer.ts b/vscode/src/lsp/initializer.ts
@@ -14,40 +14,23 @@
   limitations under the License.
 */
 import { StreamInfo } from "vscode-languageclient/node";
-import { getUserConfigLaunchOptionsDefaults, prepareNbcodeLaunchOptions } from "./launchOptions";
+import { getUserConfigLaunchOptionsDefaults } from "./launchOptions";
 import { globalVars, LOGGER } from "../extension";
 import { configKeys } from "../configurations/configuration";
-import { NbProcessManager } from "./nbProcessManager";
-import { enableDisableModules, findNbcode } from "./utils";
+import { enableDisableModules } from "./utils";
 import * as net from 'net';
-import { extConstants, NODE_WINDOWS_LABEL } from "../constants";
-import { l10n } from "../localiser";
-import { window } from "vscode";
 import { ChildProcess } from "child_process";
-import { jdkDownloaderPrompt } from "../webviews/jdkDownloader/prompt";
-import * as os from 'os';
-import { LogLevel } from "../logger";
-import { isNbJavacDisabledHandler } from "../configurations/handlers";
-
-const launchNbcode = (): void => {
-    const ideLaunchOptions = prepareNbcodeLaunchOptions();
-    const userdir = getUserConfigLaunchOptionsDefaults()[configKeys.userdir].value;
-    const specifiedJDK = getUserConfigLaunchOptionsDefaults()[configKeys.jdkHome].value;
-    const extensionPath = globalVars.extensionInfo.getExtensionStorageUri().fsPath;
-    const nbcodePath = findNbcode(extensionPath);
-
-    const requiredJdk = specifiedJDK ? specifiedJDK : 'default system JDK';
-    let launchMsg = l10n.value("jdk.extension.lspServer.statusBar.message.launching", {
-        SERVER_NAME: extConstants.SERVER_NAME,
-        requiredJdk: requiredJdk,
-        userdir: userdir
-    });
-    LOGGER.log(launchMsg);
-    window.setStatusBarMessage(launchMsg, 2000);
-
-    globalVars.nbProcessManager = new NbProcessManager(userdir, nbcodePath, ideLaunchOptions);
-    globalVars.nbProcessManager.startProcess();
-}
+import { getConfigurationValue, isNbJavacDisabledHandler } from "../configurations/handlers";
+import { attachNbProcessListeners, launchNbcode } from "./nbcode";
+import { NbLanguageClient } from "./nbLanguageClient";
+import { NbTestAdapter } from "../testAdapter";
+import { registerListenersAfterClientInit } from "../listener";
+import { registerNotificationListeners } from "./notifications/register";
+import { registerRequestListeners } from "./requests/register";
+import { TreeViewService, Visualizer } from "../explorer";
+import { commands, TextEditor, TreeView, window, workspace } from "vscode";
+import { extConstants } from "../constants";
+import { extCommands } from "../commands/commands";
 
 const establishConnection = () => new Promise<StreamInfo>((resolve, reject) => {
     const nbProcess = globalVars.nbProcessManager?.getProcess();
@@ -61,21 +44,8 @@ const establishConnection = () => new Promise<StreamInfo>((resolve, reject) => {
     LOGGER.log(`LSP server launching: ${nbProcessManager.getProcessId()}`);
     LOGGER.log(`LSP server user directory: ${getUserConfigLaunchOptionsDefaults()[configKeys.userdir].value}`);
 
-    let status = false;
-    nbProcess.stdout?.on('data', (d: any) => {
-        status = processOnDataHandler(nbProcessManager, d.toString(), true);
-    });
-    nbProcess.stderr?.on('data', (d: any) => {
-        processOnDataHandler(nbProcessManager, d.toString(), false);
-    });
-    nbProcess.on('close', (code: number) => {
-        const status = processOnCloseHandler(nbProcessManager, code)
-        if (status != null) {
-            reject(status);
-        }
-    });
-
     try {
+        attachNbProcessListeners(nbProcessManager);
         connectToServer(nbProcess).then(server => resolve({
             reader: server,
             writer: server
@@ -121,55 +91,11 @@ const connectToServer = (nbProcess: ChildProcess): Promise<net.Socket> => {
     });
 }
 
-const processOnDataHandler = (nbProcessManager: NbProcessManager, text: string, isOut: boolean) => {
-    if (nbProcessManager) {
-        globalVars.clientPromise.activationPending = false;
-    }
-    LOGGER.logNoNL(text);
-    isOut ? nbProcessManager.appendStdOut(text) : nbProcessManager.appendStdErr(text);
-
-    if (nbProcessManager.getStdOut()?.match(/org.netbeans.modules.java.lsp.server/)) {
-        return true;
-    }
-    return false;
-}
-
-
-const processOnCloseHandler = (nbProcessManager: NbProcessManager, code: number): string | null => {
-    const globalnbProcessManager = globalVars.nbProcessManager;
-    if (globalnbProcessManager == nbProcessManager) {
-        globalVars.nbProcessManager = null;
-        if (code != 0) {
-            window.showWarningMessage(l10n.value("jdk.extension.lspServer.warning_message.serverExited", { SERVER_NAME: extConstants.SERVER_NAME, code: code }));
-        }
-    }
-    if (nbProcessManager.getStdOut()?.match(/Cannot find java/) || (os.type() === NODE_WINDOWS_LABEL && !globalVars.deactivated)) {
-        jdkDownloaderPrompt();
-    }
-    if (nbProcessManager.getStdOut() != null) {
-        let match = nbProcessManager.getStdOut()!.match(/org.netbeans.modules.java.lsp.server[^\n]*/)
-        if (match?.length == 1) {
-            LOGGER.log(match[0]);
-        } else {
-            LOGGER.log("Cannot find org.netbeans.modules.java.lsp.server in the log!", LogLevel.ERROR);
-        }
-        LOGGER.log(`Please refer to troubleshooting section for more info: https://github.com/oracle/javavscode/blob/main/README.md#troubleshooting`);
-        LOGGER.showOutputChannelUI(false);
-
-        nbProcessManager.killProcess(false);
-        return l10n.value("jdk.extension.error_msg.notEnabled", { SERVER_NAME: extConstants.SERVER_NAME });
-    } else {
-        LOGGER.log(`LSP server ${nbProcessManager.getProcessId()} terminated with ${code}`);
-        LOGGER.log(`Exit code ${code}`);
-    }
-    return null;
-}
-
 const enableDisableNbjavacModule = () => {
     const userdirPath = getUserConfigLaunchOptionsDefaults()[configKeys.userdir].value
     const nbjavacValue = isNbJavacDisabledHandler();
     const extensionPath = globalVars.extensionInfo.getExtensionStorageUri().fsPath;
-    enableDisableModules(extensionPath, userdirPath, ['org.netbeans.libs.nbjavacapi'], nbjavacValue);
+    enableDisableModules(extensionPath, userdirPath, ['org.netbeans.libs.nbjavacapi'], !nbjavacValue);
 }
 
 const serverBuilder = () => {
@@ -179,7 +105,7 @@ const serverBuilder = () => {
 }
 
 export const clientInit = () => {
-    const connection: () => Promise<StreamInfo> = serverBuilder();
+    const connection: () => Promise<StreamInfo> = serverOptionsBuilder();
     const client = NbLanguageClient.build(connection, LOGGER);
     
     LOGGER.log('Language Client: Starting');
diff --git a/vscode/src/lsp/launchOptions.ts b/vscode/src/lsp/launchOptions.ts
@@ -16,6 +16,7 @@
 import { builtInConfigKeys, configKeys } from "../configurations/configuration"
 import { isDarkColorThemeHandler, isNbJavacDisabledHandler, jdkHomeValueHandler, lspServerVmOptionsHandler, projectSearchRootsValueHandler, userdirHandler } from "../configurations/handlers";
 import { l10n } from "../localiser";
+import { isString } from "../typesUtil";
 import { userDefinedLaunchOptionsType } from "./types"
 
 export const getUserConfigLaunchOptionsDefaults = (): userDefinedLaunchOptionsType => {
@@ -63,7 +64,7 @@ const prepareUserConfigLaunchOptions = (): string[] => {
             if (!optionToPass && Array.isArray(value)) {
                 launchOptions.push(...value);
             }
-            else if (typeof (optionToPass) === "string") {
+            else if (isString(optionToPass)) {
                 launchOptions.push(`${optionToPass}${value}`);
             } else if (Array.isArray(optionToPass)) {
                 const arg: string[] = [...optionToPass, value];
diff --git a/vscode/src/lsp/nbProcessManager.ts b/vscode/src/lsp/nbProcessManager.ts
@@ -99,6 +99,10 @@ export class NbProcessManager {
     getStdOut = () => {
         return this.stdOutText
     }
+    
+    setStdOut = (stdOut: string | null) => {
+        this.stdOutText = stdOut;
+    }
 
     getStdErr = () => {
         return this.stdErrText;
diff --git a/vscode/src/lsp/nbcode.ts b/vscode/src/lsp/nbcode.ts
@@ -0,0 +1,110 @@
+/*
+  Copyright (c) 2023-2024, Oracle and/or its affiliates.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+     https://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+import { window } from "vscode";
+import { configKeys } from "../configurations/configuration";
+import { extConstants, NODE_WINDOWS_LABEL } from "../constants";
+import { globalVars, LOGGER } from "../extension";
+import { prepareNbcodeLaunchOptions, getUserConfigLaunchOptionsDefaults } from "./launchOptions";
+import { NbProcessManager } from "./nbProcessManager";
+import { findNbcode } from "./utils";
+import { l10n } from "../localiser";
+import { jdkDownloaderPrompt } from "../webviews/jdkDownloader/prompt";
+import { LogLevel } from "../logger";
+import * as os from 'os';
+
+export const launchNbcode = (): void => {
+    const ideLaunchOptions = prepareNbcodeLaunchOptions();
+    const userdir = getUserConfigLaunchOptionsDefaults()[configKeys.userdir].value;
+    const specifiedJDK = getUserConfigLaunchOptionsDefaults()[configKeys.jdkHome].value;
+    const extensionPath = globalVars.extensionInfo.getExtensionStorageUri().fsPath;
+    const nbcodePath = findNbcode(extensionPath);
+
+    const requiredJdk = specifiedJDK ? specifiedJDK : 'default system JDK';
+    let launchMsg = l10n.value("jdk.extension.lspServer.statusBar.message.launching", {
+        SERVER_NAME: extConstants.SERVER_NAME,
+        requiredJdk: requiredJdk,
+        userdir: userdir
+    });
+    LOGGER.log(launchMsg);
+    window.setStatusBarMessage(launchMsg, 2000);
+
+    globalVars.nbProcessManager = new NbProcessManager(userdir, nbcodePath, ideLaunchOptions);
+    globalVars.nbProcessManager.startProcess();
+}
+
+
+export const attachNbProcessListeners = (nbProcessManager: NbProcessManager): void => {
+    const nbProcess = nbProcessManager.getProcess();
+    nbProcess?.stdout?.on('data', chunk => {
+        processOnDataHandler(nbProcessManager, chunk.toString(), true);
+    });
+    nbProcess?.stderr?.on('data', chunk => {
+        processOnDataHandler(nbProcessManager, chunk.toString(), false);
+    });
+    nbProcess?.on('close', (code: number) => {
+        const status = processOnCloseHandler(nbProcessManager, code)
+        if (status != null) {
+            throw status;
+        }
+    });
+}
+
+const processOnDataHandler = (nbProcessManager: NbProcessManager, text: string, isOut: boolean) => {
+    if (nbProcessManager) {
+        globalVars.clientPromise.activationPending = false;
+    }
+    if (nbProcessManager.getStdOut() == null) {
+        return;
+    }
+    LOGGER.logNoNL(text);
+    isOut ? nbProcessManager.appendStdOut(text) : nbProcessManager.appendStdErr(text);
+
+    if (nbProcessManager.getStdOut()?.match(/org.netbeans.modules.java.lsp.server/)) {
+        nbProcessManager.setStdOut(null);
+    }
+}
+
+
+const processOnCloseHandler = (nbProcessManager: NbProcessManager, code: number): string | null => {
+    const globalnbProcessManager = globalVars.nbProcessManager;
+    if (globalnbProcessManager == nbProcessManager) {
+        globalVars.nbProcessManager = null;
+        if (code && code != 0) {
+            window.showWarningMessage(l10n.value("jdk.extension.lspServer.warning_message.serverExited", { SERVER_NAME: extConstants.SERVER_NAME, code }));
+        }
+    }
+    if (nbProcessManager.getStdOut()?.match(/Cannot find java/) || (os.type() === NODE_WINDOWS_LABEL && !globalVars.deactivated)) {
+        jdkDownloaderPrompt();
+    }
+    if (nbProcessManager.getStdOut() != null) {
+        let match = nbProcessManager.getStdOut()!.match(/org.netbeans.modules.java.lsp.server[^\n]*/)
+        if (match?.length == 1) {
+            LOGGER.log(match[0]);
+        } else {
+            LOGGER.log("Cannot find org.netbeans.modules.java.lsp.server in the log!", LogLevel.ERROR);
+        }
+        LOGGER.log(`Please refer to troubleshooting section for more info: https://github.com/oracle/javavscode/blob/main/README.md#troubleshooting`);
+        LOGGER.showOutputChannelUI(false);
+
+        nbProcessManager.killProcess(false);
+        return l10n.value("jdk.extension.error_msg.notEnabled", { SERVER_NAME: extConstants.SERVER_NAME });
+    } else {
+        LOGGER.log(`LSP server ${nbProcessManager.getProcessId()} terminated with ${code}`);
+        LOGGER.log(`Exit code ${code}`);
+    }
+    return null;
+}

Original file line number	Diff line number	Diff line change
`@@ -136,5 +136,5 @@ export const userdirHandler = (): string => {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`export const isNbJavacDisabledHandler = (): boolean => {`
`139`		`- return getConfigurationValue(configKeys.verbose, false);`
	`139`	`+ return getConfigurationValue(configKeys.disableNbJavac, false);`
`140`	`140`	`}`