fix: use correct semantic tokens for $props types (#2379)

#2374
sveltejs · May 21, 2024 · cf00f03 · cf00f03
1 parent 7409890
commit cf00f03
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
@@ -189,7 +189,11 @@ export class ExportedNames {
                     generic_arg.end + this.astOffset,
                     node.parent.pos + this.astOffset
                 );
-                this.str.appendRight(generic_arg.end + this.astOffset, this.$props.type);
+                this.str.appendRight(
+                    generic_arg.end + this.astOffset,
+                    // so that semantic tokens ignore it, preventing an overlap of tokens
+                    surroundWithIgnoreComments(this.$props.type)
+                );
             }
         } else {
             if (!this.isTsFile) {

diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-generics/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-generics/expectedv2.ts
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 ;function render<T>() {
 ;type $$ComponentProps =  { a: T, b: string };
-    let { a, b }:$$ComponentProps = $props();
+    let { a, b }:/*Ωignore_startΩ*/$$ComponentProps/*Ωignore_endΩ*/ = $props();
     let x = $state<T>(0);
     let y = $derived(x * 2);
 ;

diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes/expectedv2.ts
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 ;function render() {
 ;type $$ComponentProps =  { a: number, b: string };
-    let { a, b }:$$ComponentProps = $props();
+    let { a, b }:/*Ωignore_startΩ*/$$ComponentProps/*Ωignore_endΩ*/ = $props();
     let x = $state(0);
     let y = $derived(x * 2);
 ;

diff --git a/...te2tsx/test/svelte2tsx/samples/ts-sveltekit-autotypes-$props-rune-unchanged/expectedv2.ts b/...te2tsx/test/svelte2tsx/samples/ts-sveltekit-autotypes-$props-rune-unchanged/expectedv2.ts
@@ -2,7 +2,7 @@
 ;function render() {
 
      const snapshot: any = {};;type $$ComponentProps =  {form: boolean, data: true };
-    let { form, data }:$$ComponentProps = $props();
+    let { form, data }:/*Ωignore_startΩ*/$$ComponentProps/*Ωignore_endΩ*/ = $props();
 ;
 async () => {};
 return { props: {} as any as $$ComponentProps, exports: {} as any as { snapshot: any }, slots: {}, events: {} }}