Skip to content

fix(vscode-extension): inspect tsdk configurations correctly #69172

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

Merged
atscott merged 1 commit into from
Jun 5, 2026
+10 −9
Merged

fix(vscode-extension): inspect tsdk configurations correctly #69172

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
19 changes: 10 additions & 9 deletions vscode-ng-language-service/client/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,19 +630,20 @@ export class AngularLanguageClient implements vscode.Disposable {

private async getTsdkPath(): Promise<string> {
const config = vscode.workspace.getConfiguration();
const tsdkInspect =
config.inspect<string>('js/ts.tsdk.path') ?? config.inspect<string>('typescript.tsdk');

if (!tsdkInspect) {
return '';
}
const jsTsTsdkInspect = config.inspect<string>('js/ts.tsdk.path');
const tsTsdkInspect = config.inspect<string>('typescript.tsdk');

// 1. Check workspace/folder settings first (highest priority)
// ONLY check or load workspace-level settings if the workspace is trusted
if (vscode.workspace.isTrusted) {
const workspaceTsdk = (
tsdkInspect.workspaceValue ?? tsdkInspect.workspaceFolderValue
const jsTsWorkspaceTsdk = (
jsTsTsdkInspect?.workspaceValue ?? jsTsTsdkInspect?.workspaceFolderValue
)?.trim();
const tsWorkspaceTsdk = (
tsTsdkInspect?.workspaceValue ?? tsTsdkInspect?.workspaceFolderValue
)?.trim();
const workspaceTsdk = jsTsWorkspaceTsdk || tsWorkspaceTsdk;

if (workspaceTsdk) {
const stateKey = `approvedTsdk:${workspaceTsdk}`;
const isApproved = this.context.workspaceState.get<boolean>(stateKey);
Expand All @@ -660,7 +661,7 @@ export class AngularLanguageClient implements vscode.Disposable {
}
}

return tsdkInspect.globalValue?.trim() ?? '';
return jsTsTsdkInspect?.globalValue?.trim() ?? tsTsdkInspect?.globalValue?.trim() ?? '';
}

private async promptForTsdkApproval(workspaceTsdk: string, stateKey: string): Promise<void> {
Expand Down
Loading