This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_2399
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/vsnetbeans_2399 by this push:
new 2c920be9d5b Attempt to verify that Java exists, and is new enough
2c920be9d5b is described below
commit 2c920be9d5ba7f5557ee98b5e8063170f2b6e26a
Author: Svata Dedic <[email protected]>
AuthorDate: Wed Oct 2 14:08:05 2024 +0200
Attempt to verify that Java exists, and is new enough
---
java/java.lsp.server/vscode/src/extension.ts | 45 +++++++++++++++++++++----
java/java.lsp.server/vscode/src/jdk/settings.ts | 3 +-
2 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/java/java.lsp.server/vscode/src/extension.ts
b/java/java.lsp.server/vscode/src/extension.ts
index 1e5541c4c02..8cfee391b37 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -45,7 +45,7 @@ import {
import * as net from 'net';
import * as fs from 'fs';
import * as path from 'path';
-import { ChildProcess } from 'child_process';
+import { spawnSync, ChildProcess } from 'child_process';
import * as vscode from 'vscode';
import * as ls from 'vscode-languageserver-protocol';
import * as launcher from './nbcode';
@@ -73,10 +73,13 @@ const DATABASE: string = 'Database';
const listeners = new Map<string, string[]>();
export let client: Promise<NbLanguageClient>;
export let clientRuntimeJDK : string | null = null;
+export const MINIMAL_JDK_VERSION = 17;
+
let testAdapter: NbTestAdapter | undefined;
let nbProcess : ChildProcess | null = null;
let debugPort: number = -1;
let consoleLog: boolean = !!process.env['ENABLE_CONSOLE_LOG'];
+let specifiedJDKWarned : string[] = [];
export class NbLanguageClient extends LanguageClient {
private _treeViewService: TreeViewService;
@@ -465,17 +468,47 @@ export function activate(context: ExtensionContext):
VSNetBeansAPI {
// find acceptable JDK and launch the Java part
findJDK(async (specifiedJDK) => {
const osExeSuffix = process.platform === 'win32' ? '.exe' : '';
- if (!specifiedJDK || !(fs.existsSync(path.resolve(specifiedJDK, 'bin',
`java${osExeSuffix}`)) && path.resolve(specifiedJDK, 'bin',
`javac${osExeSuffix}`))) {
+ let jdkOK : boolean = true;
+ let javaExecPath : string;
+ if (!specifiedJDK) {
+ javaExecPath = 'java';
+ } else {
+ javaExecPath = path.resolve(specifiedJDK, 'bin', 'java');
+ jdkOK = fs.existsSync(path.resolve(specifiedJDK, 'bin',
`java${osExeSuffix}`)) && fs.existsSync(path.resolve(specifiedJDK, 'bin',
`javac${osExeSuffix}`));
+ }
+ if (jdkOK) {
+ log.appendLine(`Verifying java: ${javaExecPath}`);
+ // let the shell interpret PATH and .exe extension
+ let javaCheck = spawnSync(`${javaExecPath} -version`, { shell :
true });
+ if (javaCheck.error || javaCheck.status) {
+ jdkOK = false;
+ } else {
+ javaCheck.stderr.toString().split('\n').find(l => {
+ // yes, versions like 1.8 (up to 9) will be interpreted as
1, which is OK for < comparison
+ let re = /.* version \"([0-9]+)\.[^"]+\".*/.exec(l);
+ if (re) {
+ let versionNumber = Number(re[1]);
+ if (versionNumber < MINIMAL_JDK_VERSION) {
+ jdkOK = false;
+ }
+ }
+ });
+ }
+ }
+ let warnedJDKs : string[] = specifiedJDKWarned;
+ if (!jdkOK && !warnedJDKs.includes(specifiedJDK || '')) {
const msg = specifiedJDK ?
- `The current path to JDK "${specifiedJDK}" may be invalid. A
valid JDK is required by Apache NetBeans Language Server to run.
- You should configure a proper JDK for Apache NetBeans and/or
other technologies. Do you want to run JDK configuration now ?` :
- 'A valid JDK is required by Apache NetBeans Language Server to
run, but none was found. You should configure a proper JDK for Apache NetBeans
and/or other technologies. ' +
- 'Do you want to run JDK configuration now ?';
+ `The current path to JDK "${specifiedJDK}" may be invalid. A
valid JDK ${MINIMAL_JDK_VERSION}+ is required by Apache NetBeans Language
Server to run.
+ You should configure a proper JDK for Apache NetBeans and/or
other technologies. Do you want to run JDK configuration now?` :
+ `A valid JDK ${MINIMAL_JDK_VERSION}+ is required by Apache
NetBeans Language Server to run, but none was found. You should configure a
proper JDK for Apache NetBeans and/or other technologies. ` +
+ 'Do you want to run JDK configuration now?';
const Y = "Yes";
const N = "No";
if (await vscode.window.showErrorMessage(msg, Y, N) == Y) {
vscode.commands.executeCommand('nbls.jdk.configuration');
return;
+ } else {
+ warnedJDKs.push(specifiedJDK || '');
}
}
let currentClusters = findClusters(context.extensionPath).sort();
diff --git a/java/java.lsp.server/vscode/src/jdk/settings.ts
b/java/java.lsp.server/vscode/src/jdk/settings.ts
index 019454bc19d..5c0fd1f1195 100644
--- a/java/java.lsp.server/vscode/src/jdk/settings.ts
+++ b/java/java.lsp.server/vscode/src/jdk/settings.ts
@@ -21,6 +21,7 @@ import * as vscode from 'vscode';
import * as path from 'path';
import * as process from 'process';
import * as jdk from './jdk';
+import { MINIMAL_JDK_VERSION } from '../extension';
export abstract class Setting {
@@ -341,7 +342,7 @@ const NBLS_EXTENSION_ID = 'asf.apache-netbeans-java';
const NBLS_SETTINGS_NAME = 'Language Server by Apache NetBeans';
const NBLS_SETTINGS_PROPERTY = 'netbeans.jdkhome';
function nblsSetting(): Setting {
- return new JavaSetting(NBLS_SETTINGS_NAME, NBLS_SETTINGS_PROPERTY, 17,
true);
+ return new JavaSetting(NBLS_SETTINGS_NAME, NBLS_SETTINGS_PROPERTY,
MINIMAL_JDK_VERSION, true);
}
const NBLS_SETTINGS_PROJECT_NAME = 'Language Server by Apache NetBeans - Java
Runtime for Projects';
---------------------------------------------------------------------
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
