This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a commit to branch release122 in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 78a833ac820149c0327ddb8c81b94c68ab6b0879 Author: Svata Dedic <[email protected]> AuthorDate: Fri Oct 16 17:16:16 2020 +0200 Reducing LSP server messages on startup. --- java/java.lsp.server/script/etc/nbcode.conf | 2 +- java/java.lsp.server/vscode/package.json | 7 ++++++- java/java.lsp.server/vscode/src/extension.ts | 15 ++++++++------- java/java.lsp.server/vscode/src/nbcode.ts | 4 ++++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/java/java.lsp.server/script/etc/nbcode.conf b/java/java.lsp.server/script/etc/nbcode.conf index 62849fe..2077e90 100644 --- a/java/java.lsp.server/script/etc/nbcode.conf +++ b/java/java.lsp.server/script/etc/nbcode.conf @@ -58,7 +58,7 @@ default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev" # options used by the launcher by default, can be overridden by explicit # command line switches -default_options="--nogui --nosplash --branding nbcode -J-Dnetbeans.logger.console=true -J-Djava.awt.headless=true -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.base/java.security=ALL-UNNAMED -J--add-opens=java.base/java.util=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED -J--add-opens=java.desk [...] +default_options="--nogui --nosplash --branding nbcode -J-Djava.awt.headless=true -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.base/java.security=ALL-UNNAMED -J--add-opens=java.base/java.util=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--a [...] # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea # default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch diff --git a/java/java.lsp.server/vscode/package.json b/java/java.lsp.server/vscode/package.json index 221b262..2f9be73 100644 --- a/java/java.lsp.server/vscode/package.json +++ b/java/java.lsp.server/vscode/package.json @@ -35,7 +35,12 @@ ], "default": null, "description": "Specifies the JDK on which the Java language server should be run" - } + }, + "netbeans.verbose": { + "type": "boolean", + "default": false, + "description": "Enables verbose messages from the Java Language Server" + } } }, "breakpoints": [ diff --git a/java/java.lsp.server/vscode/src/extension.ts b/java/java.lsp.server/vscode/src/extension.ts index 5ce27ce..b3d8994 100644 --- a/java/java.lsp.server/vscode/src/extension.ts +++ b/java/java.lsp.server/vscode/src/extension.ts @@ -68,13 +68,16 @@ function findClusters(myPath : string): string[] { export function activate(context: ExtensionContext) { //verify acceptable JDK is available/set: let specifiedJDK = workspace.getConfiguration('netbeans').get('jdkhome'); - + const beVerbose : boolean = workspace.getConfiguration('netbeans').get('verbose', false); let info = { clusters : findClusters(context.extensionPath), extensionPath: context.extensionPath, storagePath : context.globalStoragePath, - jdkHome : specifiedJDK + jdkHome : specifiedJDK, + verbose: beVerbose }; + + let log = vscode.window.createOutputChannel("Java Language Server"); vscode.extensions.all.forEach((e, index) => { if (e.extensionPath.indexOf("redhat.java") >= 0) { @@ -87,9 +90,8 @@ export function activate(context: ExtensionContext) { } }); - let log = vscode.window.createOutputChannel("Java Language Server"); log.appendLine("Launching Java Language Server"); - vscode.window.showInformationMessage("Launching Java Language Server"); + vscode.window.setStatusBarMessage("Launching Java Language Server", 2000); let ideRunning = new Promise((resolve, reject) => { let collectedText : string | null = ''; @@ -183,8 +185,8 @@ export function activate(context: ExtensionContext) { workspace.createFileSystemWatcher('**/*.java') ] }, - outputChannelName: 'Java', - revealOutputChannelOn: 4, + outputChannel: log, + revealOutputChannelOn: 3, // error initializationOptions : { 'nbcodeCapabilities' : { 'statusBarMessageSupport' : true @@ -213,7 +215,6 @@ export function activate(context: ExtensionContext) { let debugDescriptionFactory = new NetBeansDebugAdapterDescriptionFactory(); context.subscriptions.push(vscode.debug.registerDebugAdapterDescriptorFactory('java-polyglot', debugDescriptionFactory)); - window.showInformationMessage('Java Polyglot Debug Adapter ready.'); // register commands context.subscriptions.push(commands.registerCommand('java.workspace.compile', () => { diff --git a/java/java.lsp.server/vscode/src/nbcode.ts b/java/java.lsp.server/vscode/src/nbcode.ts index 76c93d8..dc85e63 100644 --- a/java/java.lsp.server/vscode/src/nbcode.ts +++ b/java/java.lsp.server/vscode/src/nbcode.ts @@ -29,6 +29,7 @@ export interface LaunchInfo { extensionPath: string; storagePath: string; jdkHome: string | unknown; + verbose? : boolean; } function find(info: LaunchInfo): string { @@ -62,6 +63,9 @@ export function launch( if (info.jdkHome) { ideArgs = ['--jdkhome', info.jdkHome as string]; } + if (info.verbose) { + ideArgs.push('-J-Dnetbeans.logger.console=true'); + } ideArgs.push(...extraArgs); let process: ChildProcessByStdio<any, Readable, Readable> = spawn(nbcodePath, ideArgs, { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
