@weapp-vite/volar 2.1.10 → 2.1.12

package/dist/index.cjs

@@ -239,6 +239,25 @@ function resolveEmbeddedJsonBlock(fileName, sfc, embeddedCode, tsModule, hasSche
 }
 //#endregion
 //#region src/parseSfc.ts
+function advancePosition(position, source, start = 0, end = source.length) {
+	let lines = 0;
+	let lastNewline = -1;
+	for (let index = start; index < end; index += 1) if (source.charCodeAt(index) === 10) {
+		lines += 1;
+		lastNewline = index;
+	}
+	return {
+		offset: position.offset + end - start,
+		line: position.line + lines,
+		column: lastNewline < 0 ? position.column + end - start : end - lastNewline
+	};
+}
+function applyTextChangeToPosition(position, oldChangeEnd, newChangeEnd, lengthDiff) {
+	const oldLine = position.line;
+	position.offset += lengthDiff;
+	position.line += newChangeEnd.line - oldChangeEnd.line;
+	if (oldLine === oldChangeEnd.line) position.column += newChangeEnd.column - oldChangeEnd.column;
+}
 function parseAttr(property, node) {
 	if (!property.value) return true;
 	const { source, start } = property.value.loc;
@@ -257,9 +276,10 @@ function repairIncompleteTemplate(descriptor, errors) {
 		const endTagOffset = template.content.lastIndexOf("<");
 		const endTagText = template.content.slice(endTagOffset).trimEnd();
 		if ("</template>".startsWith(endTagText)) {
-			template.loc.end.offset = template.loc.start.offset + endTagOffset;
-			template.content = template.content.slice(0, endTagOffset);
-			template.loc.source = template.content;
+			const repairedContent = template.content.slice(0, endTagOffset);
+			template.loc.end = advancePosition(template.loc.start, template.content, 0, endTagOffset);
+			template.content = repairedContent;
+			template.loc.source = repairedContent;
 		}
 	}
 }
@@ -273,11 +293,7 @@ function createBlock(compilerDom, node, source) {
 		content = source.slice(start.offset, end.offset);
 	} else {
 		const offset = node.loc.source.indexOf("</");
-		if (offset > -1) start = {
-			line: start.line,
-			column: start.column + offset,
-			offset: start.offset + offset
-		};
+		if (offset > -1) start = advancePosition(start, node.loc.source, 0, offset);
 		end = { ...start };
 	}
 	const attrs = {};
@@ -374,6 +390,9 @@ function updateSfc(sfc, change) {
 	const oldContent = hitBlock.content;
 	const relativeStart = change.start - hitBlock.loc.start.offset;
 	const relativeEnd = change.end - hitBlock.loc.start.offset;
+	const changeStartPosition = advancePosition(hitBlock.loc.start, oldContent, 0, relativeStart);
+	const oldChangeEndPosition = advancePosition(changeStartPosition, oldContent, relativeStart, relativeEnd);
+	const newChangeEndPosition = advancePosition(changeStartPosition, change.newText);
 	const newContent = oldContent.slice(0, relativeStart) + change.newText + oldContent.slice(relativeEnd);
 	const endTagRE = new RegExp(`</\\s*${hitBlock.type}\\s*>`);
 	if (endTagRE.test(oldContent) !== endTagRE.test(newContent)) return;
@@ -381,8 +400,8 @@ function updateSfc(sfc, change) {
 	hitBlock.loc.source = newContent;
 	const lengthDiff = change.newText.length - (change.end - change.start);
 	for (const block of blocks) {
-		if (block.loc.start.offset > change.end) block.loc.start.offset += lengthDiff;
-		if (block.loc.end.offset >= change.end) block.loc.end.offset += lengthDiff;
+		if (block.loc.start.offset > change.end) applyTextChangeToPosition(block.loc.start, oldChangeEndPosition, newChangeEndPosition, lengthDiff);
+		if (block.loc.end.offset >= change.end) applyTextChangeToPosition(block.loc.end, oldChangeEndPosition, newChangeEndPosition, lengthDiff);
 	}
 	const source = sfc.descriptor.source;
 	sfc.descriptor.source = source.slice(0, change.start) + change.newText + source.slice(change.end);

package/dist/index.mjs

@@ -215,6 +215,25 @@ function resolveEmbeddedJsonBlock(fileName, sfc, embeddedCode, tsModule, hasSche
 }
 //#endregion
 //#region src/parseSfc.ts
+function advancePosition(position, source, start = 0, end = source.length) {
+	let lines = 0;
+	let lastNewline = -1;
+	for (let index = start; index < end; index += 1) if (source.charCodeAt(index) === 10) {
+		lines += 1;
+		lastNewline = index;
+	}
+	return {
+		offset: position.offset + end - start,
+		line: position.line + lines,
+		column: lastNewline < 0 ? position.column + end - start : end - lastNewline
+	};
+}
+function applyTextChangeToPosition(position, oldChangeEnd, newChangeEnd, lengthDiff) {
+	const oldLine = position.line;
+	position.offset += lengthDiff;
+	position.line += newChangeEnd.line - oldChangeEnd.line;
+	if (oldLine === oldChangeEnd.line) position.column += newChangeEnd.column - oldChangeEnd.column;
+}
 function parseAttr(property, node) {
 	if (!property.value) return true;
 	const { source, start } = property.value.loc;
@@ -233,9 +252,10 @@ function repairIncompleteTemplate(descriptor, errors) {
 		const endTagOffset = template.content.lastIndexOf("<");
 		const endTagText = template.content.slice(endTagOffset).trimEnd();
 		if ("</template>".startsWith(endTagText)) {
-			template.loc.end.offset = template.loc.start.offset + endTagOffset;
-			template.content = template.content.slice(0, endTagOffset);
-			template.loc.source = template.content;
+			const repairedContent = template.content.slice(0, endTagOffset);
+			template.loc.end = advancePosition(template.loc.start, template.content, 0, endTagOffset);
+			template.content = repairedContent;
+			template.loc.source = repairedContent;
 		}
 	}
 }
@@ -249,11 +269,7 @@ function createBlock(compilerDom, node, source) {
 		content = source.slice(start.offset, end.offset);
 	} else {
 		const offset = node.loc.source.indexOf("</");
-		if (offset > -1) start = {
-			line: start.line,
-			column: start.column + offset,
-			offset: start.offset + offset
-		};
+		if (offset > -1) start = advancePosition(start, node.loc.source, 0, offset);
 		end = { ...start };
 	}
 	const attrs = {};
@@ -350,6 +366,9 @@ function updateSfc(sfc, change) {
 	const oldContent = hitBlock.content;
 	const relativeStart = change.start - hitBlock.loc.start.offset;
 	const relativeEnd = change.end - hitBlock.loc.start.offset;
+	const changeStartPosition = advancePosition(hitBlock.loc.start, oldContent, 0, relativeStart);
+	const oldChangeEndPosition = advancePosition(changeStartPosition, oldContent, relativeStart, relativeEnd);
+	const newChangeEndPosition = advancePosition(changeStartPosition, change.newText);
 	const newContent = oldContent.slice(0, relativeStart) + change.newText + oldContent.slice(relativeEnd);
 	const endTagRE = new RegExp(`</\\s*${hitBlock.type}\\s*>`);
 	if (endTagRE.test(oldContent) !== endTagRE.test(newContent)) return;
@@ -357,8 +376,8 @@ function updateSfc(sfc, change) {
 	hitBlock.loc.source = newContent;
 	const lengthDiff = change.newText.length - (change.end - change.start);
 	for (const block of blocks) {
-		if (block.loc.start.offset > change.end) block.loc.start.offset += lengthDiff;
-		if (block.loc.end.offset >= change.end) block.loc.end.offset += lengthDiff;
+		if (block.loc.start.offset > change.end) applyTextChangeToPosition(block.loc.start, oldChangeEndPosition, newChangeEndPosition, lengthDiff);
+		if (block.loc.end.offset >= change.end) applyTextChangeToPosition(block.loc.end, oldChangeEndPosition, newChangeEndPosition, lengthDiff);
 	}
 	const source = sfc.descriptor.source;
 	sfc.descriptor.source = source.slice(0, change.start) + change.newText + source.slice(change.end);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-vite/volar",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "description": "Volar plugin for weapp-vite - Provides IntelliSense and type checking for WeChat mini-program config blocks",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -48,7 +48,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@weapp-core/schematics": "6.2.6"
+    "@weapp-core/schematics": "6.2.8"
   },
   "scripts": {
     "benchmark": "node --import tsx benchmark/sfc.ts",