fix

sveltejs · Mar 3, 2024 · 2eea457 · 2eea457
1 parent 8b30a8a
commit 2eea457
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/parser/converts/attr.ts b/src/parser/converts/attr.ts
@@ -190,6 +190,9 @@ function convertAttribute(
     });
     return sAttr;
   }
+  // Not required for shorthands. Therefore, register the token here.
+  ctx.addToken("HTMLIdentifier", keyRange);
+
   processAttributeValue(
     node.value as (
       | SvAST.Text
@@ -202,9 +205,6 @@ function convertAttribute(
     ctx,
   );
 
-  // Not required for shorthands. Therefore, register the token here.
-  ctx.addToken("HTMLIdentifier", keyRange);
-
   return attribute;
 }
 

diff --git a/src/parser/converts/root.ts b/src/parser/converts/root.ts
@@ -26,6 +26,7 @@ import {
   getModuleFromRoot,
   getOptionsFromRoot,
 } from "../compat";
+import { sortNodes } from "../sort";
 
 /**
  * Convert root
@@ -260,6 +261,7 @@ function convertGenericsAttribute(script: SvelteScriptElement, ctx: Context) {
   delete (genericsAttribute as any).value;
 
   // Remove value token indexes
+  sortNodes(ctx.tokens);
   const firstTokenIndex = ctx.tokens.findIndex(
     (token) =>
       value.range[0] <= token.range[0] && token.range[1] <= value.range[1],