volar-service-typescript 0.0.30 → 0.0.31

package/index.d.ts

@@ -1,5 +1,6 @@
-import type { ServicePlugin } from '@volar/language-service';
+import type { Result, ServiceContext, ServicePlugin } from '@volar/language-service';
 import type * as ts from 'typescript';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 export * from '@volar/typescript';
 export interface Provide {
     'typescript/typescript': () => typeof import('typescript');
@@ -8,5 +9,10 @@ export interface Provide {
     'typescript/syntacticLanguageService': () => ts.LanguageService;
     'typescript/syntacticLanguageServiceHost': () => ts.LanguageServiceHost;
 }
-export declare function create(ts: typeof import('typescript')): ServicePlugin;
+export declare function create(ts: typeof import('typescript'), { isFormattingEnabled, isValidationEnabled, isSuggestionsEnabled, isAutoClosingTagsEnabled, }?: {
+    isFormattingEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
+    isValidationEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
+    isSuggestionsEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
+    isAutoClosingTagsEnabled?(document: TextDocument, context: ServiceContext): Result<boolean>;
+}): ServicePlugin;
 //# sourceMappingURL=index.d.ts.map

package/index.js

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const semver = require("semver");
 const shared_1 = require("./lib/shared");
-const vscode_uri_1 = require("vscode-uri");
 const typescript_1 = require("@volar/typescript");
 const tsFaster = require("typescript-auto-import-cache");
 const _callHierarchy = require("./lib/features/callHierarchy");
@@ -48,7 +47,15 @@ const typeDefinitions = require("./lib/features/typeDefinition");
 const workspaceSymbols = require("./lib/features/workspaceSymbol");
 __exportStar(require("@volar/typescript"), exports);
 ;
-function create(ts) {
+function create(ts, { isFormattingEnabled = async (document, context) => {
+    return await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.format.enable') ?? true;
+}, isValidationEnabled = async (document, context) => {
+    return await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.validate.enable') ?? true;
+}, isSuggestionsEnabled = async (document, context) => {
+    return await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.suggest.enabled') ?? true;
+}, isAutoClosingTagsEnabled = async (document, context) => {
+    return await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.autoClosingTags') ?? true;
+}, } = {}) {
     const basicTriggerCharacters = getBasicTriggerCharacters(ts.version);
     const jsDocTriggerCharacter = '*';
     const directiveCommentTriggerCharacter = '@';
@@ -70,7 +77,7 @@ function create(ts) {
                 getScriptVersion: fileName => fileName === syntacticHostCtx.fileName ? syntacticHostCtx.fileVersion.toString() : '',
                 getScriptSnapshot: fileName => fileName === syntacticHostCtx.fileName ? syntacticHostCtx.snapshot : undefined,
                 getCompilationSettings: () => ({}),
-                getCurrentDirectory: () => '/',
+                getCurrentDirectory: () => '',
                 getDefaultLibFileName: () => '',
                 readFile: () => undefined,
                 fileExists: fileName => fileName === syntacticHostCtx.fileName,
@@ -110,16 +117,14 @@ function create(ts) {
                     'typescript/syntacticLanguageService': () => syntacticCtx.languageService,
                     'typescript/syntacticLanguageServiceHost': () => syntacticCtx.languageServiceHost,
                 },
-                provideAutoInsertionEdit(document, position, lastChange) {
+                async provideAutoInsertionEdit(document, position, lastChange) {
                     if ((document.languageId === 'javascriptreact' || document.languageId === 'typescriptreact')
-                        && lastChange.text.endsWith('>')) {
-                        const config = context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.autoClosingTags') ?? true;
-                        if (config) {
-                            const ctx = prepareSyntacticService(document);
-                            const close = syntacticCtx.languageService.getJsxClosingTagAtPosition(ctx.fileName, document.offsetAt(position));
-                            if (close) {
-                                return '$0' + close.newText;
-                            }
+                        && lastChange.text.endsWith('>')
+                        && await isAutoClosingTagsEnabled(document, context)) {
+                        const ctx = prepareSyntacticService(document);
+                        const close = syntacticCtx.languageService.getJsxClosingTagAtPosition(ctx.fileName, document.offsetAt(position));
+                        if (close) {
+                            return '$0' + close.newText;
                         }
                     }
                 },
@@ -135,52 +140,27 @@ function create(ts) {
                     prepareSyntacticService(document);
                     return findDocumentSymbols(document.uri);
                 },
-                async provideDocumentFormattingEdits(document, range, options_2) {
+                async provideDocumentFormattingEdits(document, range, options, codeOptions) {
                     if (!(0, shared_1.isTsDocument)(document))
                         return;
-                    const enable = await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.format.enable') ?? true;
-                    if (!enable) {
+                    if (!await isFormattingEnabled(document, context))
                         return;
-                    }
                     prepareSyntacticService(document);
-                    return await doFormatting.onRange(document, range, options_2);
+                    return await doFormatting.onRange(document, range, options, codeOptions);
                 },
-                async provideOnTypeFormattingEdits(document, position, key, options_2) {
+                async provideOnTypeFormattingEdits(document, position, key, options, codeOptions) {
                     if (!(0, shared_1.isTsDocument)(document))
                         return;
-                    const enable = await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.format.enable') ?? true;
-                    if (!enable) {
+                    if (!await isFormattingEnabled(document, context))
                         return;
-                    }
                     prepareSyntacticService(document);
-                    return doFormatting.onType(document, options_2, position, key);
-                },
-                provideFormattingIndentSensitiveLines(document) {
-                    if (!(0, shared_1.isTsDocument)(document))
-                        return;
-                    const ctx = prepareSyntacticService(document);
-                    const sourceFile = ts.createSourceFile(ctx.fileName, document.getText(), ts.ScriptTarget.ESNext);
-                    if (sourceFile) {
-                        const lines = [];
-                        sourceFile.forEachChild(function walk(node) {
-                            if (node.kind === ts.SyntaxKind.FirstTemplateToken
-                                || node.kind === ts.SyntaxKind.LastTemplateToken
-                                || node.kind === ts.SyntaxKind.TemplateHead) {
-                                const startLine = document.positionAt(node.getStart(sourceFile)).line;
-                                const endLine = document.positionAt(node.getEnd()).line;
-                                for (let i = startLine + 1; i <= endLine; i++) {
-                                    lines.push(i);
-                                }
-                            }
-                            node.forEachChild(walk);
-                        });
-                        return lines;
-                    }
+                    return doFormatting.onType(document, options, codeOptions, position, key);
                 },
             };
             const syntacticHostCtx = {
                 projectVersion: -1,
                 document: undefined,
+                documentVersion: undefined,
                 fileName: '',
                 fileVersion: 0,
                 snapshot: ts.ScriptSnapshot.fromString(''),
@@ -312,10 +292,8 @@ function create(ts) {
                 async provideCompletionItems(document, position, completeContext, token) {
                     if (!isSemanticDocument(document))
                         return;
-                    const enable = await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.suggest.enabled') ?? true;
-                    if (!enable) {
+                    if (!await isSuggestionsEnabled(document, context))
                         return;
-                    }
                     return await worker(token, async () => {
                         let result = {
                             isIncomplete: false,
@@ -418,10 +396,8 @@ function create(ts) {
                 async provideDiagnostics(document, token) {
                     if (!isSemanticDocument(document))
                         return;
-                    const enable = await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.validate.enable') ?? true;
-                    if (!enable) {
+                    if (!await isValidationEnabled(document, context))
                         return;
-                    }
                     return await worker(token, () => {
                         return doValidation(document.uri, { syntactic: true, suggestion: true });
                     });
@@ -429,10 +405,8 @@ function create(ts) {
                 async provideSemanticDiagnostics(document, token) {
                     if (!isSemanticDocument(document))
                         return;
-                    const enable = await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.validate.enable') ?? true;
-                    if (!enable) {
+                    if (!await isValidationEnabled(document, context))
                         return;
-                    }
                     return worker(token, () => {
                         return doValidation(document.uri, { semantic: true, declaration: true });
                     });
@@ -544,10 +518,14 @@ function create(ts) {
                 return result;
             }
             function prepareSyntacticService(document) {
-                if (syntacticHostCtx.document !== document || syntacticHostCtx.fileVersion !== document.version) {
+                if (syntacticHostCtx.document !== document || syntacticHostCtx.documentVersion !== document.version) {
                     syntacticHostCtx.document = document;
-                    syntacticHostCtx.fileName = vscode_uri_1.URI.parse(document.uri).fsPath.replace(/\\/g, '/');
-                    syntacticHostCtx.fileVersion = document.version;
+                    syntacticHostCtx.fileName = '/tmp.' +
+                        document.languageId === 'javascript' ? 'js' :
+                        document.languageId === 'typescriptreact' ? 'tsx' :
+                            document.languageId === 'javascriptreact' ? 'jsx' :
+                                'ts';
+                    syntacticHostCtx.fileVersion++;
                     syntacticHostCtx.snapshot = ts.ScriptSnapshot.fromString(document.getText());
                     syntacticHostCtx.projectVersion++;
                 }

package/lib/configs/getFormatCodeSettings.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFormatCodeSettings = void 0;
 const shared_1 = require("../shared");
 async function getFormatCodeSettings(ctx, document, options) {
-    let config = await ctx.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.format');
-    config = config ?? {};
+    const config = await ctx.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.format') ?? {};
     return {
         convertTabsToSpaces: options?.insertSpaces,
         tabSize: options?.tabSize,
         indentSize: options?.tabSize,
-        indentStyle: 2 /** ts.IndentStyle.Smart */,
+        indentStyle: 2,
         newLineCharacter: '\n',
         insertSpaceAfterCommaDelimiter: config.insertSpaceAfterCommaDelimiter ?? true,
         insertSpaceAfterConstructor: config.insertSpaceAfterConstructor ?? false,

package/lib/features/formatting.d.ts

@@ -2,7 +2,7 @@ import type * as vscode from '@volar/language-service';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type { SharedContext } from '../types';
 export declare function register(ctx: SharedContext): {
-    onRange: (document: TextDocument, range: vscode.Range | undefined, options: vscode.FormattingOptions) => Promise<vscode.TextEdit[]>;
-    onType: (document: TextDocument, options: vscode.FormattingOptions, position: vscode.Position, key: string) => Promise<vscode.TextEdit[]>;
+    onRange: (document: TextDocument, range: vscode.Range | undefined, options: vscode.FormattingOptions, codeOptions: vscode.EmbeddedCodeFormattingOptions | undefined) => Promise<vscode.TextEdit[]>;
+    onType: (document: TextDocument, options: vscode.FormattingOptions, codeOptions: vscode.EmbeddedCodeFormattingOptions | undefined, position: vscode.Position, key: string) => Promise<vscode.TextEdit[]>;
 };
 //# sourceMappingURL=formatting.d.ts.map

package/lib/features/formatting.js

@@ -5,11 +5,11 @@ const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const shared_1 = require("../shared");
 function register(ctx) {
     return {
-        onRange: async (document, range, options) => {
+        onRange: async (document, range, options, codeOptions) => {
             const fileName = ctx.uriToFileName(document.uri);
             const tsOptions = await (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, options);
-            if (typeof (tsOptions.indentSize) === "boolean" || typeof (tsOptions.indentSize) === "string") {
-                tsOptions.indentSize = undefined;
+            if (codeOptions) {
+                tsOptions.baseIndentSize = codeOptions.initialIndentLevel * options.tabSize;
             }
             const scriptEdits = range
                 ? (0, shared_1.safeCall)(() => ctx.languageService.getFormattingEditsForRange(fileName, document.offsetAt(range.start), document.offsetAt(range.end), tsOptions))
@@ -28,9 +28,12 @@ function register(ctx) {
             }
             return result;
         },
-        onType: async (document, options, position, key) => {
+        onType: async (document, options, codeOptions, position, key) => {
             const fileName = ctx.uriToFileName(document.uri);
             const tsOptions = await (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, options);
+            if (codeOptions) {
+                tsOptions.baseIndentSize = codeOptions.initialIndentLevel * options.tabSize;
+            }
             const scriptEdits = (0, shared_1.safeCall)(() => ctx.languageService.getFormattingEditsAfterKeystroke(fileName, document.offsetAt(position), key, tsOptions));
             if (!scriptEdits)
                 return [];

package/lib/features/semanticTokens.js

@@ -13,13 +13,8 @@ function register(ctx) {
         const length = range ? (document.offsetAt(range.end) - start) : document.getText().length;
         if (ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested())
             return;
-        const response2 = (0, shared_1.safeCall)(() => ctx.languageService.getEncodedSyntacticClassifications(file, { start, length }));
-        if (!response2)
-            return;
-        if (ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested())
-            return;
-        const response1 = (0, shared_1.safeCall)(() => ctx.languageService.getEncodedSemanticClassifications(file, { start, length }, ts.SemanticClassificationFormat.TwentyTwenty));
-        if (!response1)
+        const response = (0, shared_1.safeCall)(() => ctx.languageService.getEncodedSemanticClassifications(file, { start, length }, ts.SemanticClassificationFormat.TwentyTwenty));
+        if (!response)
             return;
         let tokenModifiersTable = [];
         tokenModifiersTable[2 /* TokenModifier.async */] = 1 << legend.tokenModifiers.indexOf('async');
@@ -29,34 +24,26 @@ function register(ctx) {
         tokenModifiersTable[5 /* TokenModifier.local */] = 1 << legend.tokenModifiers.indexOf('local'); // missing in server tokenModifiers
         tokenModifiersTable[4 /* TokenModifier.defaultLibrary */] = 1 << legend.tokenModifiers.indexOf('defaultLibrary');
         tokenModifiersTable = tokenModifiersTable.map(mod => Math.max(mod, 0));
-        const tokenSpan = [...response1.spans, ...response2.spans];
+        const tokenSpan = response.spans;
         const tokens = [];
         let i = 0;
         while (i < tokenSpan.length) {
             const offset = tokenSpan[i++];
             const length = tokenSpan[i++];
             const tsClassification = tokenSpan[i++];
-            let tokenModifiers = 0;
-            let tokenType = getTokenTypeFromClassification(tsClassification);
-            if (tokenType !== undefined) {
-                // it's a classification as returned by the typescript-vscode-sh-plugin
-                tokenModifiers = getTokenModifierFromClassification(tsClassification);
-            }
-            else {
-                // typescript-vscode-sh-plugin is not present
-                tokenType = tokenTypeMap[tsClassification];
-                if (tokenType === undefined) {
-                    continue;
-                }
+            const tokenType = getTokenTypeFromClassification(tsClassification);
+            if (tokenType === undefined) {
+                continue;
             }
+            const tokenModifiers = getTokenModifierFromClassification(tsClassification);
+            // we can use the document's range conversion methods because the result is at the same version as the document
+            const startPos = document.positionAt(offset);
+            const endPos = document.positionAt(offset + length);
             const serverToken = tsTokenTypeToServerTokenType(tokenType);
             if (serverToken === undefined) {
                 continue;
             }
             const serverTokenModifiers = tsTokenModifierToServerTokenModifier(tokenModifiers);
-            // we can use the document's range conversion methods because the result is at the same version as the document
-            const startPos = document.positionAt(offset);
-            const endPos = document.positionAt(offset + length);
             for (let line = startPos.line; line <= endPos.line; line++) {
                 const startCharacter = (line === startPos.line ? startPos.character : 0);
                 const endCharacter = (line === endPos.line ? endPos.character : docLineLength(document, line));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.30",
+	"version": "0.0.31",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -33,17 +33,16 @@
 		"semver": "^7.5.4",
 		"typescript-auto-import-cache": "^0.3.1",
 		"vscode-languageserver-textdocument": "^1.0.11",
-		"vscode-nls": "^5.2.0",
-		"vscode-uri": "^3.0.8"
+		"vscode-nls": "^5.2.0"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.0.1",
-		"@volar/typescript": "~2.0.1"
+		"@volar/language-service": "~2.1.0",
+		"@volar/typescript": "~2.1.0"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "30c3cc3c76e90f75f14fe0c2fa4fd33b7ff06507"
+	"gitHead": "f7005aef724767786ee9fe943fa976231cc79bf1"
 }