move the svelte highlight to ts using ast returned by svelte2tsx

sveltejs · Jan 17, 2024 · fc193fd · fc193fd
1 parent 0ec1b8e
commit fc193fd
Show file tree

Hide file tree

Showing 9 changed files with 424 additions and 408 deletions.
diff --git a/packages/language-server/src/lib/documents/utils.ts b/packages/language-server/src/lib/documents/utils.ts
@@ -3,6 +3,7 @@ import { Position, Range } from 'vscode-languageserver';
 import { Node, HTMLDocument } from 'vscode-html-languageservice';
 import * as path from 'path';
 import { parseHtml } from './parseHtml';
+import { Document } from './Document';
 
 export interface TagInformation {
     content: string;
@@ -442,3 +443,11 @@ export function isInsideMoustacheTag(html: string, tagStart: number | null, posi
         return charactersInNode.lastIndexOf('{') > charactersInNode.lastIndexOf('}');
     }
 }
+
+export function inStyleOrScript(document: Document, position: Position) {
+    return (
+        isInTag(position, document.styleInfo) ||
+        isInTag(position, document.scriptInfo) ||
+        isInTag(position, document.moduleScriptInfo)
+    );
+}
diff --git a/packages/language-server/src/ls-config.ts b/packages/language-server/src/ls-config.ts
@@ -21,7 +21,7 @@ const defaultLSConfig: LSConfig = {
         codeActions: { enable: true },
         selectionRange: { enable: true },
         signatureHelp: { enable: true },
-        semanticTokens: { enable: true },
+        semanticTokens: { enable: true }
     },
     css: {
         enable: true,
@@ -32,15 +32,15 @@ const defaultLSConfig: LSConfig = {
         documentColors: { enable: true },
         colorPresentations: { enable: true },
         documentSymbols: { enable: true },
-        selectionRange: { enable: true },
+        selectionRange: { enable: true }
     },
     html: {
         enable: true,
         hover: { enable: true },
         completions: { enable: true, emmet: true },
         tagComplete: { enable: true },
         documentSymbols: { enable: true },
-        linkedEditing: { enable: true },
+        linkedEditing: { enable: true }
     },
     svelte: {
         enable: true,

diff --git a/packages/language-server/src/plugins/css/CSSPlugin.ts b/packages/language-server/src/plugins/css/CSSPlugin.ts
@@ -439,10 +439,6 @@ export class CSSPlugin
     }
 
     findDocumentHighlight(document: Document, position: Position): DocumentHighlight[] | null {
-        if (!document.styleInfo) {
-            return [];
-        }
-
         const cssDocument = this.getCSSDoc(document);
         if (cssDocument.isInGenerated(position)) {
             return this.findDocumentHighlightInternal(cssDocument, position);

diff --git a/packages/language-server/src/plugins/html/HTMLPlugin.ts b/packages/language-server/src/plugins/html/HTMLPlugin.ts
@@ -412,6 +412,10 @@ export class HTMLPlugin
             return null;
         }
 
+        const node = html.findNodeAt(document.offsetAt(position));
+        if (possiblyComponent(node)) {
+            return null;
+        }
         const result = this.lang.findDocumentHighlights(document, position, html);
 
         if (!result.length) {

diff --git a/packages/language-server/src/plugins/svelte/SveltePlugin.ts b/packages/language-server/src/plugins/svelte/SveltePlugin.ts
@@ -6,7 +6,6 @@ import {
     CompletionContext,
     CompletionList,
     Diagnostic,
-    DocumentHighlight,
     FormattingOptions,
     Hover,
     Position,
@@ -25,7 +24,6 @@ import {
     CodeActionsProvider,
     CompletionsProvider,
     DiagnosticsProvider,
-    DocumentHighlightProvider,
     FormattingProvider,
     HoverProvider,
     SelectionRangeProvider
@@ -36,7 +34,6 @@ import { getDiagnostics } from './features/getDiagnostics';
 import { getHoverInfo } from './features/getHoverInfo';
 import { getSelectionRange } from './features/getSelectionRanges';
 import { SvelteCompileResult, SvelteDocument } from './SvelteDocument';
-import { getDocumentHighlight } from './features/getDocumentHighlight';
 
 export class SveltePlugin
     implements
@@ -45,8 +42,7 @@ export class SveltePlugin
         CompletionsProvider,
         HoverProvider,
         CodeActionsProvider,
-        SelectionRangeProvider,
-        DocumentHighlightProvider
+        SelectionRangeProvider
 {
     __name = 'svelte';
     private docManager = new Map<Document, SvelteDocument>();
@@ -317,15 +313,6 @@ export class SveltePlugin
         return getSelectionRange(svelteDoc, position);
     }
 
-    async findDocumentHighlight(
-        document: Document,
-        position: Position
-    ): Promise<DocumentHighlight[] | null> {
-        const svelteDoc = await this.getSvelteDoc(document);
-
-        return getDocumentHighlight(svelteDoc, position);
-    }
-
     private featureEnabled(feature: keyof LSSvelteConfig) {
         return (
             this.configManager.enabled('svelte.enable') &&

diff --git a/packages/language-server/src/plugins/svelte/features/getDocumentHighlight.ts b/packages/language-server/src/plugins/svelte/features/getDocumentHighlight.ts