@vue/language-service 1.7.8 → 1.7.9

package/out/languageService.js

@@ -37,12 +37,13 @@ function resolvePlugins(services, vueCompilerOptions, settings) {
         if (!_context || !modules?.typescript)
             return base;
         const ts = modules.typescript;
-        const autoImportPositions = new WeakSet();
+        const transformedItem = new WeakSet();
         return {
             ...base,
-            resolveEmbeddedRange(range) {
-                if (autoImportPositions.has(range.start) && autoImportPositions.has(range.end))
-                    return range;
+            transformCompletionItem(item) {
+                if (transformedItem.has(item)) {
+                    return item;
+                }
             },
             async provideCompletionItems(document, position, context, item) {
                 const result = await base.provideCompletionItems?.(document, position, context, item);
@@ -86,7 +87,6 @@ function resolvePlugins(services, vueCompilerOptions, settings) {
                 for (const ext of vueCompilerOptions.extensions) {
                     const suffix = (0, shared_1.capitalize)(ext.substring('.'.length)); // .vue -> Vue
                     if (itemData?.uri
-                        && _context.typescript
                         && item.textEdit?.newText.endsWith(suffix)
                         && item.additionalTextEdits?.length === 1 && item.additionalTextEdits[0].newText.indexOf('import ' + item.textEdit.newText + ' from ') >= 0
                         && (await _context.env.getConfiguration?.('vue.complete.normalizeComponentImportName') ?? true)) {
@@ -119,6 +119,7 @@ function resolvePlugins(services, vueCompilerOptions, settings) {
                 }
                 const data = item.data;
                 if (item.data?.__isComponentAutoImport && data && item.additionalTextEdits?.length && item.textEdit) {
+                    let transformed = false;
                     for (const [_, map] of _context.documents.getMapsByVirtualFileUri(data.uri)) {
                         const virtualFile = _context.documents.getSourceByUri(map.sourceFileDocument.uri)?.root;
                         if (virtualFile instanceof vue.VueFile) {
@@ -144,8 +145,7 @@ function resolvePlugins(services, vueCompilerOptions, settings) {
                                             start: textDoc.positionAt(sfc.script.startTagEnd + exportDefault.componentsOption.start),
                                             end: textDoc.positionAt(sfc.script.startTagEnd + exportDefault.componentsOption.end),
                                         };
-                                        autoImportPositions.add(editRange.start);
-                                        autoImportPositions.add(editRange.end);
+                                        transformed = true;
                                         item.additionalTextEdits.push({
                                             range: editRange,
                                             newText: unescape(printText.replace(/\\u/g, '%u')),
@@ -164,8 +164,7 @@ function resolvePlugins(services, vueCompilerOptions, settings) {
                                             start: textDoc.positionAt(sfc.script.startTagEnd + exportDefault.args.start),
                                             end: textDoc.positionAt(sfc.script.startTagEnd + exportDefault.args.end),
                                         };
-                                        autoImportPositions.add(editRange.start);
-                                        autoImportPositions.add(editRange.end);
+                                        transformed = true;
                                         item.additionalTextEdits.push({
                                             range: editRange,
                                             newText: unescape(printText.replace(/\\u/g, '%u')),
@@ -175,6 +174,9 @@ function resolvePlugins(services, vueCompilerOptions, settings) {
                             }
                         }
                     }
+                    if (transformed) {
+                        transformedItem.add(item);
+                    }
                 }
                 return item;
             },

package/out/plugins/data.js

@@ -16,9 +16,6 @@ function loadTemplateData(lang) {
     else if (lang === 'zh-cn') {
         data = require('../../data/template/zh-cn.json');
     }
-    else if (lang === 'zh-tw') {
-        data = require('../../data/template/zh-tw.json');
-    }
     else {
         data = require('../../data/template/en.json');
     }
@@ -54,9 +51,6 @@ function loadLanguageBlocks(lang) {
     else if (lang === 'zh-cn') {
         data = require('../../data/language-blocks/zh-cn.json');
     }
-    else if (lang === 'zh-tw') {
-        data = require('../../data/language-blocks/zh-tw.json');
-    }
     else {
         data = require('../../data/language-blocks/en.json');
     }
@@ -78,9 +72,6 @@ function loadModelModifiersData(lang) {
     else if (lang === 'zh-cn') {
         data = require('../../data/model-modifiers/zh-cn.json');
     }
-    else if (lang === 'zh-tw') {
-        data = require('../../data/model-modifiers/zh-tw.json');
-    }
     else {
         data = require('../../data/model-modifiers/en.json');
     }

package/out/plugins/vue-autoinsert-dotvalue.js

@@ -5,10 +5,7 @@ const shared_1 = require("@vue/shared");
 const plugin = (context, modules) => {
     if (!modules?.typescript)
         return {};
-    if (!context?.typescript)
-        return {};
     const ts = modules.typescript;
-    const _ts = context.typescript;
     return {
         async provideAutoInsertionEdit(document, position, insertContext) {
             if (!isTsDocument(document))
@@ -18,7 +15,7 @@ const plugin = (context, modules) => {
             const enabled = await context.env.getConfiguration?.('vue.autoInsert.dotValue') ?? true;
             if (!enabled)
                 return;
-            const program = _ts.languageService.getProgram();
+            const program = context.inject('typescript/languageService').getProgram();
             if (!program)
                 return;
             const sourceFile = program.getSourceFile(context.env.uriToFileName(document.uri));
@@ -29,9 +26,9 @@ const plugin = (context, modules) => {
             const node = findPositionIdentifier(sourceFile, sourceFile, document.offsetAt(position));
             if (!node)
                 return;
-            const token = _ts.languageServiceHost.getCancellationToken?.();
+            const token = context.inject('typescript/languageServiceHost').getCancellationToken?.();
             if (token) {
-                _ts.languageService.getQuickInfoAtPosition(context.env.uriToFileName(document.uri), node.end);
+                context.inject('typescript/languageService').getQuickInfoAtPosition(context.env.uriToFileName(document.uri), node.end);
                 if (token?.isCancellationRequested()) {
                     return; // check cancel here because type checker do not use cancel token
                 }

package/out/plugins/vue-template.js

@@ -15,7 +15,7 @@ exports.default = (options) => (_context, modules) => {
         ...htmlOrPugService.triggerCharacters ?? [],
         '@', // vue event shorthand
     ];
-    if (!_context?.typescript || !modules?.typescript)
+    if (!_context || !modules?.typescript)
         return { triggerCharacters };
     builtInData ??= (0, data_1.loadTemplateData)(_context.env.locale ?? 'en');
     modelData ??= (0, data_1.loadModelModifiersData)(_context.env.locale ?? 'en');
@@ -48,7 +48,6 @@ exports.default = (options) => (_context, modules) => {
         }
     }
     const ts = modules.typescript;
-    const _ts = _context.typescript;
     return {
         ...htmlOrPugService,
         triggerCharacters,
@@ -78,6 +77,8 @@ exports.default = (options) => (_context, modules) => {
             const enabled = await _context.env.getConfiguration?.('vue.inlayHints.missingProps') ?? false;
             if (!enabled)
                 return;
+            const languageService = _context.inject('typescript/languageService');
+            const languageServiceHost = _context.inject('typescript/languageServiceHost');
             const result = [];
             for (const [_, map] of _context.documents.getMapsByVirtualFileUri(document.uri)) {
                 const virtualFile = _context.documents.getSourceByUri(map.sourceFileDocument.uri)?.root;
@@ -85,8 +86,8 @@ exports.default = (options) => (_context, modules) => {
                 if (virtualFile && virtualFile instanceof vue.VueFile && scanner) {
                     // visualize missing required props
                     const casing = await (0, nameCasing_1.getNameCasing)(ts, _context, map.sourceFileDocument.uri);
-                    const nativeTags = (0, helpers_1.checkNativeTags)(ts, _ts.languageService, _ts.languageServiceHost);
-                    const components = (0, helpers_1.checkComponentNames)(ts, _ts.languageService, virtualFile, nativeTags);
+                    const nativeTags = (0, helpers_1.checkNativeTags)(ts, languageService, languageServiceHost);
+                    const components = (0, helpers_1.checkComponentNames)(ts, languageService, virtualFile, nativeTags);
                     const componentProps = {};
                     let token;
                     let current;
@@ -98,7 +99,7 @@ exports.default = (options) => (_context, modules) => {
                                 : components.find(component => component === tagName || (0, shared_1.hyphenate)(component) === tagName);
                             const checkTag = tagName.indexOf('.') >= 0 ? tagName : component;
                             if (checkTag) {
-                                componentProps[checkTag] ??= (0, helpers_1.checkPropsOfTag)(ts, _ts.languageService, virtualFile, checkTag, nativeTags, true);
+                                componentProps[checkTag] ??= (0, helpers_1.checkPropsOfTag)(ts, languageService, virtualFile, checkTag, nativeTags, true);
                                 current = {
                                     unburnedRequiredProps: [...componentProps[checkTag]],
                                     labelOffset: scanner.getTokenOffset() + scanner.getTokenLength(),
@@ -225,12 +226,14 @@ exports.default = (options) => (_context, modules) => {
             const scanner = options.getScanner(htmlOrPugService, document);
             if (!scanner)
                 return;
+            const languageService = _context.inject('typescript/languageService');
+            const languageServiceHost = _context.inject('typescript/languageServiceHost');
             for (const [_, map] of _context.documents.getMapsByVirtualFileUri(document.uri)) {
                 const virtualFile = _context.documents.getSourceByUri(map.sourceFileDocument.uri)?.root;
                 if (!virtualFile || !(virtualFile instanceof vue.VueFile))
                     continue;
-                const nativeTags = (0, helpers_1.checkNativeTags)(ts, _ts.languageService, _ts.languageServiceHost);
-                const templateScriptData = (0, helpers_1.checkComponentNames)(ts, _ts.languageService, virtualFile, nativeTags);
+                const nativeTags = (0, helpers_1.checkNativeTags)(ts, languageService, languageServiceHost);
+                const templateScriptData = (0, helpers_1.checkComponentNames)(ts, languageService, virtualFile, nativeTags);
                 const components = new Set([
                     ...templateScriptData,
                     ...templateScriptData.map(shared_1.hyphenate),
@@ -266,6 +269,8 @@ exports.default = (options) => (_context, modules) => {
         },
     };
     async function provideHtmlData(map, vueSourceFile) {
+        const languageService = _context.inject('typescript/languageService');
+        const languageServiceHost = _context.inject('typescript/languageServiceHost');
         const casing = await (0, nameCasing_1.getNameCasing)(ts, _context, map.sourceFileDocument.uri);
         if (builtInData.tags) {
             for (const tag of builtInData.tags) {
@@ -283,14 +288,14 @@ exports.default = (options) => (_context, modules) => {
                 }
             }
         }
-        const nativeTags = (0, helpers_1.checkNativeTags)(ts, _ts.languageService, _ts.languageServiceHost);
+        const nativeTags = (0, helpers_1.checkNativeTags)(ts, languageService, languageServiceHost);
         options.updateCustomData(htmlOrPugService, [
             html.newHTMLDataProvider('vue-template-built-in', builtInData),
             {
                 getId: () => 'vue-template',
                 isApplicable: () => true,
                 provideTags: () => {
-                    const components = (0, helpers_1.checkComponentNames)(ts, _ts.languageService, vueSourceFile, nativeTags)
+                    const components = (0, helpers_1.checkComponentNames)(ts, languageService, vueSourceFile, nativeTags)
                         .filter(name => name !== 'Transition'
                         && name !== 'TransitionGroup'
                         && name !== 'KeepAlive'
@@ -325,9 +330,9 @@ exports.default = (options) => (_context, modules) => {
                     return tags;
                 },
                 provideAttributes: (tag) => {
-                    const attrs = (0, helpers_1.getElementAttrs)(ts, _ts.languageService, _ts.languageServiceHost, tag);
-                    const props = new Set((0, helpers_1.checkPropsOfTag)(ts, _ts.languageService, vueSourceFile, tag, nativeTags));
-                    const events = (0, helpers_1.checkEventsOfTag)(ts, _ts.languageService, vueSourceFile, tag, nativeTags);
+                    const attrs = (0, helpers_1.getElementAttrs)(ts, languageService, languageServiceHost, tag);
+                    const props = new Set((0, helpers_1.checkPropsOfTag)(ts, languageService, vueSourceFile, tag, nativeTags));
+                    const events = (0, helpers_1.checkEventsOfTag)(ts, languageService, vueSourceFile, tag, nativeTags);
                     const attributes = [];
                     for (const prop of [...props, ...attrs]) {
                         const isGlobal = !props.has(prop);
@@ -405,9 +410,11 @@ exports.default = (options) => (_context, modules) => {
         ]);
     }
     function afterHtmlCompletion(completionList, map, vueSourceFile) {
+        const languageService = _context.inject('typescript/languageService');
+        const languageServiceHost = _context.inject('typescript/languageServiceHost');
         const replacement = getReplacement(completionList, map.sourceFileDocument);
-        const nativeTags = (0, helpers_1.checkNativeTags)(ts, _ts.languageService, _ts.languageServiceHost);
-        const componentNames = new Set((0, helpers_1.checkComponentNames)(ts, _ts.languageService, vueSourceFile, nativeTags).map(shared_1.hyphenate));
+        const nativeTags = (0, helpers_1.checkNativeTags)(ts, languageService, languageServiceHost);
+        const componentNames = new Set((0, helpers_1.checkComponentNames)(ts, languageService, vueSourceFile, nativeTags).map(shared_1.hyphenate));
         if (replacement) {
             const isEvent = replacement.text.startsWith('v-on:') || replacement.text.startsWith('@');
             const isProp = replacement.text.startsWith('v-bind:') || replacement.text.startsWith(':');

package/out/plugins/vue-twoslash-queries.js

@@ -3,17 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const language_service_1 = require("@volar/language-service");
 const vue = require("@vue/language-core");
 const plugin = (context, modules) => {
-    if (!modules?.typescript)
-        return {};
-    if (!context?.typescript)
+    if (!context || !modules?.typescript)
         return {};
     const ts = modules.typescript;
-    const _ts = context.typescript;
     return {
         provideInlayHints(document, range) {
             return worker(document.uri, (vueFile) => {
                 const hoverOffsets = [];
                 const inlayHints = [];
+                const languageService = context.inject('typescript/languageService');
                 for (const pointer of document.getText(range).matchAll(/<!--\s*\^\?\s*-->/g)) {
                     const offset = pointer.index + pointer[0].indexOf('^?') + document.offsetAt(range.start);
                     const position = document.positionAt(offset);
@@ -28,7 +26,7 @@ const plugin = (context, modules) => {
                             for (const [pointerPosition, hoverOffset] of hoverOffsets) {
                                 for (const [tsOffset, mapping] of map.map.toGeneratedOffsets(hoverOffset)) {
                                     if (mapping.data.hover) {
-                                        const quickInfo = _ts.languageService.getQuickInfoAtPosition(embedded.fileName, tsOffset);
+                                        const quickInfo = languageService.getQuickInfoAtPosition(embedded.fileName, tsOffset);
                                         if (quickInfo) {
                                             inlayHints.push({
                                                 position: { line: pointerPosition.line, character: pointerPosition.character + 2 },

package/out/plugins/vue.js

@@ -7,11 +7,10 @@ const data_1 = require("./data");
 let sfcDataProvider;
 exports.default = () => (context, modules) => {
     const htmlPlugin = (0, volar_service_html_1.default)({ validLang: 'vue', disableCustomData: true })(context, modules);
-    if (!context?.typescript)
+    if (!context)
         return htmlPlugin;
     sfcDataProvider ??= html.newHTMLDataProvider('vue', (0, data_1.loadLanguageBlocks)(context.env.locale ?? 'en'));
     htmlPlugin.provide['html/languageService']().setDataProviders(false, [sfcDataProvider]);
-    const _ts = context.typescript;
     return {
         ...htmlPlugin,
         provide: {
@@ -25,7 +24,7 @@ exports.default = () => (context, modules) => {
             return worker(document, (vueSourceFile) => {
                 const result = [];
                 const sfc = vueSourceFile.sfc;
-                const program = _ts.languageService.getProgram();
+                const program = context.inject('typescript/languageService').getProgram();
                 if (program && !program.getSourceFile(vueSourceFile.mainScriptName)) {
                     for (const script of [sfc.script, sfc.scriptSetup]) {
                         if (!script || script.content === '')

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-service",
-	"version": "1.7.8",
+	"version": "1.7.9",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -17,27 +17,28 @@
 		"update-html-data": "node ./scripts/update-html-data.js"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.6.9",
-		"@volar/language-service": "1.6.9",
+		"@volar/language-core": "1.7.3",
+		"@volar/language-service": "1.7.3",
+		"@volar/typescript": "1.7.3",
 		"@vue/compiler-dom": "^3.3.0",
-		"@vue/language-core": "1.7.8",
+		"@vue/language-core": "1.7.9",
 		"@vue/reactivity": "^3.3.0",
 		"@vue/shared": "^3.3.0",
-		"volar-service-css": "0.0.4",
-		"volar-service-emmet": "0.0.4",
-		"volar-service-html": "0.0.4",
-		"volar-service-json": "0.0.4",
-		"volar-service-pug": "0.0.4",
-		"volar-service-pug-beautify": "0.0.4",
-		"volar-service-typescript": "0.0.4",
-		"volar-service-typescript-twoslash-queries": "0.0.4",
+		"volar-service-css": "0.0.7",
+		"volar-service-emmet": "0.0.7",
+		"volar-service-html": "0.0.7",
+		"volar-service-json": "0.0.7",
+		"volar-service-pug": "0.0.7",
+		"volar-service-pug-beautify": "0.0.7",
+		"volar-service-typescript": "0.0.7",
+		"volar-service-typescript-twoslash-queries": "0.0.7",
 		"vscode-html-languageservice": "^5.0.4",
 		"vscode-languageserver-textdocument": "^1.0.8"
 	},
 	"devDependencies": {
-		"@volar/kit": "1.6.9",
+		"@volar/kit": "1.7.3",
 		"vscode-languageserver-protocol": "^3.17.3",
 		"vscode-uri": "^3.0.7"
 	},
-	"gitHead": "9841dc5c7b19c2b1d24fcc95a808f29af39710b8"
+	"gitHead": "70f9ebedbc55a8d342ec425cc483dfe39c4b7489"
 }