volar-service-typescript 0.0.43-patch.1 → 0.0.44

package/lib/configs/getFormatCodeSettings.d.ts

@@ -1,5 +1,5 @@
 import type { FormattingOptions, ServiceContext } from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-export declare function getFormatCodeSettings(ctx: ServiceContext, document: TextDocument, options?: FormattingOptions): Promise<ts.FormatCodeSettings>;
+export declare function getFormatCodeSettings(ctx: ServiceContext, document: TextDocument, options: FormattingOptions | undefined): Promise<ts.FormatCodeSettings>;
 //# sourceMappingURL=getFormatCodeSettings.d.ts.map

package/lib/configs/getUserPreferences.js

@@ -8,6 +8,7 @@ async function getUserPreferences(ctx, document) {
     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?.((0, shared_1.getConfigTitle)(document)) ?? {};
     const preferencesConfig = config?.preferences ?? {};
     const preferences = {
@@ -16,7 +17,7 @@ async function getUserPreferences(ctx, document) {
         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,

package/lib/plugins/semantic.js

@@ -133,6 +133,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
             const getDocumentSemanticTokens = semanticTokens.register(ts, ctx);
             /* typescript-language-features is hardcode true */
             const renameInfoOptions = { allowRenameOfImportPath: true };
+            let formattingOptions;
             return {
                 provide: {
                     'typescript/languageService': () => languageService,
@@ -141,6 +142,14 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                 dispose() {
                     languageService.dispose();
                 },
+                provideDocumentFormattingEdits(_document, _range, options) {
+                    formattingOptions = options;
+                    return undefined;
+                },
+                provideOnTypeFormattingEdits(_document, _position, _key, options) {
+                    formattingOptions = options;
+                    return undefined;
+                },
                 async provideCompletionItems(document, position, completeContext, token) {
                     if (!isSemanticDocument(document)) {
                         return;
@@ -181,7 +190,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         const { fileName, offset } = data;
                         const document = ctx.getTextDocument(data.uri);
                         const [formatOptions, preferences] = await Promise.all([
-                            (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document),
+                            (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, formattingOptions),
                             (0, getUserPreferences_1.getUserPreferences)(ctx, document),
                         ]);
                         const details = (0, shared_1.safeCall)(() => ctx.languageService.getCompletionEntryDetails(fileName, offset, data.originalItem.name, formatOptions, data.originalItem.source, preferences, data.originalItem.data));
@@ -280,7 +289,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         }
                         if (renameInfo.fileToRename) {
                             const [formatOptions, preferences] = await Promise.all([
-                                (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document),
+                                (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, formattingOptions),
                                 (0, getUserPreferences_1.getUserPreferences)(ctx, document),
                             ]);
                             return renameFile(renameInfo.fileToRename, newName, formatOptions, preferences);
@@ -320,12 +329,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         return;
                     }
                     return worker(token, () => {
-                        return getCodeActions(document, range, context);
+                        return getCodeActions(document, range, context, formattingOptions);
                     });
                 },
                 async resolveCodeAction(codeAction, token) {
                     return await worker(token, () => {
-                        return doCodeActionResolve(codeAction);
+                        return doCodeActionResolve(codeAction, formattingOptions);
                     }) ?? codeAction;
                 },
                 provideInlayHints(document, range, token) {
@@ -535,7 +544,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     return worker(token, async () => {
                         const document = ctx.getTextDocument(oldUri);
                         const [formatOptions, preferences] = await Promise.all([
-                            (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document),
+                            (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, formattingOptions),
                             (0, getUserPreferences_1.getUserPreferences)(ctx, document),
                         ]);
                         const fileToRename = ctx.uriToFileName(oldUri);

package/lib/semanticFeatures/codeAction.d.ts

@@ -24,5 +24,5 @@ export interface OrganizeImportsData {
     fileName: string;
 }
 export type Data = FixAllData | RefactorData | OrganizeImportsData;
-export declare function register(ctx: SharedContext): (document: TextDocument, range: vscode.Range, context: vscode.CodeActionContext) => Promise<vscode.CodeAction[]>;
+export declare function register(ctx: SharedContext): (document: TextDocument, range: vscode.Range, context: vscode.CodeActionContext, formattingOptions: vscode.FormattingOptions | undefined) => Promise<vscode.CodeAction[]>;
 //# sourceMappingURL=codeAction.d.ts.map

package/lib/semanticFeatures/codeAction.js

@@ -7,16 +7,32 @@ const shared_1 = require("../shared");
 const fixNames = require("../utils/fixNames");
 const codeActionResolve_1 = require("./codeActionResolve");
 const lspConverters_1 = require("../utils/lspConverters");
+const renameCommandRefactors = new Set([
+    'refactor.rewrite.property.generateAccessors',
+    'refactor.extract.type',
+    'refactor.extract.interface',
+    'refactor.extract.typedef',
+    'refactor.extract.constant',
+    'refactor.extract.function',
+]);
 function register(ctx) {
     let resolveCommandSupport = ctx.env.clientCapabilities?.textDocument?.codeAction?.resolveSupport?.properties?.includes('command');
     let resolveEditSupport = ctx.env.clientCapabilities?.textDocument?.codeAction?.resolveSupport?.properties?.includes('edit');
+    let loged = false;
+    const wranUnsupportResolve = () => {
+        if (loged) {
+            return;
+        }
+        loged = true;
+        console.warn('[volar-service-typescript] The language client lacks support for the command/edit properties in the resolve code action. Therefore, the code action resolve is pre-calculated.');
+    };
     if (!ctx.env.clientCapabilities) {
         resolveCommandSupport = true;
         resolveEditSupport = true;
     }
-    return async (document, range, context) => {
+    return async (document, range, context, formattingOptions) => {
         const [formatOptions, preferences] = await Promise.all([
-            (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document),
+            (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, formattingOptions),
             (0, getUserPreferences_1.getUserPreferences)(ctx, document),
         ]);
         const fileName = ctx.uriToFileName(document.uri);
@@ -63,6 +79,7 @@ function register(ctx) {
                 action.data = data;
             }
             else {
+                wranUnsupportResolve();
                 (0, codeActionResolve_1.resolveOrganizeImportsCodeAction)(ctx, action, data, formatOptions, preferences);
             }
             result.push(action);
@@ -87,6 +104,7 @@ function register(ctx) {
                 action.data = data;
             }
             else {
+                wranUnsupportResolve();
                 (0, codeActionResolve_1.resolveFixAllCodeAction)(ctx, action, data, formatOptions, preferences);
             }
             result.push(action);
@@ -115,6 +133,7 @@ function register(ctx) {
                 action.data = data;
             }
             else {
+                wranUnsupportResolve();
                 (0, codeActionResolve_1.resolveFixAllCodeAction)(ctx, action, data, formatOptions, preferences);
             }
             result.push(action);
@@ -140,6 +159,7 @@ function register(ctx) {
                 action.data = data;
             }
             else {
+                wranUnsupportResolve();
                 (0, codeActionResolve_1.resolveFixAllCodeAction)(ctx, action, data, formatOptions, preferences);
             }
             result.push(action);
@@ -194,6 +214,7 @@ function register(ctx) {
                     fixAll.data = data;
                 }
                 else {
+                    wranUnsupportResolve();
                     (0, codeActionResolve_1.resolveFixAllCodeAction)(ctx, fixAll, data, formatOptions, preferences);
                 }
                 fixAll.diagnostics = diagnostics;
@@ -222,10 +243,15 @@ function register(ctx) {
                     refactorName: refactor.name,
                     actionName: action.name,
                 };
-                if (resolveCommandSupport && resolveEditSupport) {
+                const hasCommand = renameCommandRefactors.has(action.kind);
+                if (hasCommand && resolveCommandSupport && resolveEditSupport) {
+                    codeAction.data = data;
+                }
+                else if (!hasCommand && resolveEditSupport) {
                     codeAction.data = data;
                 }
-                else if (!codeAction.disabled && document) {
+                else if (!codeAction.disabled) {
+                    wranUnsupportResolve();
                     (0, codeActionResolve_1.resolveRefactorCodeAction)(ctx, codeAction, data, document, formatOptions, preferences);
                 }
                 codeActions.push(codeAction);

package/lib/semanticFeatures/codeActionResolve.d.ts

@@ -3,7 +3,7 @@ import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type { SharedContext } from './types';
 import type { Data, FixAllData, RefactorData } from './codeAction';
-export declare function register(ctx: SharedContext): (codeAction: vscode.CodeAction) => Promise<vscode.CodeAction>;
+export declare function register(ctx: SharedContext): (codeAction: vscode.CodeAction, formattingOptions: vscode.FormattingOptions | undefined) => Promise<vscode.CodeAction>;
 export declare function resolveFixAllCodeAction(ctx: SharedContext, codeAction: vscode.CodeAction, data: FixAllData, formatOptions: ts.FormatCodeSettings, preferences: ts.UserPreferences): void;
 export declare function resolveRefactorCodeAction(ctx: SharedContext, codeAction: vscode.CodeAction, data: RefactorData, document: TextDocument, formatOptions: ts.FormatCodeSettings, preferences: ts.UserPreferences): void;
 export declare function resolveOrganizeImportsCodeAction(ctx: SharedContext, codeAction: vscode.CodeAction, data: Data, formatOptions: ts.FormatCodeSettings, preferences: ts.UserPreferences): void;

package/lib/semanticFeatures/codeActionResolve.js

@@ -6,11 +6,11 @@ const getUserPreferences_1 = require("../configs/getUserPreferences");
 const shared_1 = require("../shared");
 const lspConverters_1 = require("../utils/lspConverters");
 function register(ctx) {
-    return async (codeAction) => {
+    return async (codeAction, formattingOptions) => {
         const data = codeAction.data;
         const document = ctx.getTextDocument(data.uri);
         const [formatOptions, preferences] = await Promise.all([
-            (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document),
+            (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, formattingOptions),
             (0, getUserPreferences_1.getUserPreferences)(ctx, document),
         ]);
         if (data?.type === 'fixAll') {

package/lib/utils/lspConverters.js

@@ -509,17 +509,32 @@ function convertFileTextChanges(changes, fileNameToUri, getTextDocument) {
             workspaceEdit.documentChanges = [];
         }
         const uri = fileNameToUri(change.fileName);
-        const doc = getTextDocument(uri);
         if (change.isNewFile) {
             workspaceEdit.documentChanges.push({ kind: 'create', uri });
+            workspaceEdit.documentChanges.push({
+                textDocument: {
+                    uri,
+                    version: null, // fix https://github.com/johnsoncodehk/volar/issues/2025
+                },
+                edits: change.textChanges.map(edit => ({
+                    newText: edit.newText,
+                    range: {
+                        start: { line: 0, character: edit.span.start },
+                        end: { line: 0, character: edit.span.start + edit.span.length },
+                    },
+                })),
+            });
+        }
+        else {
+            const doc = getTextDocument(uri);
+            workspaceEdit.documentChanges.push({
+                textDocument: {
+                    uri,
+                    version: null, // fix https://github.com/johnsoncodehk/volar/issues/2025
+                },
+                edits: change.textChanges.map(edit => convertTextChange(edit, doc)),
+            });
         }
-        workspaceEdit.documentChanges.push({
-            textDocument: {
-                uri,
-                version: null, // fix https://github.com/johnsoncodehk/volar/issues/2025
-            },
-            edits: change.textChanges.map(edit => convertTextChange(edit, doc)),
-        });
     }
     return workspaceEdit;
 }

package/lib/utils/typeConverters.d.ts

@@ -1,5 +1,5 @@
 import type * as ts from 'typescript';
 export declare namespace SymbolKind {
-    function fromProtocolScriptElementKind(kind: ts.ScriptElementKind): 2 | 5 | 10 | 22 | 11 | 6 | 7 | 13 | 12 | 9 | 26 | 15;
+    function fromProtocolScriptElementKind(kind: ts.ScriptElementKind): 2 | 5 | 6 | 7 | 9 | 10 | 11 | 12 | 13 | 15 | 22 | 26;
 }
 //# sourceMappingURL=typeConverters.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.43-patch.1",
+	"version": "0.0.44",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -41,5 +41,6 @@
 		"@volar/language-service": {
 			"optional": true
 		}
-	}
+	},
+	"gitHead": "c4fa09f8f3858532e806d6b2ec9c65eecb66b1a1"
 }