fix svelte 4 again

sveltejs · Jan 8, 2025 · f7a1cba · f7a1cba
1 parent 4cedfaa
commit f7a1cba
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/packages/language-server/src/plugins/typescript/features/DocumentHighlightProvider.ts b/packages/language-server/src/plugins/typescript/features/DocumentHighlightProvider.ts
@@ -106,6 +106,7 @@ export class DocumentHighlightProviderImpl implements DocumentHighlightProvider
 
     private findCandidateSvelteTag(tsDoc: SvelteDocumentSnapshot, offset: number) {
         let candidate: TemplateNode | undefined;
+        const subBlocks = ['ThenBlock', 'CatchBlock', 'PendingBlock', 'ElseBlock'];
 
         tsDoc.walkSvelteAst({
             enter(node, parent, key) {
@@ -128,7 +129,21 @@ export class DocumentHighlightProviderImpl implements DocumentHighlightProvider
                     return;
                 }
 
-                if (node.type.endsWith('Block') || node.type.endsWith('Tag')) {
+                if (node.type.endsWith('Tag')) {
+                    candidate = templateNode;
+                    return;
+                }
+
+                // don't use sub-blocks so we can highlight the whole block
+                if (node.type.endsWith('Block') && !subBlocks.includes(node.type)) {
+                    if (
+                        // else if
+                        node.type === 'IfBlock' &&
+                        parent.type === 'ElseBlock' &&
+                        parent.start === node.start
+                    ) {
+                        return;
+                    }
                     candidate = templateNode;
                     return;
                 }