fix(language-plugin-pug): semantic tokens mapping failed

close #4070
vuejs · Mar 20, 2024 · 2a77941 · 2a77941
1 parent 0dfe599
commit 2a77941
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/language-plugin-pug/index.ts b/packages/language-plugin-pug/index.ts
@@ -38,10 +38,11 @@ const plugin: VueLanguagePlugin = ({ modules }) => {
 							get(target, prop) {
 								if (prop === 'offset') {
 									const htmlOffset = target.offset;
+									const nums: number[] = [];
 									for (const mapped of map.getSourceOffsets(htmlOffset)) {
-										return mapped[0];
+										nums.push(mapped[0]);
 									}
-									return -1;
+									return Math.max(-1, ...nums);
 								}
 								const value = target[prop];
 								if (typeof value === 'object') {

diff --git a/packages/typescript-plugin/lib/common.ts b/packages/typescript-plugin/lib/common.ts
@@ -129,13 +129,17 @@ export function getComponentSpans(
 		}
 		if (node.type === 1 satisfies vue.CompilerDOM.NodeTypes.ELEMENT) {
 			if (components.has(node.tag)) {
+				let start = node.loc.start.offset;
+				if (template.lang === 'html') {
+					start += '<'.length;
+				}
 				result.push({
-					start: node.loc.start.offset + node.loc.source.indexOf(node.tag),
+					start,
 					length: node.tag.length,
 				});
 				if (template.lang === 'html' && !node.isSelfClosing) {
 					result.push({
-						start: node.loc.start.offset + node.loc.source.lastIndexOf(node.tag),
+						start: start + node.loc.source.lastIndexOf(node.tag),
 						length: node.tag.length,
 					});
 				}