-
Notifications
You must be signed in to change notification settings - Fork 81
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.
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
Draft
Attempt3035
wants to merge
1
commit into
microsoft:develop
Choose a base branch
from
Quasiflo:feat/vscode-variables
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+21
−4
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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'); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use import syntax |
||
| 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 { | ||
|
|
@@ -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 { | ||
|
|
@@ -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 { | ||
|
|
@@ -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 { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it a package officially support by microsoft?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't believe so, source: https://github.com/DominicVonk/vscode-variables
I can implement the replacement logic manually if preferred, it's straightforward for simple cases like ${workspaceFolder} but
vscode-variablesdoes a good job at providing full functionality especially supporting multi root to end usersUh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be nice if you can implement "resolve variables" in our repo. I think it only needs to resolve paths, no need to include commands & config stuff. Resolve commands might have some security concern.