fix: generic attr unexpectedly trimmed by formatting when includes "<"

#3101
vuejs · May 1, 2023 · 8b34cd0 · rchl · May 1, 2023 · 8b34cd0
1 parent 659331c
commit 8b34cd0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/vue-language-core/src/sourceFile.ts b/packages/vue-language-core/src/sourceFile.ts
@@ -468,7 +468,7 @@ export class VueFile implements VirtualFile {
 
 		const newData: Sfc['template'] | null = block ? {
 			name: 'template',
-			start: this.snapshot.getText(0, block.loc.start.offset).lastIndexOf('<'),
+			start: this.snapshot.getText(0, block.loc.start.offset).lastIndexOf('<template'),
 			end: block.loc.end.offset + this.snapshot.getText(block.loc.end.offset, this.snapshot.getLength()).indexOf('>') + 1,
 			startTagEnd: block.loc.start.offset,
 			endTagStart: block.loc.end.offset,
@@ -488,7 +488,7 @@ export class VueFile implements VirtualFile {
 
 		const newData: Sfc['script'] | null = block ? {
 			name: 'script',
-			start: this.snapshot.getText(0, block.loc.start.offset).lastIndexOf('<'),
+			start: this.snapshot.getText(0, block.loc.start.offset).lastIndexOf('<script'),
 			end: block.loc.end.offset + this.snapshot.getText(block.loc.end.offset, this.snapshot.getLength()).indexOf('>') + 1,
 			startTagEnd: block.loc.start.offset,
 			endTagStart: block.loc.end.offset,
@@ -510,7 +510,7 @@ export class VueFile implements VirtualFile {
 
 		const newData: Sfc['scriptSetup'] | null = block ? {
 			name: 'scriptSetup',
-			start: this.snapshot.getText(0, block.loc.start.offset).lastIndexOf('<'),
+			start: this.snapshot.getText(0, block.loc.start.offset).lastIndexOf('<script'),
 			end: block.loc.end.offset + this.snapshot.getText(block.loc.end.offset, this.snapshot.getLength()).indexOf('>') + 1,
 			startTagEnd: block.loc.start.offset,
 			endTagStart: block.loc.end.offset,
@@ -534,7 +534,7 @@ export class VueFile implements VirtualFile {
 			const block = blocks[i];
 			const newData: Sfc['styles'][number] = {
 				name: 'style_' + i,
-				start: this.snapshot.getText(0, block.loc.start.offset).lastIndexOf('<'),
+				start: this.snapshot.getText(0, block.loc.start.offset).lastIndexOf('<style'),
 				end: block.loc.end.offset + this.snapshot.getText(block.loc.end.offset, this.snapshot.getLength()).indexOf('>') + 1,
 				startTagEnd: block.loc.start.offset,
 				endTagStart: block.loc.end.offset,

diff --git a/packages/vue-test-workspace/format/#3101/input.vue b/packages/vue-test-workspace/format/#3101/input.vue
@@ -0,0 +1 @@
+<script lang="ts" setup generic="T extends Record<string, string>"></script>
diff --git a/packages/vue-test-workspace/format/#3101/output.vue b/packages/vue-test-workspace/format/#3101/output.vue
@@ -0,0 +1 @@
+<script lang="ts" setup generic="T extends Record<string, string>"></script>