This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 319f506 Properly specify --userdir when lauching the nbcode launcher
new d492b87 Merge pull request #2494 from
JaroslavTulach/jtulach/NbCodeUserdir
319f506 is described below
commit 319f5064be57a5c8ce7d00480de066aa0c7edb81
Author: Jaroslav Tulach <[email protected]>
AuthorDate: Mon Oct 26 17:10:09 2020 +0100
Properly specify --userdir when lauching the nbcode launcher
---
java/java.lsp.server/vscode/src/nbcode.ts | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/java/java.lsp.server/vscode/src/nbcode.ts
b/java/java.lsp.server/vscode/src/nbcode.ts
index dc85e63..72efc4d 100644
--- a/java/java.lsp.server/vscode/src/nbcode.ts
+++ b/java/java.lsp.server/vscode/src/nbcode.ts
@@ -59,9 +59,11 @@ export function launch(
}
let clusterPath = info.clusters.join(path.delimiter);
- let ideArgs: string[] = [];
+ let ideArgs: string[] = [
+ '--userdir', userDir
+ ];
if (info.jdkHome) {
- ideArgs = ['--jdkhome', info.jdkHome as string];
+ ideArgs.push('--jdkhome', info.jdkHome as string);
}
if (info.verbose) {
ideArgs.push('-J-Dnetbeans.logger.console=true');
@@ -86,7 +88,8 @@ if (typeof process === 'object' && process.argv0 === 'node') {
}
let clusters = fs.readdirSync(nbcode).filter(c => c !== 'bin' && c !==
'etc').map(c => path.join(nbcode, c));
let args = process.argv.slice(2);
- let globalStorage = path.join(os.homedir(), '.config', 'Code', 'User',
'globalStorage', 'jlahoda.apache-netbeans-java');
+ let json = JSON.parse("" + fs.readFileSync(path.join(extension,
'package.json')));
+ let globalStorage = path.join(os.homedir(), '.config', 'Code', 'User',
'globalStorage', json.publisher + '.' + json.name);
let info = {
clusters : clusters,
extensionPath: extension,
---------------------------------------------------------------------
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
