Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Notify user to install jdk when GradleServerEnv not found #1569

Merged
merged 6 commits into from
Aug 8, 2024
Merged

Notify user to install jdk when GradleServerEnv not found #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b7a06f
Notify user to install jdk when not found
Jiaaming Aug 8, 2024
6c84c95
Merge branch 'develop' into jdk-install-notify
jdneo Aug 8, 2024
05bb6ca
Fix: comment
Jiaaming Aug 8, 2024
6bf70cb
Merge branch 'jdk-install-notify' of https://github.com/Jiaaming/vsco…
Jiaaming Aug 8, 2024
bfb4835
Fix: comment
Jiaaming Aug 8, 2024
60aeb2e
fix: comment
Jiaaming Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions extension/src/constant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export const NO_JAVA_EXECUTABLE =

export const OPT_RESTART = "Restart";

export const INSTALL_JDK = "Install JDK";

export const GRADLE_SERVER_BASE_JVM_OPTS =
"--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED";

Expand Down
15 changes: 10 additions & 5 deletions extension/src/server/GradleServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import { sendInfo } from "vscode-extension-telemetry-wrapper";
import { getGradleServerCommand, getGradleServerEnv, quoteArg } from "./serverUtil";
import { Logger } from "../logger/index";
import { NO_JAVA_EXECUTABLE, OPT_RESTART } from "../constant";
import { redHatJavaInstalled } from "../util/config";
import { NO_JAVA_EXECUTABLE, OPT_RESTART, INSTALL_JDK } from "../constant";
import { extensionInstalled } from "../util/config";
import { BspProxy } from "../bs/BspProxy";
import { getRandomPipeName } from "../util/generateRandomPipeName";
const SERVER_LOGLEVEL_REGEX = /^\[([A-Z]+)\](.*)$/;
Expand Down Expand Up @@ -51,7 +51,7 @@
}
public async start(): Promise<void> {
let startBuildServer = false;
if (redHatJavaInstalled()) {
if (extensionInstalled("redhat.java")) {
const isPrepared = this.bspProxy.prepareToStart();
if (isPrepared) {
startBuildServer = true;
Expand All @@ -65,12 +65,16 @@
const cwd = this.context.asAbsolutePath("lib");
const cmd = path.join(cwd, getGradleServerCommand());
const env = await getGradleServerEnv();
const bundleDirectory = this.context.asAbsolutePath("server");
if (!env) {
sendInfo("", {
kind: "GradleServerEnvMissing",
});
await vscode.window.showErrorMessage(NO_JAVA_EXECUTABLE);
const choice = extensionInstalled("vscjava.vscode-java-pack") ? [INSTALL_JDK] : [];
vscode.window.showErrorMessage(NO_JAVA_EXECUTABLE, ...choice).then((selection) => {
if (selection === INSTALL_JDK) {
vscode.commands.executeCommand("java.installJdk");
}
});
return;
}
const args = [
Expand All @@ -80,6 +84,7 @@
];
if (startBuildServer) {
const buildServerPipeName = this.bspProxy.getBuildServerPipeName();
const bundleDirectory = this.context.asAbsolutePath("server");
args.push(quoteArg(`--pipeName=${buildServerPipeName}`));
args.push(quoteArg(`--bundleDir=${bundleDirectory}`));
}
Expand Down Expand Up @@ -153,7 +158,7 @@

private async killProcess(): Promise<void> {
if (this.process) {
return new Promise((resolve, _reject) => {

Check warning on line 161 in extension/src/server/GradleServer.ts

View workflow job for this annotation

GitHub Actions / Build & Analyse 

'_reject' is defined but never used
if (this.process?.pid) {
kill(this.process.pid, () => resolve);
}
Expand Down
6 changes: 3 additions & 3 deletions extension/src/util/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ export async function findValidJavaHome(): Promise<string | undefined> {
return undefined;
}

export function redHatJavaInstalled(): boolean {
return !!vscode.extensions.getExtension("redhat.java");
export function extensionInstalled(extensionId: string): boolean {
return !!vscode.extensions.getExtension(extensionId);
}

export function getRedHatJavaEmbeddedJRE(): string | undefined {
if (!redHatJavaInstalled()) {
if (!extensionInstalled("redhat.java")) {
return undefined;
}

Expand Down
Loading