Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as path from 'path';
import { commands, ConfigurationTarget, env, ExtensionContext, Position, Range, Selection, SnippetString, TextDocument, Uri, window, workspace, WorkspaceConfiguration, WorkspaceFolder } from 'vscode';
import { Commands } from './commands';
import { cleanupLombokCache } from './lombokSupport';
import { ensureExists, getJavaConfiguration } from './utils';
import { ensureExists, getJavaConfiguration, resolvePathVariables } from './utils';
import { apiManager } from './apiManager';
import { isActive, setActive, smartSemicolonDetection } from './smartSemicolonDetection';
import { BuildFileSelector, IMPORT_METHOD, PICKED_BUILD_FILES } from './buildFilesSelector';
Expand Down Expand Up @@ -242,7 +242,7 @@ export async function checkJavaPreferences(context: ExtensionContext): Promise<{
}

return {
javaHome,
javaHome: resolvePathVariables(javaHome),
preference
};
}
Expand Down
9 changes: 9 additions & 0 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,8 @@ export async function getJavaConfig(javaHome: string) {
javaConfig.implementationCodeLens = deprecatedImplementations ? "types" : "none";
}

javaConfig.import.gradle.java.home = resolvePathVariables(javaConfig.import.gradle.java.home);

return javaConfig;
}

Expand Down Expand Up @@ -363,6 +365,13 @@ export function getVSCodeVariablesMap(): any {
return res;
}

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

/**
* Check if the extension version is a pre-release version or running an insider editor.
* @param context The extension context or extension path
Expand Down