fix(typescript): allowTextChangesInNewFiles never true for embedded…

… documents
volarjs · May 10, 2024 · 811707e · 811707e
1 parent 5987cf8
commit 811707e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/typescript/lib/configs/getUserPreferences.ts b/packages/typescript/lib/configs/getUserPreferences.ts
@@ -12,6 +12,7 @@ export async function getUserPreferences(
 	if (ctx.language.typescript) {
 		currentDirectory = ctx.language.typescript.languageServiceHost.getCurrentDirectory();
 	}
+	const documentUri = ctx.decodeEmbeddedDocumentUri(document.uri)?.[0] ?? document.uri;
 	const config = await ctx.env.getConfiguration?.<any>(getConfigTitle(document)) ?? {};
 	const preferencesConfig = config?.preferences ?? {};
 	const preferences: ts.UserPreferences = {
@@ -20,7 +21,7 @@ export async function getUserPreferences(
 		importModuleSpecifierPreference: getImportModuleSpecifierPreference(preferencesConfig),
 		importModuleSpecifierEnding: getImportModuleSpecifierEndingPreference(preferencesConfig),
 		jsxAttributeCompletionStyle: getJsxAttributeCompletionStyle(preferencesConfig),
-		allowTextChangesInNewFiles: document.uri.startsWith('file://'),
+		allowTextChangesInNewFiles: documentUri.startsWith('file://'),
 		providePrefixAndSuffixTextForRename: (preferencesConfig.renameShorthandProperties ?? true) === false ? false : (preferencesConfig.useAliasesForRenames ?? true),
 		allowRenameOfImportPath: true,
 		includeAutomaticOptionalChainCompletions: config.suggest?.includeAutomaticOptionalChainCompletions ?? true,

diff --git a/packages/typescript/lib/semanticFeatures/codeAction.ts b/packages/typescript/lib/semanticFeatures/codeAction.ts
@@ -288,7 +288,7 @@ export function register(ctx: SharedContext) {
 				if (resolveCommandSupport && resolveEditSupport) {
 					codeAction.data = data;
 				}
-				else if (!codeAction.disabled && document) {
+				else if (!codeAction.disabled) {
 					resolveRefactorCodeAction(ctx, codeAction, data, document, formatOptions, preferences);
 				}
 				codeActions.push(codeAction);