Skip to content

Feat: Support for vscode settings expansions like ${workspaceFolder} #1790

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

Open
Attempt3035 wants to merge 1 commit into
base: develop
Choose a base branch
from
+21 −4
Open

Feat: Support for vscode settings expansions like ${workspaceFolder} #1790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion extension/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,7 @@
"dependencies": {
"await-lock": "^2.2.2",
"jdk-utils": "^0.4.4",
"vscode-variables": "^1.0.1",
"fs-extra": "^11.1.0",
"get-port": "^5.1.1",
"lodash": "^4.17.23",
Expand Down
15 changes: 12 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 @@ -6,7 +6,16 @@ import { RootProject } from "../rootProject/RootProject";
import * as fse from "fs-extra";
import * as path from "path";
import { findDefaultRuntimeFromSettings, getMajorVersion, listJdks } from "./jdkUtils";
const vscodeVariables = require('vscode-variables');
type AutoDetect = "on" | "off";

export function resolvePathVariables(pathStr: string | null): string | null {
if (!pathStr) {
return pathStr;
}
return vscodeVariables(pathStr);
}

export const REQUIRED_JDK_VERSION = 17;

export function getConfigIsAutoDetectionEnabled(rootProject: RootProject): boolean {
Expand All @@ -26,7 +35,7 @@ export function getJdtlsConfigJavaHome(): string | null {
}

export function getConfigJavaImportGradleJavaHome(): string | null {
return vscode.workspace.getConfiguration("java").get<string | null>("import.gradle.java.home", null);
return resolvePathVariables(vscode.workspace.getConfiguration("java").get<string | null>("import.gradle.java.home", null));
}

export function getJavaExecutablePathFromJavaHome(javaHome: string): string {
Expand Down Expand Up @@ -105,7 +114,7 @@ export function checkEnvJavaExecutable(): boolean {
}

export function getConfigJavaImportGradleUserHome(): string | null {
return vscode.workspace.getConfiguration("java").get<string | null>("import.gradle.user.home", null);
return resolvePathVariables(vscode.workspace.getConfiguration("java").get<string | null>("import.gradle.user.home", null));
}

export function getConfigJavaImportGradleJvmArguments(): string | null {
Expand All @@ -121,7 +130,7 @@ export function getConfigJavaImportGradleVersion(): string | null {
}

export function getConfigJavaImportGradleHome(): string | null {
return vscode.workspace.getConfiguration("java").get<string | null>("import.gradle.home", null);
return resolvePathVariables(vscode.workspace.getConfiguration("java").get<string | null>("import.gradle.home", null));
}

export function getConfigIsDebugEnabled(): boolean {
Expand Down