diff --git a/README.md b/README.md
index 2c0909c75..cc919bdbd 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ This repo contains the tools which provide editor integrations for Svelte files
 
 ## Packages
 
-This repo uses [`pnpm workspaces`](https://pnpm.io/workspaces/), which TLDR means if you want to run a commands in each project then you can either `cd` to that directory and run the command, or use `pnpm -r [command]`.
+This repo uses [`pnpm workspaces`](https://pnpm.io/workspaces/), which TLDR means if you want to run a command in each project then you can either `cd` to that directory and run the command, or use `pnpm -r [command]`.
 
 For example `pnpm -r test`.
 
diff --git a/package.json b/package.json
index 78483ce60..b74048576 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
         "lint": "prettier --check ."
     },
     "dependencies": {
-        "typescript": "~5.6.3"
+        "typescript": "^5.7.2"
     },
     "devDependencies": {
         "cross-env": "^7.0.2",
diff --git a/packages/language-server/README.md b/packages/language-server/README.md
index 9372d9687..0862842b9 100644
--- a/packages/language-server/README.md
+++ b/packages/language-server/README.md
@@ -289,6 +289,10 @@ Whether or not to show a code lens at the top of Svelte files indicating if they
 
 The default language to use when generating new script tags in Svelte. _Default_: `none`
 
+#### `svelte.plugin.svelte.documentHighlight.enable`
+
+Enable document highlight support. Requires a restart. _Default_: `true`
+
 ## Credits
 
 -   [James Birtles](https://github.com/jamesbirtles) for creating the foundation which this language server is built on
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
index 3021cb374..616962025 100644
--- a/packages/language-server/package.json
+++ b/packages/language-server/package.json
@@ -62,7 +62,7 @@
         "prettier-plugin-svelte": "^3.3.0",
         "svelte": "^4.2.19",
         "svelte2tsx": "workspace:~",
-        "typescript": "~5.6.3",
+        "typescript": "^5.7.2",
         "typescript-auto-import-cache": "^0.3.5",
         "vscode-css-languageservice": "~6.3.0",
         "vscode-html-languageservice": "~5.3.0",
diff --git a/packages/language-server/src/lib/documentHighlight/wordHighlight.ts b/packages/language-server/src/lib/documentHighlight/wordHighlight.ts
new file mode 100644
index 000000000..8e90a6f35
--- /dev/null
+++ b/packages/language-server/src/lib/documentHighlight/wordHighlight.ts
@@ -0,0 +1,89 @@
+import {
+    DocumentHighlight,
+    DocumentHighlightKind,
+    Position,
+    Range
+} from 'vscode-languageserver-types';
+import { Document, TagInformation } from '../documents';
+
+export function wordHighlightForTag(
+    document: Document,
+    position: Position,
+    tag: TagInformation | null,
+    wordPattern: RegExp
+): DocumentHighlight[] | null {
+    if (!tag || tag.start === tag.end) {
+        return null;
+    }
+
+    const offset = document.offsetAt(position);
+
+    const text = document.getText();
+    if (
+        offset < tag.start ||
+        offset > tag.end ||
+        // empty before and after the cursor
+        !text.slice(offset - 1, offset + 1).trim()
+    ) {
+        return null;
+    }
+
+    const word = wordAt(document, position, wordPattern);
+    if (!word) {
+        return null;
+    }
+
+    const searching = document.getText().slice(tag.start, tag.end);
+
+    const highlights: DocumentHighlight[] = [];
+
+    let index = 0;
+    while (index < searching.length) {
+        index = searching.indexOf(word, index);
+        if (index === -1) {
+            break;
+        }
+
+        const start = tag.start + index;
+        highlights.push({
+            range: {
+                start: document.positionAt(start),
+                end: document.positionAt(start + word.length)
+            },
+            kind: DocumentHighlightKind.Text
+        });
+
+        index += word.length;
+    }
+
+    return highlights;
+}
+
+function wordAt(document: Document, position: Position, wordPattern: RegExp): string | null {
+    const line = document
+        .getText(
+            Range.create(Position.create(position.line, 0), Position.create(position.line + 1, 0))
+        )
+        .trimEnd();
+
+    wordPattern.lastIndex = 0;
+
+    let start: number | undefined;
+    let end: number | undefined;
+    const matchEnd = Math.min(position.character, line.length);
+    while (wordPattern.lastIndex < matchEnd) {
+        const match = wordPattern.exec(line);
+        if (!match) {
+            break;
+        }
+
+        start = match.index;
+        end = match.index + match[0].length;
+    }
+
+    if (start === undefined || end === undefined || end < position.character) {
+        return null;
+    }
+
+    return line.slice(start, end);
+}
diff --git a/packages/language-server/src/lib/documents/Document.ts b/packages/language-server/src/lib/documents/Document.ts
index 369808e2c..dde5a0e2f 100644
--- a/packages/language-server/src/lib/documents/Document.ts
+++ b/packages/language-server/src/lib/documents/Document.ts
@@ -5,6 +5,7 @@ import { parseHtml } from './parseHtml';
 import { SvelteConfig, configLoader } from './configLoader';
 import { HTMLDocument } from 'vscode-html-languageservice';
 import { Range } from 'vscode-languageserver';
+import { importSvelte } from '../../importPackage';
 
 /**
  * Represents a text document contains a svelte component.
@@ -25,6 +26,16 @@ export class Document extends WritableDocument {
      */
     private path = urlToPath(this.url);
 
+    private _compiler: typeof import('svelte/compiler') | undefined;
+    get compiler() {
+        return this.getCompiler();
+    }
+
+    private svelteVersion: [number, number] | undefined;
+    public get isSvelte5() {
+        return this.getSvelteVersion()[0] > 4;
+    }
+
     constructor(
         public url: string,
         public content: string
@@ -34,6 +45,13 @@ export class Document extends WritableDocument {
         this.updateDocInfo();
     }
 
+    private getCompiler() {
+        if (!this._compiler) {
+            this._compiler = importSvelte(this.getFilePath() || '');
+        }
+        return this._compiler;
+    }
+
     private updateDocInfo() {
         this.html = parseHtml(this.content);
         const update = (config: SvelteConfig | undefined) => {
@@ -66,6 +84,14 @@ export class Document extends WritableDocument {
         }
     }
 
+    getSvelteVersion() {
+        if (!this.svelteVersion) {
+            const [major, minor] = this.compiler.VERSION.split('.');
+            this.svelteVersion = [Number(major), Number(minor)];
+        }
+        return this.svelteVersion;
+    }
+
     /**
      * Get text content
      */
diff --git a/packages/language-server/src/lib/documents/utils.ts b/packages/language-server/src/lib/documents/utils.ts
index ff8b4c016..66043af0e 100644
--- a/packages/language-server/src/lib/documents/utils.ts
+++ b/packages/language-server/src/lib/documents/utils.ts
@@ -453,3 +453,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/plugins/PluginHost.ts b/packages/language-server/src/plugins/PluginHost.ts
index d1613134f..8a4c3974d 100644
--- a/packages/language-server/src/plugins/PluginHost.ts
+++ b/packages/language-server/src/plugins/PluginHost.ts
@@ -16,6 +16,7 @@ import {
     CompletionList,
     DefinitionLink,
     Diagnostic,
+    DocumentHighlight,
     FoldingRange,
     FormattingOptions,
     Hover,
@@ -677,6 +678,25 @@ export class PluginHost implements LSProvider, OnWatchFileChanges {
         );
     }
 
+    findDocumentHighlight(
+        textDocument: TextDocumentIdentifier,
+        position: Position
+    ): Promise<DocumentHighlight[] | null> {
+        const document = this.getDocument(textDocument.uri);
+        if (!document) {
+            throw new Error('Cannot call methods on an unopened document');
+        }
+
+        return (
+            this.execute<DocumentHighlight[] | null>(
+                'findDocumentHighlight',
+                [document, position],
+                ExecuteMode.FirstNonNull,
+                'high'
+            ) ?? [] // fall back to empty array to prevent fallback to word-based highlighting
+        );
+    }
+
     onWatchFileChanges(onWatchFileChangesParas: OnWatchFileChangesPara[]): void {
         for (const support of this.plugins) {
             support.onWatchFileChanges?.(onWatchFileChangesParas);
diff --git a/packages/language-server/src/plugins/css/CSSPlugin.ts b/packages/language-server/src/plugins/css/CSSPlugin.ts
index d5a38d427..f89a6285e 100644
--- a/packages/language-server/src/plugins/css/CSSPlugin.ts
+++ b/packages/language-server/src/plugins/css/CSSPlugin.ts
@@ -14,6 +14,7 @@ import {
     CompletionItem,
     CompletionItemKind,
     SelectionRange,
+    DocumentHighlight,
     WorkspaceFolder
 } from 'vscode-languageserver';
 import {
@@ -36,6 +37,7 @@ import {
     CompletionsProvider,
     DiagnosticsProvider,
     DocumentColorsProvider,
+    DocumentHighlightProvider,
     DocumentSymbolsProvider,
     FoldingRangeProvider,
     HoverProvider,
@@ -50,8 +52,12 @@ import { StyleAttributeDocument } from './StyleAttributeDocument';
 import { getDocumentContext } from '../documentContext';
 import { FoldingRange, FoldingRangeKind } from 'vscode-languageserver-types';
 import { indentBasedFoldingRangeForTag } from '../../lib/foldingRange/indentFolding';
+import { wordHighlightForTag } from '../../lib/documentHighlight/wordHighlight';
 import { isNotNullOrUndefined, urlToPath } from '../../utils';
 
+// https://github.com/microsoft/vscode/blob/c6f507deeb99925e713271b1048f21dbaab4bd54/extensions/css/language-configuration.json#L34
+const wordPattern = /(#?-?\d*\.\d\w*%?)|(::?[\w-]*(?=[^,{;]*[,{]))|(([@#.!])?[\w-?]+%?|[@#!.])/g;
+
 export class CSSPlugin
     implements
         HoverProvider,
@@ -61,6 +67,7 @@ export class CSSPlugin
         ColorPresentationsProvider,
         DocumentSymbolsProvider,
         SelectionRangeProvider,
+        DocumentHighlightProvider,
         FoldingRangeProvider
 {
     __name = 'css';
@@ -388,7 +395,6 @@ export class CSSPlugin
         }
 
         const cssDocument = this.getCSSDoc(document);
-
         if (shouldUseIndentBasedFolding(cssDocument.languageId)) {
             return this.nonSyntacticFolding(document, document.styleInfo);
         }
@@ -441,6 +447,48 @@ export class CSSPlugin
         return ranges.sort((a, b) => a.startLine - b.startLine);
     }
 
+    findDocumentHighlight(document: Document, position: Position): DocumentHighlight[] | null {
+        const cssDocument = this.getCSSDoc(document);
+        if (cssDocument.isInGenerated(position)) {
+            if (shouldExcludeDocumentHighlights(cssDocument)) {
+                return wordHighlightForTag(document, position, document.styleInfo, wordPattern);
+            }
+
+            return this.findDocumentHighlightInternal(cssDocument, position);
+        }
+
+        const attributeContext = getAttributeContextAtPosition(document, position);
+        if (
+            attributeContext &&
+            this.inStyleAttributeWithoutInterpolation(attributeContext, document.getText())
+        ) {
+            const [start, end] = attributeContext.valueRange;
+            return this.findDocumentHighlightInternal(
+                new StyleAttributeDocument(document, start, end, this.cssLanguageServices),
+                position
+            );
+        }
+
+        return null;
+    }
+
+    private findDocumentHighlightInternal(
+        cssDocument: CSSDocumentBase,
+        position: Position
+    ): DocumentHighlight[] | null {
+        const kind = extractLanguage(cssDocument);
+
+        const result = getLanguageService(this.cssLanguageServices, kind)
+            .findDocumentHighlights(
+                cssDocument,
+                cssDocument.getGeneratedPosition(position),
+                cssDocument.stylesheet
+            )
+            .map((highlight) => mapObjWithRangeToOriginal(cssDocument, highlight));
+
+        return result;
+    }
+
     private getCSSDoc(document: Document) {
         let cssDoc = this.cssDocuments.get(document);
         if (!cssDoc || cssDoc.version < document.version) {
@@ -535,6 +583,18 @@ function shouldUseIndentBasedFolding(kind?: string) {
     }
 }
 
+function shouldExcludeDocumentHighlights(document: CSSDocumentBase) {
+    switch (extractLanguage(document)) {
+        case 'postcss':
+        case 'sass':
+        case 'stylus':
+        case 'styl':
+            return true;
+        default:
+            return false;
+    }
+}
+
 function isSASS(document: CSSDocumentBase) {
     switch (extractLanguage(document)) {
         case 'sass':
diff --git a/packages/language-server/src/plugins/html/HTMLPlugin.ts b/packages/language-server/src/plugins/html/HTMLPlugin.ts
index ffba79d62..75d1c3193 100644
--- a/packages/language-server/src/plugins/html/HTMLPlugin.ts
+++ b/packages/language-server/src/plugins/html/HTMLPlugin.ts
@@ -18,7 +18,8 @@ import {
     WorkspaceEdit,
     LinkedEditingRanges,
     CompletionContext,
-    FoldingRange
+    FoldingRange,
+    DocumentHighlight
 } from 'vscode-languageserver';
 import {
     DocumentManager,
@@ -33,7 +34,8 @@ import {
     CompletionsProvider,
     RenameProvider,
     LinkedEditingRangesProvider,
-    FoldingRangeProvider
+    FoldingRangeProvider,
+    DocumentHighlightProvider
 } from '../interfaces';
 import { isInsideMoustacheTag, toRange } from '../../lib/documents/utils';
 import { isNotNullOrUndefined, possiblyComponent } from '../../utils';
@@ -41,6 +43,10 @@ import { importPrettier } from '../../importPackage';
 import path from 'path';
 import { Logger } from '../../logger';
 import { indentBasedFoldingRangeForTag } from '../../lib/foldingRange/indentFolding';
+import { wordHighlightForTag } from '../../lib/documentHighlight/wordHighlight';
+
+// https://github.com/microsoft/vscode/blob/c6f507deeb99925e713271b1048f21dbaab4bd54/extensions/html/language-configuration.json#L34
+const wordPattern = /(-?\d*\.\d\w*)|([^`~!@$^&*()=+[{\]}\|;:'",.<>\/\s]+)/g;
 
 export class HTMLPlugin
     implements
@@ -48,7 +54,8 @@ export class HTMLPlugin
         CompletionsProvider,
         RenameProvider,
         LinkedEditingRangesProvider,
-        FoldingRangeProvider
+        FoldingRangeProvider,
+        DocumentHighlightProvider
 {
     __name = 'html';
     private lang = getLanguageService({
@@ -159,6 +166,7 @@ export class HTMLPlugin
                 : null;
 
         const svelteStrictMode = prettierConfig?.svelteStrictMode;
+
         items.forEach((item) => {
             const startQuote = svelteStrictMode ? '"{' : '{';
             const endQuote = svelteStrictMode ? '}"' : '}';
@@ -171,6 +179,10 @@ export class HTMLPlugin
                     ...item.textEdit,
                     newText: item.textEdit.newText.replace('="$1"', `$2=${startQuote}$1${endQuote}`)
                 };
+                // In Svelte 5, people should use `onclick` instead of `on:click`
+                if (document.isSvelte5) {
+                    item.sortText = 'z' + (item.sortText ?? item.label);
+                }
             }
 
             if (item.label.startsWith('bind:')) {
@@ -182,11 +194,7 @@ export class HTMLPlugin
         });
 
         return CompletionList.create(
-            [
-                ...this.toCompletionItems(items),
-                ...this.getLangCompletions(items),
-                ...emmetResults.items
-            ],
+            [...items, ...this.getLangCompletions(items), ...emmetResults.items],
             // Emmet completions change on every keystroke, so they are never complete
             emmetResults.items.length > 0
         );
@@ -408,6 +416,36 @@ export class HTMLPlugin
         return result.concat(templateRange);
     }
 
+    findDocumentHighlight(document: Document, position: Position): DocumentHighlight[] | null {
+        const html = this.documents.get(document);
+        if (!html) {
+            return null;
+        }
+
+        const templateResult = wordHighlightForTag(
+            document,
+            position,
+            document.templateInfo,
+            wordPattern
+        );
+
+        if (templateResult) {
+            return templateResult;
+        }
+
+        const node = html.findNodeAt(document.offsetAt(position));
+        if (possiblyComponent(node)) {
+            return null;
+        }
+        const result = this.lang.findDocumentHighlights(document, position, html);
+
+        if (!result.length) {
+            return null;
+        }
+
+        return result;
+    }
+
     /**
      * Returns true if rename happens at the tag name, not anywhere inbetween.
      */
diff --git a/packages/language-server/src/plugins/interfaces.ts b/packages/language-server/src/plugins/interfaces.ts
index 7570c727c..73c7bbbbd 100644
--- a/packages/language-server/src/plugins/interfaces.ts
+++ b/packages/language-server/src/plugins/interfaces.ts
@@ -21,6 +21,7 @@ import {
     CompletionList,
     DefinitionLink,
     Diagnostic,
+    DocumentHighlight,
     FoldingRange,
     FormattingOptions,
     Hover,
@@ -243,6 +244,13 @@ export interface FoldingRangeProvider {
     getFoldingRanges(document: Document): Resolvable<FoldingRange[]>;
 }
 
+export interface DocumentHighlightProvider {
+    findDocumentHighlight(
+        document: Document,
+        position: Position
+    ): Resolvable<DocumentHighlight[] | null>;
+}
+
 export interface OnWatchFileChanges {
     onWatchFileChanges(onWatchFileChangesParas: OnWatchFileChangesPara[]): void;
 }
@@ -273,7 +281,8 @@ type ProviderBase = DiagnosticsProvider &
     InlayHintProvider &
     CallHierarchyProvider &
     FoldingRangeProvider &
-    CodeLensProvider;
+    CodeLensProvider &
+    DocumentHighlightProvider;
 
 export type LSProvider = ProviderBase & BackwardsCompatibleDefinitionsProvider;
 
diff --git a/packages/language-server/src/plugins/svelte/SvelteDocument.ts b/packages/language-server/src/plugins/svelte/SvelteDocument.ts
index 65aa1146e..0619d1068 100644
--- a/packages/language-server/src/plugins/svelte/SvelteDocument.ts
+++ b/packages/language-server/src/plugins/svelte/SvelteDocument.ts
@@ -5,7 +5,6 @@ import { CompileOptions } from 'svelte/types/compiler/interfaces';
 // @ts-ignore
 import { PreprocessorGroup, Processed } from 'svelte/types/compiler/preprocess';
 import { Position } from 'vscode-languageserver';
-import { getPackageInfo, importSvelte } from '../../importPackage';
 import {
     Document,
     DocumentMapper,
@@ -37,7 +36,6 @@ type PositionMapper = Pick<DocumentMapper, 'getGeneratedPosition' | 'getOriginal
 export class SvelteDocument {
     private transpiledDoc: Promise<ITranspiledSvelteDocument> | undefined;
     private compileResult: Promise<SvelteCompileResult> | undefined;
-    private svelteVersion: [number, number] | undefined;
 
     public script: TagInformation | null;
     public moduleScript: TagInformation | null;
@@ -48,9 +46,6 @@ export class SvelteDocument {
     public get config() {
         return this.parent.configPromise;
     }
-    public get isSvelte5() {
-        return this.getSvelteVersion()[0] > 4;
-    }
 
     constructor(private parent: Document) {
         this.script = this.parent.scriptInfo;
@@ -73,7 +68,7 @@ export class SvelteDocument {
 
     async getTranspiled(): Promise<ITranspiledSvelteDocument> {
         if (!this.transpiledDoc) {
-            const [major, minor] = this.getSvelteVersion();
+            const [major, minor] = this.parent.getSvelteVersion();
 
             if (major > 3 || (major === 3 && minor >= 32)) {
                 this.transpiledDoc = TranspiledSvelteDocument.create(
@@ -99,16 +94,7 @@ export class SvelteDocument {
     }
 
     async getCompiledWith(options: CompileOptions = {}): Promise<SvelteCompileResult> {
-        const svelte = importSvelte(this.getFilePath());
-        return svelte.compile((await this.getTranspiled()).getText(), options);
-    }
-
-    private getSvelteVersion() {
-        if (!this.svelteVersion) {
-            const { major, minor } = getPackageInfo('svelte', this.getFilePath()).version;
-            this.svelteVersion = [major, minor];
-        }
-        return this.svelteVersion;
+        return this.parent.compiler.compile((await this.getTranspiled()).getText(), options);
     }
 }
 
@@ -123,8 +109,7 @@ export class TranspiledSvelteDocument implements ITranspiledSvelteDocument {
         }
 
         const filename = document.getFilePath() || '';
-        const svelte = importSvelte(filename);
-        const preprocessed = await svelte.preprocess(
+        const preprocessed = await document.compiler.preprocess(
             document.getText(),
             wrapPreprocessors(config?.preprocess),
             {
@@ -453,8 +438,7 @@ async function transpile(
         return wrappedPreprocessor;
     });
 
-    const svelte = importSvelte(document.getFilePath() || '');
-    const result = await svelte.preprocess(document.getText(), wrappedPreprocessors, {
+    const result = await document.compiler.preprocess(document.getText(), wrappedPreprocessors, {
         filename: document.getFilePath() || ''
     });
     const transpiled = result.code || result.toString?.() || '';
diff --git a/packages/language-server/src/plugins/svelte/SveltePlugin.ts b/packages/language-server/src/plugins/svelte/SveltePlugin.ts
index 3fe7c49a5..70e00e9a0 100644
--- a/packages/language-server/src/plugins/svelte/SveltePlugin.ts
+++ b/packages/language-server/src/plugins/svelte/SveltePlugin.ts
@@ -16,7 +16,7 @@ import {
     WorkspaceEdit
 } from 'vscode-languageserver';
 import { Plugin } from 'prettier';
-import { getPackageInfo, importPrettier, importSvelte } from '../../importPackage';
+import { getPackageInfo, importPrettier } from '../../importPackage';
 import { Document } from '../../lib/documents';
 import { Logger } from '../../logger';
 import { LSConfigManager, LSSvelteConfig } from '../../ls-config';
@@ -52,9 +52,9 @@ export class SveltePlugin
 
     async getCodeLens(document: Document): Promise<CodeLens[] | null> {
         if (!this.featureEnabled('runesLegacyModeCodeLens')) return null;
+        if (!document.isSvelte5) return null;
 
         const doc = await this.getSvelteDoc(document);
-        if (!doc.isSvelte5) return null;
 
         try {
             const result = await doc.getCompiled();
@@ -355,7 +355,7 @@ export class SveltePlugin
 
     private migrate(document: Document): WorkspaceEdit | string {
         try {
-            const compiler = importSvelte(document.getFilePath() ?? '') as any;
+            const compiler = document.compiler as any;
             if (!compiler.migrate) {
                 return 'Your installed Svelte version does not support migration';
             }
diff --git a/packages/language-server/src/plugins/svelte/features/getCompletions.ts b/packages/language-server/src/plugins/svelte/features/getCompletions.ts
index eefe5c3f7..8a4f0d5c0 100644
--- a/packages/language-server/src/plugins/svelte/features/getCompletions.ts
+++ b/packages/language-server/src/plugins/svelte/features/getCompletions.ts
@@ -9,10 +9,10 @@ import {
     MarkupKind
 } from 'vscode-languageserver';
 import { SvelteTag, documentation, getLatestOpeningTag } from './SvelteTags';
-import { isInTag, Document } from '../../../lib/documents';
+import { Document } from '../../../lib/documents';
 import { AttributeContext, getAttributeContextAtPosition } from '../../../lib/documents/parseHtml';
 import { getModifierData } from './getModifierData';
-import { attributeCanHaveEventModifier } from './utils';
+import { attributeCanHaveEventModifier, inStyleOrScript } from './utils';
 
 const HTML_COMMENT_START = '<!--';
 
@@ -36,16 +36,12 @@ export function getCompletions(
 ): CompletionList | null {
     const offset = svelteDoc.offsetAt(position);
 
-    const isInStyleOrScript =
-        isInTag(position, svelteDoc.style) ||
-        isInTag(position, svelteDoc.script) ||
-        isInTag(position, svelteDoc.moduleScript);
     const lastCharactersBeforePosition = svelteDoc
         .getText()
         // use last 10 characters, should cover 99% of all cases
         .substr(Math.max(offset - 10, 0), Math.min(offset, 10));
     const precededByOpeningBracket = /[\s\S]*{\s*[#:/@]\w*$/.test(lastCharactersBeforePosition);
-    if (isInStyleOrScript) {
+    if (inStyleOrScript(svelteDoc, position)) {
         return null;
     }
 
diff --git a/packages/language-server/src/plugins/svelte/features/getHoverInfo.ts b/packages/language-server/src/plugins/svelte/features/getHoverInfo.ts
index 86d90577b..fa2679e4e 100644
--- a/packages/language-server/src/plugins/svelte/features/getHoverInfo.ts
+++ b/packages/language-server/src/plugins/svelte/features/getHoverInfo.ts
@@ -2,9 +2,9 @@ import { Hover, Position } from 'vscode-languageserver';
 import { SvelteDocument } from '../SvelteDocument';
 import { documentation, SvelteTag, getLatestOpeningTag } from './SvelteTags';
 import { flatten } from '../../../utils';
-import { Document, isInTag } from '../../../lib/documents';
+import { Document } from '../../../lib/documents';
 import { AttributeContext, getAttributeContextAtPosition } from '../../../lib/documents/parseHtml';
-import { attributeCanHaveEventModifier } from './utils';
+import { attributeCanHaveEventModifier, inStyleOrScript } from './utils';
 import { getModifierData } from './getModifierData';
 
 /**
@@ -17,11 +17,6 @@ export function getHoverInfo(
 ): Hover | null {
     const offset = svelteDoc.offsetAt(position);
 
-    const isInStyleOrScript =
-        isInTag(position, svelteDoc.style) ||
-        isInTag(position, svelteDoc.script) ||
-        isInTag(position, svelteDoc.moduleScript);
-
     const offsetStart = Math.max(offset - 10, 0);
     const charactersAroundOffset = svelteDoc
         .getText()
@@ -29,7 +24,7 @@ export function getHoverInfo(
         .substr(offsetStart, 20);
     const isSvelteTag = tagRegexp.test(charactersAroundOffset);
 
-    if (isInStyleOrScript) {
+    if (inStyleOrScript(svelteDoc, position)) {
         return null;
     }
 
diff --git a/packages/language-server/src/plugins/svelte/features/getSelectionRanges.ts b/packages/language-server/src/plugins/svelte/features/getSelectionRanges.ts
index c9cbdadc5..2ddb01f88 100644
--- a/packages/language-server/src/plugins/svelte/features/getSelectionRanges.ts
+++ b/packages/language-server/src/plugins/svelte/features/getSelectionRanges.ts
@@ -1,7 +1,8 @@
 import { walk } from 'estree-walker';
 import { Position, SelectionRange } from 'vscode-languageserver';
-import { isInTag, mapSelectionRangeToParent, offsetAt, toRange } from '../../../lib/documents';
+import { mapSelectionRangeToParent, offsetAt, toRange } from '../../../lib/documents';
 import { SvelteDocument } from '../SvelteDocument';
+import { inStyleOrScript } from './utils';
 
 // estree does not have start/end in their public Node interface,
 // but the AST returned by svelte/compiler does. Type as any as a workaround.
@@ -13,7 +14,10 @@ type OffsetRange = {
 };
 
 export async function getSelectionRange(svelteDoc: SvelteDocument, position: Position) {
-    const { script, style, moduleScript } = svelteDoc;
+    if (inStyleOrScript(svelteDoc, position)) {
+        return null;
+    }
+
     const {
         ast: { html }
     } = await svelteDoc.getCompiled();
@@ -21,14 +25,6 @@ export async function getSelectionRange(svelteDoc: SvelteDocument, position: Pos
     const content = transpiled.getText();
     const offset = offsetAt(transpiled.getGeneratedPosition(position), content);
 
-    const embedded = [script, style, moduleScript];
-    for (const info of embedded) {
-        if (isInTag(position, info)) {
-            // let other plugins do it
-            return null;
-        }
-    }
-
     let nearest: OffsetRange = html;
     let result: SelectionRange | undefined;
 
diff --git a/packages/language-server/src/plugins/svelte/features/utils.ts b/packages/language-server/src/plugins/svelte/features/utils.ts
index 9a1619cbe..2df4c657c 100644
--- a/packages/language-server/src/plugins/svelte/features/utils.ts
+++ b/packages/language-server/src/plugins/svelte/features/utils.ts
@@ -1,5 +1,8 @@
+import { Position } from 'vscode-languageserver';
+import { isInTag } from '../../../lib/documents';
 import { AttributeContext } from '../../../lib/documents/parseHtml';
 import { possiblyComponent } from '../../../utils';
+import { SvelteDocument } from '../SvelteDocument';
 
 export function attributeCanHaveEventModifier(attributeContext: AttributeContext) {
     return (
@@ -9,3 +12,11 @@ export function attributeCanHaveEventModifier(attributeContext: AttributeContext
         attributeContext.name.includes('|')
     );
 }
+
+export function inStyleOrScript(svelteDoc: SvelteDocument, position: Position) {
+    return (
+        isInTag(position, svelteDoc.style) ||
+        isInTag(position, svelteDoc.script) ||
+        isInTag(position, svelteDoc.moduleScript)
+    );
+}
diff --git a/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts b/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts
index 264fe6665..3c8203b25 100644
--- a/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts
+++ b/packages/language-server/src/plugins/typescript/TypeScriptPlugin.ts
@@ -11,6 +11,7 @@ import {
     CompletionList,
     DefinitionLink,
     Diagnostic,
+    DocumentHighlight,
     FileChangeType,
     FoldingRange,
     Hover,
@@ -46,6 +47,7 @@ import {
     CompletionsProvider,
     DefinitionsProvider,
     DiagnosticsProvider,
+    DocumentHighlightProvider,
     DocumentSymbolsProvider,
     FileReferencesProvider,
     FileRename,
@@ -89,6 +91,7 @@ import {
     is$storeVariableIn$storeDeclaration,
     isTextSpanInGeneratedCode
 } from './features/utils';
+import { DocumentHighlightProviderImpl } from './features/DocumentHighlightProvider';
 import { isAttributeName, isAttributeShorthand, isEventHandler } from './svelte-ast-utils';
 import {
     convertToLocationForReferenceOrDefinition,
@@ -116,6 +119,7 @@ export class TypeScriptPlugin
         SelectionRangeProvider,
         SignatureHelpProvider,
         SemanticTokensProvider,
+        DocumentHighlightProvider,
         ImplementationProvider,
         TypeDefinitionProvider,
         InlayHintProvider,
@@ -149,6 +153,7 @@ export class TypeScriptPlugin
     private readonly foldingRangeProvider: FoldingRangeProviderImpl;
     private readonly callHierarchyProvider: CallHierarchyProviderImpl;
     private readonly codLensProvider: CodeLensProviderImpl;
+    private readonly documentHeightProvider: DocumentHighlightProviderImpl;
 
     constructor(
         configManager: LSConfigManager,
@@ -208,6 +213,7 @@ export class TypeScriptPlugin
             this.implementationProvider,
             this.configManager
         );
+        this.documentHeightProvider = new DocumentHighlightProviderImpl(this.lsAndTsDocResolver);
     }
 
     async getDiagnostics(
@@ -688,6 +694,13 @@ export class TypeScriptPlugin
         return this.codLensProvider.resolveCodeLens(document, codeLensToResolve, cancellationToken);
     }
 
+    async findDocumentHighlight(
+        document: Document,
+        position: Position
+    ): Promise<DocumentHighlight[] | null> {
+        return this.documentHeightProvider.findDocumentHighlight(document, position);
+    }
+
     private featureEnabled(feature: keyof LSTypescriptConfig) {
         return (
             this.configManager.enabled('typescript.enable') &&
diff --git a/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts b/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts
index dae13c72c..3bdbf4b1c 100644
--- a/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts
+++ b/packages/language-server/src/plugins/typescript/features/CompletionProvider.ts
@@ -158,7 +158,7 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
         }
 
         const originalOffset = document.offsetAt(position);
-        const offset = tsDoc.offsetAt(tsDoc.getGeneratedPosition(position));
+        let offset = tsDoc.offsetAt(tsDoc.getGeneratedPosition(position));
 
         if (isJsDocTriggerCharacter) {
             return getJsDocTemplateCompletion(tsDoc, langForSyntheticOperations, filePath, offset);
@@ -168,9 +168,16 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
         if (
             // Cursor is somewhere in regular HTML text
             (svelteNode?.type === 'Text' &&
-                ['Element', 'InlineComponent', 'Fragment', 'SlotTemplate'].includes(
-                    svelteNode.parent?.type as any
-                )) ||
+                [
+                    'Element',
+                    'InlineComponent',
+                    'Fragment',
+                    'SlotTemplate',
+                    'SnippetBlock',
+                    'IfBlock',
+                    'EachBlock',
+                    'AwaitBlock'
+                ].includes(svelteNode.parent?.type as any)) ||
             // Cursor is at <div>|</div> in which case there's no TextNode inbetween
             document.getText().substring(originalOffset - 1, originalOffset + 2) === '></'
         ) {
@@ -182,8 +189,31 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
             return null;
         }
 
+        const inScript = isInScript(position, tsDoc);
         const wordInfo = this.getWordAtPosition(document, originalOffset);
 
+        if (
+            !inScript &&
+            wordInfo.word[0] === '{' &&
+            (wordInfo.word[1] === '#' ||
+                wordInfo.word[1] === '@' ||
+                wordInfo.word[1] === ':' ||
+                wordInfo.word[1] === '/')
+        ) {
+            // Typing something like {/if}
+            return null;
+        }
+
+        // Special case: completion at `<Comp.` -> mapped one character too short -> adjust
+        if (
+            !inScript &&
+            wordInfo.word === '' &&
+            document.getText()[originalOffset - 1] === '.' &&
+            tsDoc.getFullText()[offset] === '.'
+        ) {
+            offset++;
+        }
+
         const componentInfo = getComponentAtPosition(lang, document, tsDoc, position);
         const attributeContext = componentInfo && getAttributeContextAtPosition(document, position);
         const eventAndSlotLetCompletions = this.getEventAndSlotLetCompletions(
@@ -282,6 +312,7 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
         const isCompletionInTag = svelteIsInTag(svelteNode, originalOffset);
         const isHandlerCompletion =
             svelteNode?.type === 'EventHandler' && svelteNode.parent?.type === 'Element';
+        const preferComponents = wordInfo.word[0] === '<' || inScript;
 
         const completionItems: CompletionItem[] = customCompletions;
         const isValidCompletion = createIsValidCompletion(document, position, !!tsDoc.parserError);
@@ -295,7 +326,8 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
                     isCompletionInTag,
                     commitCharactersOptions,
                     asStore,
-                    existingImports
+                    existingImports,
+                    preferComponents
                 );
                 if (completion) {
                     completionItems.push(
@@ -651,7 +683,8 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
         isCompletionInTag: boolean,
         commitCharactersOptions: CommitCharactersOptions,
         asStore: boolean,
-        existingImports: Set<string>
+        existingImports: Set<string>,
+        preferComponents: boolean
     ): AppCompletionItem<CompletionResolveInfo> | null {
         const completionLabelAndInsert = this.getCompletionLabelAndInsert(snapshot, comp);
         if (!completionLabelAndInsert) {
@@ -697,8 +730,10 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
             kind: scriptElementKindToCompletionItemKind(comp.kind),
             commitCharacters: this.getCommitCharacters(comp, commitCharactersOptions, isSvelteComp),
             // Make sure svelte component and runes take precedence
-            sortText: isRunesCompletion || isSvelteComp ? '-1' : comp.sortText,
-            preselect: isRunesCompletion || isSvelteComp ? true : comp.isRecommended,
+            sortText:
+                preferComponents && (isRunesCompletion || isSvelteComp) ? '-1' : comp.sortText,
+            preselect:
+                preferComponents && (isRunesCompletion || isSvelteComp) ? true : comp.isRecommended,
             insertTextFormat: comp.isSnippet ? InsertTextFormat.Snippet : undefined,
             labelDetails,
             textEdit,
@@ -772,7 +807,11 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionRe
         }
 
         const isNewIdentifierLocation = response.isNewIdentifierLocation;
-        let defaultCommitCharacters = response.defaultCommitCharacters;
+        // TypeScript 5.7+ reused the same array for different completions
+        let defaultCommitCharacters = response.defaultCommitCharacters
+            ? Array.from(response.defaultCommitCharacters)
+            : undefined;
+
         if (!isNewIdentifierLocation) {
             // This actually always exists although it's optional in the type, at least in ts 5.6,
             // so our commit characters are mostly fallback for older ts versions
diff --git a/packages/language-server/src/plugins/typescript/features/DocumentHighlightProvider.ts b/packages/language-server/src/plugins/typescript/features/DocumentHighlightProvider.ts
new file mode 100644
index 000000000..7df9fd881
--- /dev/null
+++ b/packages/language-server/src/plugins/typescript/features/DocumentHighlightProvider.ts
@@ -0,0 +1,312 @@
+import ts from 'typescript';
+import { Position, DocumentHighlight } from 'vscode-languageserver-protocol';
+import { DocumentHighlightKind, Range } from 'vscode-languageserver-types';
+import { Document, inStyleOrScript } from '../../../lib/documents';
+import { flatten, isSamePosition } from '../../../utils';
+import { DocumentHighlightProvider } from '../../interfaces';
+import { LSAndTSDocResolver } from '../LSAndTSDocResolver';
+import { convertToLocationRange } from '../utils';
+import { isInGeneratedCode } from './utils';
+import { SvelteDocumentSnapshot } from '../DocumentSnapshot';
+// @ts-ignore
+import { TemplateNode } from 'svelte/types/compiler/interfaces';
+import { walkSvelteAst } from '../svelte-ast-utils';
+
+type RangeTupleArray = Array<[start: number, end: number]>;
+
+export class DocumentHighlightProviderImpl implements DocumentHighlightProvider {
+    constructor(private readonly lsAndTsDocResolver: LSAndTSDocResolver) {}
+    async findDocumentHighlight(
+        document: Document,
+        position: Position
+    ): Promise<DocumentHighlight[] | null> {
+        const { tsDoc } = await this.lsAndTsDocResolver.getLsForSyntheticOperations(document);
+
+        const svelteResult = await this.getSvelteDocumentHighlight(document, tsDoc, position);
+
+        if (svelteResult) {
+            return svelteResult;
+        }
+
+        const { lang } = await this.lsAndTsDocResolver.getLSAndTSDoc(document);
+
+        const offset = tsDoc.offsetAt(tsDoc.getGeneratedPosition(position));
+        const highlights = lang
+            .getDocumentHighlights(tsDoc.filePath, offset, [tsDoc.filePath])
+            ?.filter((highlight) => highlight.fileName === tsDoc.filePath);
+
+        if (!highlights?.length) {
+            return null;
+        }
+
+        const result = flatten(highlights.map((highlight) => highlight.highlightSpans))
+            .filter(this.notInGeneratedCode(tsDoc.getFullText()))
+            .map((highlight) =>
+                DocumentHighlight.create(
+                    convertToLocationRange(tsDoc, highlight.textSpan),
+                    this.convertHighlightKind(highlight)
+                )
+            )
+            .filter((highlight) => !isSamePosition(highlight.range.start, highlight.range.end));
+
+        if (!result.length) {
+            return null;
+        }
+
+        return result;
+    }
+
+    private convertHighlightKind(highlight: ts.HighlightSpan): DocumentHighlightKind | undefined {
+        return highlight.kind === ts.HighlightSpanKind.writtenReference
+            ? DocumentHighlightKind.Write
+            : DocumentHighlightKind.Read;
+    }
+
+    private async getSvelteDocumentHighlight(
+        document: Document,
+        tsDoc: SvelteDocumentSnapshot,
+        position: Position
+    ): Promise<DocumentHighlight[] | null> {
+        if (inStyleOrScript(document, position)) {
+            return null;
+        }
+
+        const offset = document.offsetAt(position);
+
+        const offsetStart = Math.max(offset - 10, 0);
+        const charactersAroundOffset = document
+            .getText()
+            // use last 10 and next 10 characters, should cover 99% of all cases
+            .substr(offsetStart, 20);
+
+        if (
+            !['#', '/', ':', '@', 'then', 'catch'].some((keyword) =>
+                charactersAroundOffset.includes(keyword)
+            )
+        ) {
+            return null;
+        }
+
+        const candidate = this.findCandidateSvelteTag(tsDoc, offset);
+
+        if (!candidate) {
+            return null;
+        }
+
+        if (candidate.type.endsWith('Tag')) {
+            return this.getTagHighlight(offset, document, candidate);
+        }
+
+        if (candidate.type.endsWith('Block')) {
+            return this.getBlockHighlight(offset, document, candidate);
+        }
+
+        return null;
+    }
+
+    private findCandidateSvelteTag(tsDoc: SvelteDocumentSnapshot, offset: number) {
+        let candidate: TemplateNode | undefined;
+        const subBlocks = ['ThenBlock', 'CatchBlock', 'PendingBlock', 'ElseBlock'];
+
+        tsDoc.walkSvelteAst({
+            enter(node, parent, key) {
+                if (node.type === 'Fragment') {
+                    return;
+                }
+
+                const templateNode = node as TemplateNode;
+                const isWithin = templateNode.start <= offset && templateNode.end >= offset;
+
+                const canSkip =
+                    !isWithin ||
+                    key === 'expression' ||
+                    key === 'context' ||
+                    ((parent.type === 'InlineComponent' || parent.type === 'Element') &&
+                        key !== 'children');
+
+                if (canSkip) {
+                    this.skip();
+                    return;
+                }
+
+                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;
+                }
+            }
+        });
+
+        return candidate;
+    }
+
+    private getTagHighlight(
+        offset: number,
+        document: Document,
+        candidate: TemplateNode
+    ): DocumentHighlight[] | null {
+        const name =
+            candidate.type === 'RawMustacheTag'
+                ? 'html'
+                : candidate.type.replace('Tag', '').toLocaleLowerCase();
+
+        const startTag = '@' + name;
+        const indexOfName = document.getText().indexOf(startTag, candidate.start);
+
+        if (indexOfName < 0 || indexOfName > offset || candidate.start + startTag.length < offset) {
+            return null;
+        }
+
+        return [
+            {
+                kind: DocumentHighlightKind.Read,
+                range: Range.create(
+                    document.positionAt(indexOfName),
+                    document.positionAt(indexOfName + startTag.length)
+                )
+            }
+        ];
+    }
+
+    private getBlockHighlight(
+        offset: number,
+        document: Document,
+        candidate: TemplateNode
+    ): DocumentHighlight[] | null {
+        const name = candidate.type.replace('Block', '').toLowerCase();
+
+        const startTag = '#' + name;
+        const startTagStart = document.getText().indexOf(startTag, candidate.start);
+
+        if (startTagStart < 0) {
+            return null;
+        }
+
+        const ranges: RangeTupleArray = [];
+
+        ranges.push([startTagStart, startTagStart + startTag.length]);
+
+        const content = document.getText();
+        const endTag = '/' + name;
+        const endTagStart = content.lastIndexOf(endTag, candidate.end);
+
+        if (endTagStart < startTagStart) {
+            return null; // can happen in loose parser mode for unclosed tags
+        }
+
+        ranges.push([endTagStart, endTagStart + endTag.length]);
+
+        if (candidate.type === 'EachBlock' && candidate.else) {
+            const elseStart = content.lastIndexOf(':else', candidate.else.start);
+
+            ranges.push([elseStart, elseStart + ':else'.length]);
+        }
+
+        ranges.push(
+            ...this.getElseHighlightsForIfBlock(candidate, content),
+            ...this.getAwaitBlockHighlight(candidate, content)
+        );
+
+        if (!ranges.some(([start, end]) => offset >= start && offset <= end)) {
+            return null;
+        }
+
+        return ranges.map(([start, end]) => ({
+            range: Range.create(document.positionAt(start), document.positionAt(end)),
+            kind: DocumentHighlightKind.Read
+        }));
+    }
+
+    private getElseHighlightsForIfBlock(candidate: TemplateNode, content: string): RangeTupleArray {
+        if (candidate.type !== 'IfBlock' || !candidate.else) {
+            return [];
+        }
+
+        const ranges = new Map<number, RangeTupleArray[number]>();
+
+        walkSvelteAst(candidate.else, {
+            enter(node) {
+                const templateNode = node as TemplateNode;
+                if (templateNode.type === 'IfBlock' && templateNode.elseif) {
+                    const elseIfStart = content.lastIndexOf(
+                        ':else if',
+                        templateNode.expression.start
+                    );
+
+                    if (elseIfStart > 0) {
+                        ranges.set(elseIfStart, [elseIfStart, elseIfStart + ':else if'.length]);
+                    }
+                }
+
+                if (templateNode.type === 'ElseBlock') {
+                    const elseStart = content.lastIndexOf(':else', templateNode.start);
+
+                    if (
+                        elseStart > 0 &&
+                        content.slice(elseStart, elseStart + ':else if'.length) !== ':else if'
+                    ) {
+                        ranges.set(elseStart, [elseStart, elseStart + ':else'.length]);
+                    }
+                }
+            }
+        });
+
+        return Array.from(ranges.values());
+    }
+
+    private getAwaitBlockHighlight(candidate: TemplateNode, content: string): RangeTupleArray {
+        if (candidate.type !== 'AwaitBlock' || (candidate.then.skip && candidate.catch.skip)) {
+            return [];
+        }
+
+        const ranges: RangeTupleArray = [];
+
+        if (candidate.value) {
+            const thenKeyword = candidate.pending.skip ? 'then' : ':then';
+
+            const thenStart = content.lastIndexOf(thenKeyword, candidate.value.start);
+
+            ranges.push([thenStart, thenStart + thenKeyword.length]);
+        }
+
+        // {#await promise catch error} or {:catch error}
+        if (candidate.error) {
+            const catchKeyword = candidate.pending.skip && candidate.then.skip ? 'catch' : ':catch';
+
+            const catchStart = content.lastIndexOf(catchKeyword, candidate.error.start);
+
+            ranges.push([catchStart, catchStart + catchKeyword.length]);
+        } else if (!candidate.catch.skip) {
+            // {:catch}
+
+            const catchStart = content.indexOf(':catch', candidate.catch.start);
+
+            ranges.push([catchStart, catchStart + ':catch'.length]);
+        }
+
+        return ranges;
+    }
+
+    private notInGeneratedCode(text: string) {
+        return (ref: ts.HighlightSpan) => {
+            return !isInGeneratedCode(
+                text,
+                ref.textSpan.start,
+                ref.textSpan.start + ref.textSpan.length
+            );
+        };
+    }
+}
diff --git a/packages/language-server/src/plugins/typescript/features/SelectionRangeProvider.ts b/packages/language-server/src/plugins/typescript/features/SelectionRangeProvider.ts
index bd7cb1c35..6fb3fa30c 100644
--- a/packages/language-server/src/plugins/typescript/features/SelectionRangeProvider.ts
+++ b/packages/language-server/src/plugins/typescript/features/SelectionRangeProvider.ts
@@ -1,6 +1,6 @@
 import ts from 'typescript';
 import { Position, Range, SelectionRange } from 'vscode-languageserver';
-import { Document, mapSelectionRangeToParent } from '../../../lib/documents';
+import { Document, mapRangeToOriginal } from '../../../lib/documents';
 import { SelectionRangeProvider } from '../../interfaces';
 import { SvelteDocumentSnapshot } from '../DocumentSnapshot';
 import { LSAndTSDocResolver } from '../LSAndTSDocResolver';
@@ -20,7 +20,7 @@ export class SelectionRangeProviderImpl implements SelectionRangeProvider {
             tsDoc.offsetAt(tsDoc.getGeneratedPosition(position))
         );
         const selectionRange = this.toSelectionRange(tsDoc, tsSelectionRange);
-        const mappedRange = mapSelectionRangeToParent(tsDoc, selectionRange);
+        const mappedRange = this.mapSelectionRangeToParent(tsDoc, document, selectionRange);
 
         return this.filterOutUnmappedRange(mappedRange);
     }
@@ -35,6 +35,35 @@ export class SelectionRangeProviderImpl implements SelectionRangeProvider {
         };
     }
 
+    private mapSelectionRangeToParent(
+        tsDoc: SvelteDocumentSnapshot,
+        document: Document,
+        selectionRange: SelectionRange
+    ): SelectionRange {
+        const { range, parent } = selectionRange;
+        const originalRange = mapRangeToOriginal(tsDoc, range);
+
+        const originalLength = originalRange.end.character - originalRange.start.character;
+        const generatedLength = range.end.character - range.start.character;
+
+        // sourcemap off by one character issue + a generated semicolon
+        if (
+            originalLength === generatedLength - 2 &&
+            tsDoc.getFullText()[tsDoc.offsetAt(range.end) - 1] === ';'
+        ) {
+            originalRange.end.character += 1;
+        }
+
+        if (!parent) {
+            return SelectionRange.create(originalRange);
+        }
+
+        return SelectionRange.create(
+            originalRange,
+            this.mapSelectionRangeToParent(tsDoc, document, parent)
+        );
+    }
+
     private filterOutUnmappedRange(selectionRange: SelectionRange): SelectionRange | null {
         const flattened = this.flattenAndReverseSelectionRange(selectionRange);
         const filtered = flattened.filter((range) => range.start.line > 0 && range.end.line > 0);
diff --git a/packages/language-server/src/plugins/typescript/service.ts b/packages/language-server/src/plugins/typescript/service.ts
index 4002f5c75..3c295129a 100644
--- a/packages/language-server/src/plugins/typescript/service.ts
+++ b/packages/language-server/src/plugins/typescript/service.ts
@@ -1,4 +1,4 @@
-import { dirname, join, resolve, basename } from 'path';
+import { dirname, basename } from 'path';
 import ts from 'typescript';
 import {
     DiagnosticSeverity,
diff --git a/packages/language-server/src/server.ts b/packages/language-server/src/server.ts
index 9e7f4eeda..04b05458f 100644
--- a/packages/language-server/src/server.ts
+++ b/packages/language-server/src/server.ts
@@ -319,7 +319,10 @@ export function startServer(options?: LSOptions) {
                 foldingRangeProvider: true,
                 codeLensProvider: {
                     resolveProvider: true
-                }
+                },
+                documentHighlightProvider:
+                    evt.initializationOptions?.configuration?.svelte.plugin.svelte
+                        ?.documentHighlight?.enable ?? true
             }
         };
     });
@@ -489,6 +492,9 @@ export function startServer(options?: LSOptions) {
 
         return pluginHost.resolveCodeLens(data, codeLens, token);
     });
+    connection.onDocumentHighlight((evt) =>
+        pluginHost.findDocumentHighlight(evt.textDocument, evt.position)
+    );
 
     const diagnosticsManager = new DiagnosticsManager(
         connection.sendDiagnostics,
diff --git a/packages/language-server/src/utils.ts b/packages/language-server/src/utils.ts
index a79c49999..1a136ed0e 100644
--- a/packages/language-server/src/utils.ts
+++ b/packages/language-server/src/utils.ts
@@ -250,6 +250,9 @@ export function modifyLines(
         .join('\r\n');
 }
 
+export function isSamePosition(position: Position, another: Position) {
+    return position.line === another.line && position.character === another.character;
+}
 /**
  * Like array.filter, but asynchronous
  */
diff --git a/packages/language-server/test/plugins/css/CSSPlugin.test.ts b/packages/language-server/test/plugins/css/CSSPlugin.test.ts
index 6c907776c..5e9c4bf32 100644
--- a/packages/language-server/test/plugins/css/CSSPlugin.test.ts
+++ b/packages/language-server/test/plugins/css/CSSPlugin.test.ts
@@ -9,7 +9,9 @@ import {
     CompletionContext,
     SelectionRange,
     CompletionTriggerKind,
-    FoldingRangeKind
+    FoldingRangeKind,
+    DocumentHighlight,
+    DocumentHighlightKind
 } from 'vscode-languageserver';
 import { DocumentManager, Document } from '../../../src/lib/documents';
 import { CSSPlugin } from '../../../src/plugins';
@@ -501,4 +503,85 @@ describe('CSS Plugin', () => {
             ]);
         });
     });
+
+    describe('document highlight', () => {
+        it('provide document highlight', () => {
+            const { plugin, document } = setup('<style>.hi {} button.hi {}</style>');
+
+            const highlight = plugin.findDocumentHighlight(document, Position.create(0, 9));
+
+            assert.deepStrictEqual(highlight, <DocumentHighlight[]>[
+                {
+                    range: {
+                        start: {
+                            line: 0,
+                            character: 7
+                        },
+                        end: {
+                            line: 0,
+                            character: 10
+                        }
+                    },
+                    kind: DocumentHighlightKind.Write
+                },
+                {
+                    range: {
+                        start: {
+                            line: 0,
+                            character: 20
+                        },
+                        end: {
+                            line: 0,
+                            character: 23
+                        }
+                    },
+                    kind: DocumentHighlightKind.Read
+                }
+            ]);
+        });
+
+        it('provide document highlight for style attribute', () => {
+            const { plugin, document } = setup('<div style="position: relative"></div>');
+
+            const highlight = plugin.findDocumentHighlight(document, Position.create(0, 13));
+
+            assert.deepStrictEqual(highlight, <DocumentHighlight[]>[
+                {
+                    range: {
+                        start: {
+                            line: 0,
+                            character: 12
+                        },
+                        end: {
+                            line: 0,
+                            character: 20
+                        }
+                    },
+                    kind: DocumentHighlightKind.Read
+                }
+            ]);
+        });
+
+        it('provide word highlight for unsupported languages', () => {
+            const { plugin, document } = setup('<style lang="postcss">.hi {}</style>');
+
+            const highlight = plugin.findDocumentHighlight(document, Position.create(0, 25));
+
+            assert.deepStrictEqual(highlight, <DocumentHighlight[]>[
+                {
+                    range: {
+                        start: {
+                            line: 0,
+                            character: 22
+                        },
+                        end: {
+                            line: 0,
+                            character: 25
+                        }
+                    },
+                    kind: DocumentHighlightKind.Text
+                }
+            ]);
+        });
+    });
 });
diff --git a/packages/language-server/test/plugins/html/HTMLPlugin.test.ts b/packages/language-server/test/plugins/html/HTMLPlugin.test.ts
index 7cf0bfa44..f112baec3 100644
--- a/packages/language-server/test/plugins/html/HTMLPlugin.test.ts
+++ b/packages/language-server/test/plugins/html/HTMLPlugin.test.ts
@@ -8,11 +8,16 @@ import {
     CompletionItemKind,
     InsertTextFormat,
     CompletionTriggerKind,
-    FoldingRange
+    FoldingRange,
+    DocumentHighlightKind
 } from 'vscode-languageserver';
 import { HTMLPlugin } from '../../../src/plugins';
 import { DocumentManager, Document } from '../../../src/lib/documents';
 import { LSConfigManager } from '../../../src/ls-config';
+import { DocumentHighlight } from 'vscode-languageserver-types';
+import { VERSION } from 'svelte/compiler';
+
+const isSvelte5Plus = Number(VERSION.split('.')[0]) >= 5;
 
 describe('HTML Plugin', () => {
     function setup(content: string) {
@@ -67,7 +72,7 @@ describe('HTML Plugin', () => {
         const completions = await plugin.getCompletions(document, Position.create(0, 7));
         const onClick = completions?.items.find((item) => item.label === 'on:click');
 
-        assert.deepStrictEqual(onClick, <CompletionItem>{
+        const expected: CompletionItem = {
             label: 'on:click',
             kind: CompletionItemKind.Value,
             documentation: {
@@ -80,7 +85,13 @@ describe('HTML Plugin', () => {
             ),
             insertTextFormat: InsertTextFormat.Snippet,
             command: undefined
-        });
+        };
+
+        if (isSvelte5Plus) {
+            expected.sortText = 'zon:click';
+        }
+
+        assert.deepStrictEqual(onClick, expected);
     });
 
     it('provide event handler completions in svelte strict mode', async () => {
@@ -285,4 +296,61 @@ describe('HTML Plugin', () => {
             { startLine: 1, endLine: 2 }
         ]);
     });
+
+    it('provide document highlight', () => {
+        const { plugin, document } = setup('<div></div>');
+
+        const highlight = plugin.findDocumentHighlight(document, Position.create(0, 1));
+
+        assert.deepStrictEqual(highlight, <DocumentHighlight[]>[
+            {
+                range: {
+                    start: {
+                        line: 0,
+                        character: 1
+                    },
+                    end: {
+                        line: 0,
+                        character: 4
+                    }
+                },
+                kind: DocumentHighlightKind.Read
+            },
+            {
+                range: {
+                    start: {
+                        line: 0,
+                        character: 7
+                    },
+                    end: {
+                        line: 0,
+                        character: 10
+                    }
+                },
+                kind: DocumentHighlightKind.Read
+            }
+        ]);
+    });
+
+    it('provide word highlight for unsupported languages', () => {
+        const { plugin, document } = setup('<template lang="pug">\n  div\n  p</template>');
+
+        const highlight = plugin.findDocumentHighlight(document, Position.create(1, 5));
+
+        assert.deepStrictEqual(highlight, <DocumentHighlight[]>[
+            {
+                range: {
+                    start: {
+                        line: 1,
+                        character: 2
+                    },
+                    end: {
+                        line: 1,
+                        character: 5
+                    }
+                },
+                kind: DocumentHighlightKind.Text
+            }
+        ]);
+    });
 });
diff --git a/packages/language-server/test/plugins/svelte/SveltePlugin.test.ts b/packages/language-server/test/plugins/svelte/SveltePlugin.test.ts
index 1e57caea1..911e195e8 100644
--- a/packages/language-server/test/plugins/svelte/SveltePlugin.test.ts
+++ b/packages/language-server/test/plugins/svelte/SveltePlugin.test.ts
@@ -39,7 +39,7 @@ describe('Svelte Plugin', () => {
         const diagnostic = Diagnostic.create(
             Range.create(1, 0, 1, 21),
             isSvelte5Plus
-                ? '`<img>` element should have an alt attribute'
+                ? '`<img>` element should have an alt attribute\nhttps://svelte.dev/e/a11y_missing_attribute'
                 : 'A11y: <img> element should have an alt attribute',
             DiagnosticSeverity.Warning,
             isSvelte5Plus ? 'a11y_missing_attribute' : 'a11y-missing-attribute',
@@ -54,10 +54,12 @@ describe('Svelte Plugin', () => {
 
         const diagnostics = await plugin.getDiagnostics(document);
         const diagnostic = Diagnostic.create(
-            Range.create(0, 10, 0, 18),
-            isSvelte5Plus ? 'Can only bind to state or props' : 'whatever is not declared',
+            Range.create(0, isSvelte5Plus ? 5 : 10, 0, 18),
+            isSvelte5Plus
+                ? '`bind:whatever` is not a valid binding\nhttps://svelte.dev/e/bind_invalid_name'
+                : 'whatever is not declared',
             DiagnosticSeverity.Error,
-            isSvelte5Plus ? 'bind_invalid_value' : 'binding-undeclared',
+            isSvelte5Plus ? 'bind_invalid_name' : 'binding-undeclared',
             'svelte'
         );
 
diff --git a/packages/language-server/test/plugins/svelte/features/getDiagnostics.test.ts b/packages/language-server/test/plugins/svelte/features/getDiagnostics.test.ts
index e4e72b497..b41958228 100644
--- a/packages/language-server/test/plugins/svelte/features/getDiagnostics.test.ts
+++ b/packages/language-server/test/plugins/svelte/features/getDiagnostics.test.ts
@@ -471,7 +471,8 @@ describe('SveltePlugin#getDiagnostics', () => {
             {
                 range: { start: { line: 1, character: 15 }, end: { line: 1, character: 27 } },
                 message:
-                    "Component has unused export property 'name'. If it is for external reference only, please consider using `export const name`",
+                    "Component has unused export property 'name'. If it is for external reference only, please consider using `export const name`" +
+                    (isSvelte5Plus ? '\nhttps://svelte.dev/e/export_let_unused' : ''),
                 severity: 2,
                 source: 'svelte',
                 code: isSvelte5Plus ? 'export_let_unused' : 'unused-export-let'
@@ -489,7 +490,7 @@ describe('SveltePlugin#getDiagnostics', () => {
                 {
                     range: { start: { line: 1, character: 4 }, end: { line: 1, character: 26 } },
                     message: isSvelte5Plus
-                        ? 'Reactive declarations only exist at the top level of the instance script'
+                        ? 'Reactive declarations only exist at the top level of the instance script\nhttps://svelte.dev/e/reactive_declaration_invalid_placement'
                         : '$: has no effect in a module script',
                     severity: 2,
                     source: 'svelte',
@@ -511,7 +512,8 @@ describe('SveltePlugin#getDiagnostics', () => {
                 {
                     code: isSvelte5Plus ? 'export_let_unused' : 'unused-export-let',
                     message:
-                        "Component has unused export property 'unused1'. If it is for external reference only, please consider using `export const unused1`",
+                        "Component has unused export property 'unused1'. If it is for external reference only, please consider using `export const unused1`" +
+                        (isSvelte5Plus ? '\nhttps://svelte.dev/e/export_let_unused' : ''),
                     range: {
                         start: {
                             line: 5,
@@ -528,7 +530,8 @@ describe('SveltePlugin#getDiagnostics', () => {
                 {
                     code: isSvelte5Plus ? 'export_let_unused' : 'unused-export-let',
                     message:
-                        "Component has unused export property 'unused2'. If it is for external reference only, please consider using `export const unused2`",
+                        "Component has unused export property 'unused2'. If it is for external reference only, please consider using `export const unused2`" +
+                        (isSvelte5Plus ? '\nhttps://svelte.dev/e/export_let_unused' : ''),
                     range: {
                         start: {
                             line: 6,
diff --git a/packages/language-server/test/plugins/typescript/features/DocumentHighlightProvider.test.ts b/packages/language-server/test/plugins/typescript/features/DocumentHighlightProvider.test.ts
new file mode 100644
index 000000000..8cab8c662
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/features/DocumentHighlightProvider.test.ts
@@ -0,0 +1,274 @@
+import assert from 'assert';
+import path from 'path';
+import ts from 'typescript';
+import { DocumentHighlight, DocumentHighlightKind } from 'vscode-languageserver';
+import { Document, DocumentManager } from '../../../../src/lib/documents';
+import { LSConfigManager } from '../../../../src/ls-config';
+import { LSAndTSDocResolver } from '../../../../src/plugins';
+import { DocumentHighlightProviderImpl } from '../../../../src/plugins/typescript/features/DocumentHighlightProvider';
+import { pathToUrl } from '../../../../src/utils';
+import { serviceWarmup } from '../test-utils';
+
+const testDir = path.join(__dirname, '..');
+
+describe('DocumentHighlightProvider', function () {
+    const highlightTestDir = path.join(testDir, 'testfiles', 'document-highlight');
+    serviceWarmup(this, highlightTestDir);
+
+    function getFullPath(filename: string) {
+        return path.join(highlightTestDir, filename);
+    }
+
+    function setup(filename: string) {
+        const docManager = new DocumentManager(
+            (textDocument) => new Document(textDocument.uri, textDocument.text)
+        );
+        const lsAndTsDocResolver = new LSAndTSDocResolver(
+            docManager,
+            [testDir],
+            new LSConfigManager()
+        );
+        const provider = new DocumentHighlightProviderImpl(lsAndTsDocResolver);
+        const filePath = getFullPath(filename);
+        const document = docManager.openClientDocument({
+            uri: pathToUrl(filePath),
+            text: ts.sys.readFile(filePath) || ''
+        });
+        return { provider, document };
+    }
+
+    it('find document highlight', async () => {
+        const { document, provider } = setup('document-highlight.svelte');
+
+        const highlight = await provider.findDocumentHighlight(document, {
+            line: 1,
+            character: 9
+        });
+
+        assert.deepStrictEqual(highlight, <DocumentHighlight[]>[
+            {
+                range: {
+                    start: {
+                        line: 1,
+                        character: 8
+                    },
+                    end: {
+                        line: 1,
+                        character: 12
+                    }
+                },
+                kind: DocumentHighlightKind.Write
+            },
+            {
+                range: {
+                    start: {
+                        line: 3,
+                        character: 8
+                    },
+                    end: {
+                        line: 3,
+                        character: 12
+                    }
+                },
+                kind: DocumentHighlightKind.Read
+            },
+            {
+                range: {
+                    start: {
+                        line: 8,
+                        character: 1
+                    },
+                    end: {
+                        line: 8,
+                        character: 5
+                    }
+                },
+                kind: DocumentHighlightKind.Read
+            }
+        ]);
+    });
+
+    describe('DocumentHighlightProvider (svelte blocks/tags)', () => {
+        async function testSameHighlight(
+            content: string,
+            tests: number[],
+            expected: Array<[start: number, end: number]>
+        ) {
+            const { provider, document } = setup(content);
+
+            for (const position of tests) {
+                await testOne(document, provider, position, expected);
+            }
+        }
+
+        function setup(content: string) {
+            const docManager = new DocumentManager(
+                (textDocument) => new Document(textDocument.uri, textDocument.text)
+            );
+            const lsAndTsDocResolver = new LSAndTSDocResolver(
+                docManager,
+                [testDir],
+                new LSConfigManager()
+            );
+            const provider = new DocumentHighlightProviderImpl(lsAndTsDocResolver);
+            const filePath = getFullPath(`svelte.virtual${Math.random().toFixed(16)}.svelte`);
+            const document = docManager.openClientDocument({
+                uri: pathToUrl(filePath),
+                text: content
+            });
+            return { provider, document };
+        }
+
+        async function testOne(
+            document: Document,
+            provider: DocumentHighlightProviderImpl,
+            character: number,
+            expected: Array<[start: number, end: number]> | null
+        ) {
+            const documentHighlight = await provider.findDocumentHighlight(document, {
+                line: 0,
+                character
+            });
+
+            assert.deepStrictEqual(
+                documentHighlight?.sort(
+                    (a, b) => a.range.start.character - b.range.start.character
+                ),
+                expected?.map(
+                    ([start, end]): DocumentHighlight => ({
+                        kind: DocumentHighlightKind.Read,
+                        range: {
+                            start: { line: 0, character: start },
+                            end: { line: 0, character: end }
+                        }
+                    })
+                )
+            );
+        }
+
+        it('should return null for style and script', async () => {
+            const { provider, document } = setup('<style></style><script></script>');
+            await testOne(document, provider, 7, null);
+            await testOne(document, provider, 15, null);
+        });
+
+        it('get highlight for key block', async () => {
+            await testSameHighlight(
+                '{#key foo}{/key}',
+                [2, 12],
+                [
+                    [1, 5],
+                    [11, 15]
+                ]
+            );
+        });
+
+        it('get highlight for each block', async () => {
+            await testSameHighlight(
+                '{#each expression as name}{:else}{/each}',
+                [2, 28, 35],
+                [
+                    [1, 6],
+                    [27, 32],
+                    [34, 39]
+                ]
+            );
+        });
+
+        it('get highlight for if block', async () => {
+            await testSameHighlight(
+                '{#if expression}{:else}{/if}',
+                [2, 18, 25],
+                [
+                    [1, 4],
+                    [17, 22],
+                    [24, 27]
+                ]
+            );
+        });
+
+        it('get highlight for if block with else if', async () => {
+            await testSameHighlight(
+                '{#if expression}{:else if foo}{:else}{/if}',
+                [2, 18, 32, 39],
+                [
+                    [1, 4],
+                    [17, 25],
+                    [31, 36],
+                    [38, 41]
+                ]
+            );
+        });
+
+        it("doesn't get highlights from another if block nested inside", async () => {
+            const { provider, document } = setup('{#if expression}{:else if hi}{#if hi}{/if}{/if}');
+            await testOne(document, provider, 2, [
+                [1, 4],
+                [17, 25],
+                [43, 46]
+            ]);
+        });
+
+        it('highlight nested if block', async () => {
+            const { provider, document } = setup('{#if expression}{:else if hi}{#if hi}{/if}{/if}');
+            await testOne(document, provider, 31, [
+                [30, 33],
+                [38, 41]
+            ]);
+        });
+
+        it('get highlight for await block', async () => {
+            await testSameHighlight(
+                '{#await expression}{:then name}{:catch name}{/await}',
+                [2, 21, 33, 46],
+                [
+                    [1, 7],
+                    [20, 25],
+                    [32, 38],
+                    [45, 51]
+                ]
+            );
+        });
+
+        it('get highlight for await block (skip pending)', async () => {
+            await testSameHighlight(
+                '{#await expression then name} {/await}',
+                [2, 20, 31],
+                [
+                    [1, 7],
+                    [19, 23],
+                    [31, 37]
+                ]
+            );
+        });
+
+        it('get highlight for await block (skip pending and then)', async () => {
+            await testSameHighlight(
+                '{#await expression catch name}{/await}',
+                [2, 20, 31],
+                [
+                    [1, 7],
+                    [19, 24],
+                    [31, 37]
+                ]
+            );
+        });
+
+        it('get highlight for debug tag', async () => {
+            const { provider, document } = setup('{@debug name}');
+            await testOne(document, provider, 2, [[1, 7]]);
+        });
+
+        it('get highlight for html tag', async () => {
+            const { provider, document } = setup('{@html name}');
+            await testOne(document, provider, 2, [[1, 6]]);
+        });
+
+        it('get highlight for const tag', async () => {
+            const { provider, document } = setup(
+                '{#each expression as item}{@const name = item}{/each}'
+            );
+            await testOne(document, provider, 28, [[27, 33]]);
+        });
+    });
+});
diff --git a/packages/language-server/test/plugins/typescript/features/SelectionRangeProvider.test.ts b/packages/language-server/test/plugins/typescript/features/SelectionRangeProvider.test.ts
index 3156992bd..bd7d62cb4 100644
--- a/packages/language-server/test/plugins/typescript/features/SelectionRangeProvider.test.ts
+++ b/packages/language-server/test/plugins/typescript/features/SelectionRangeProvider.test.ts
@@ -15,16 +15,11 @@ const selectionRangeTestDir = path.join(testDir, 'testfiles', 'selection-range')
 describe('SelectionRangeProvider', function () {
     serviceWarmup(this, selectionRangeTestDir, pathToUrl(testDir));
 
-    function setup() {
+    function setup(fileName: string) {
         const docManager = new DocumentManager(
             (textDocument) => new Document(textDocument.uri, textDocument.text)
         );
-        const filePath = path.join(
-            testDir,
-            'testfiles',
-            'selection-range',
-            'selection-range.svelte'
-        );
+        const filePath = path.join(testDir, 'testfiles', 'selection-range', fileName);
         const lsAndTsDocResolver = new LSAndTSDocResolver(
             docManager,
             [pathToUrl(testDir)],
@@ -39,7 +34,7 @@ describe('SelectionRangeProvider', function () {
     }
 
     it('provides selection range', async () => {
-        const { provider, document } = setup();
+        const { provider, document } = setup('selection-range.svelte');
 
         const selectionRange = await provider.getSelectionRange(document, Position.create(1, 9));
 
@@ -72,8 +67,67 @@ describe('SelectionRangeProvider', function () {
         });
     });
 
+    it('provides selection range for import without semicolon', async () => {
+        const { provider, document } = setup('selection-range-import.svelte');
+
+        const selectionRange = await provider.getSelectionRange(document, Position.create(2, 28));
+
+        assert.deepStrictEqual(selectionRange, <SelectionRange>{
+            parent: {
+                parent: {
+                    parent: {
+                        parent: undefined,
+                        range: {
+                            end: {
+                                character: 34,
+                                line: 2
+                            },
+                            start: {
+                                character: 4,
+                                line: 1
+                            }
+                        }
+                    },
+                    // import {onMount} from 'svelte';
+                    range: {
+                        end: {
+                            character: 34,
+                            line: 2
+                        },
+                        start: {
+                            character: 4,
+                            line: 2
+                        }
+                    }
+                },
+                // 'svelte';
+                range: {
+                    end: {
+                        character: 34,
+                        line: 2
+                    },
+                    start: {
+                        character: 26,
+                        line: 2
+                    }
+                }
+            },
+            // svelte
+            range: {
+                end: {
+                    character: 33,
+                    line: 2
+                },
+                start: {
+                    character: 27,
+                    line: 2
+                }
+            }
+        });
+    });
+
     it('return null when in style', async () => {
-        const { provider, document } = setup();
+        const { provider, document } = setup('selection-range.svelte');
 
         const selectionRange = await provider.getSelectionRange(document, Position.create(5, 0));
 
diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/accessors-customElement-configs/input.svelte b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/accessors-customElement-configs/input.svelte
index 8e42f4d54..16da9c021 100644
--- a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/accessors-customElement-configs/input.svelte
+++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/accessors-customElement-configs/input.svelte
@@ -10,6 +10,6 @@
     $: c.abc = a.abc = ao.abc = '';
 </script>
 
-<CustomElement />
-<Accessors />
-<AccessorsAndOption />
\ No newline at end of file
+<CustomElement bind:this={c} />
+<Accessors bind:this={a} />
+<AccessorsAndOption bind:this={ao} />
diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/checkjs-nostrict/each-anytype/input.svelte b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/checkjs-nostrict/each-anytype/input.svelte
index ff088e6d2..26b3e1b84 100644
--- a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/checkjs-nostrict/each-anytype/input.svelte
+++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/checkjs-nostrict/each-anytype/input.svelte
@@ -1,5 +1,10 @@
 <script>
   let anyType;
+
+  async function load() {
+    anyType = (await (await fetch('')).json());
+  }
+  load();
 </script>
 
 {#each anyType as anyEntry}
diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expected_svelte_5.json b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expected_svelte_5.json
index aaa50c91c..df76add1c 100644
--- a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expected_svelte_5.json
+++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expected_svelte_5.json
@@ -17,7 +17,7 @@
         },
         "severity": 1,
         "source": "ts",
-        "message": "Type 'boolean' is not assignable to type 'never'.",
+        "message": "Type 'true' is not assignable to type 'never'.",
         "code": 2322,
         "tags": []
     },
diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expectedv2.json b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expectedv2.json
index e07ee0dc1..dcb9a3737 100644
--- a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expectedv2.json
+++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expectedv2.json
@@ -17,7 +17,7 @@
         },
         "severity": 1,
         "source": "ts",
-        "message": "Type 'boolean' is not assignable to type 'never'.",
+        "message": "Type 'true' is not assignable to type 'never'.",
         "code": 2322,
         "tags": []
     },
diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/const-tag-if/expectedv2.json b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/const-tag-if/expectedv2.json
index 8018999c4..ce8069af7 100644
--- a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/const-tag-if/expectedv2.json
+++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/const-tag-if/expectedv2.json
@@ -1,8 +1,8 @@
 [
     {
         "range": {
-            "start": { "line": 21, "character": 19 },
-            "end": { "line": 21, "character": 26 }
+            "start": { "line": 25, "character": 19 },
+            "end": { "line": 25, "character": 26 }
         },
         "severity": 1,
         "source": "ts",
@@ -12,8 +12,8 @@
     },
     {
         "range": {
-            "start": { "line": 21, "character": 40 },
-            "end": { "line": 21, "character": 47 }
+            "start": { "line": 25, "character": 40 },
+            "end": { "line": 25, "character": 47 }
         },
         "severity": 1,
         "source": "ts",
@@ -23,8 +23,8 @@
     },
     {
         "range": {
-            "start": { "line": 23, "character": 11 },
-            "end": { "line": 23, "character": 20 }
+            "start": { "line": 27, "character": 11 },
+            "end": { "line": 27, "character": 20 }
         },
         "severity": 1,
         "source": "ts",
@@ -34,8 +34,8 @@
     },
     {
         "range": {
-            "start": { "line": 25, "character": 11 },
-            "end": { "line": 25, "character": 18 }
+            "start": { "line": 29, "character": 11 },
+            "end": { "line": 29, "character": 18 }
         },
         "severity": 1,
         "source": "ts",
diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/const-tag-if/input.svelte b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/const-tag-if/input.svelte
index 0682ac5c0..04cc35743 100644
--- a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/const-tag-if/input.svelte
+++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/const-tag-if/input.svelte
@@ -1,5 +1,9 @@
 <script lang="ts">
     let value: string | number | boolean;
+
+    function handleClick() {
+        value = 'hello';
+    }
 </script>
 
 <!-- valid -->
@@ -9,7 +13,7 @@
 
     <div>{valueStr.substring(0)}{valueStr2.substring(0)}</div>
 
-    <button on:click={() => {valueStr.substring(0)}}></button>
+    <button on:click={() => {valueStr.substring(0) && handleClick()}}></button>
 {:else if typeof value === 'number'}
     {value.toFixed()}
 {/if}
@@ -24,4 +28,4 @@
     {value.substring(0)}
 {:else}
     {value.toFixed()}
-{/if}
\ No newline at end of file
+{/if}
diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/parser-error/expected_svelte_5.json b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/parser-error/expected_svelte_5.json
index c0fcc5b6d..65bcc0afb 100644
--- a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/parser-error/expected_svelte_5.json
+++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/parser-error/expected_svelte_5.json
@@ -3,7 +3,7 @@
         "range": { "start": { "line": 1, "character": 0 }, "end": { "line": 1, "character": 0 } },
         "severity": 1,
         "source": "js",
-        "message": "A component can have a single top-level `<style>` element",
+        "message": "A component can have a single top-level `<style>` element\nhttps://svelte.dev/e/style_duplicate",
         "code": -1
     }
 ]
diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/svelte-element-error/expected_svelte_5.json b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/svelte-element-error/expected_svelte_5.json
index 615d332f4..5add7b4db 100644
--- a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/svelte-element-error/expected_svelte_5.json
+++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/svelte-element-error/expected_svelte_5.json
@@ -3,7 +3,7 @@
         "range": { "start": { "line": 4, "character": 0 }, "end": { "line": 4, "character": 0 } },
         "severity": 1,
         "source": "ts",
-        "message": "`<svelte:element>` must have a 'this' attribute with a value",
+        "message": "`<svelte:element>` must have a 'this' attribute with a value\nhttps://svelte.dev/e/svelte_element_missing_this",
         "code": -1
     }
 ]
diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/unInitialized/expectedv2.json b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/unInitialized/expectedv2.json
index ad3362b5f..97a8fe2c6 100644
--- a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/unInitialized/expectedv2.json
+++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/unInitialized/expectedv2.json
@@ -1,6 +1,22 @@
 [
     {
-        "range": { "start": { "line": 3, "character": 4 }, "end": { "line": 3, "character": 6 } },
+        "range": { "start": { "line": 5, "character": 4 }, "end": { "line": 5, "character": 6 } },
+        "severity": 1,
+        "source": "ts",
+        "message": "Variable 'hi' is used before being assigned.",
+        "code": 2454,
+        "tags": []
+    },
+    {
+        "range": { "start": { "line": 7, "character": 4 }, "end": { "line": 7, "character": 7 } },
+        "severity": 1,
+        "source": "ts",
+        "message": "Variable 'hi3' is used before being assigned.",
+        "code": 2454,
+        "tags": []
+    },
+    {
+        "range": { "start": { "line": 16, "character": 1 }, "end": { "line": 16, "character": 3 } },
         "severity": 1,
         "source": "ts",
         "message": "Variable 'hi' is used before being assigned.",
diff --git a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/unInitialized/input.svelte b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/unInitialized/input.svelte
index 7c09c1f04..f566c0e34 100644
--- a/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/unInitialized/input.svelte
+++ b/packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/unInitialized/input.svelte
@@ -1,6 +1,19 @@
 <script lang="ts">
     let hi: string
+    export let hi2: string;
+    let hi3: string;
 
     hi.toString();
+    hi2.toString();
+    hi3.toString();
+
+    $: hi3.toString();
+
+    function setHi3() {
+        hi3 = 'hi3';
+    }
+    setHi3();
 </script>
-{hi}
\ No newline at end of file
+{hi}
+{hi2}
+{hi3}
diff --git a/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json b/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json
index bedfb19dd..614c9f646 100644
--- a/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json
+++ b/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json
@@ -12,8 +12,8 @@
                 "value": "MouseEvent",
                 "location": {
                     "range": {
-                        "start": { "line": 15340, "character": 10 },
-                        "end": { "line": 15340, "character": 20 }
+                        "start": { "line": 16152, "character": 10 },
+                        "end": { "line": 16152, "character": 20 }
                     },
                     "uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
                 }
diff --git a/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json b/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json
index 22ffb1aa7..eccc501c8 100644
--- a/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json
+++ b/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json
@@ -6,8 +6,8 @@
                 "value": "MouseEvent",
                 "location": {
                     "range": {
-                        "start": { "line": 15340, "character": 10 },
-                        "end": { "line": 15340, "character": 20 }
+                        "start": { "line": 16152, "character": 10 },
+                        "end": { "line": 16152, "character": 20 }
                     },
                     "uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
                 }
@@ -21,8 +21,8 @@
                 "value": "EventTarget",
                 "location": {
                     "range": {
-                        "start": { "line": 8284, "character": 10 },
-                        "end": { "line": 8284, "character": 21 }
+                        "start": { "line": 8694, "character": 10 },
+                        "end": { "line": 8694, "character": 21 }
                     },
                     "uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
                 }
@@ -32,8 +32,8 @@
                 "value": "HTMLButtonElement",
                 "location": {
                     "range": {
-                        "start": { "line": 9721, "character": 10 },
-                        "end": { "line": 9721, "character": 27 }
+                        "start": { "line": 10145, "character": 10 },
+                        "end": { "line": 10145, "character": 27 }
                     },
                     "uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
                 }
diff --git a/packages/language-server/test/plugins/typescript/testfiles/document-highlight/document-highlight.svelte b/packages/language-server/test/plugins/typescript/testfiles/document-highlight/document-highlight.svelte
new file mode 100644
index 000000000..22626b885
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/document-highlight/document-highlight.svelte
@@ -0,0 +1,9 @@
+<script>
+    let prop = 1;
+
+    if (prop) {
+
+    }
+</script>
+
+{prop}
\ No newline at end of file
diff --git a/packages/language-server/test/plugins/typescript/testfiles/selection-range/selection-range-import.svelte b/packages/language-server/test/plugins/typescript/testfiles/selection-range/selection-range-import.svelte
new file mode 100644
index 000000000..3895065f2
--- /dev/null
+++ b/packages/language-server/test/plugins/typescript/testfiles/selection-range/selection-range-import.svelte
@@ -0,0 +1,4 @@
+<script>
+    import {} from 'svelte'
+    import {onMount} from 'svelte'
+</script>
\ No newline at end of file
diff --git a/packages/svelte-check/package.json b/packages/svelte-check/package.json
index df5d66db3..3d6c82829 100644
--- a/packages/svelte-check/package.json
+++ b/packages/svelte-check/package.json
@@ -54,7 +54,7 @@
         "rollup-plugin-copy": "^3.4.0",
         "svelte": "^4.2.19",
         "svelte-language-server": "workspace:*",
-        "typescript": "~5.6.3",
+        "typescript": "^5.7.2",
         "vscode-languageserver": "8.0.2",
         "vscode-languageserver-protocol": "3.17.2",
         "vscode-languageserver-types": "3.17.2",
diff --git a/packages/svelte-vscode/package.json b/packages/svelte-vscode/package.json
index 30ab2dd03..de78f975b 100644
--- a/packages/svelte-vscode/package.json
+++ b/packages/svelte-vscode/package.json
@@ -399,6 +399,12 @@
                         "none",
                         "ts"
                     ]
+                },
+                "svelte.plugin.svelte.documentHighlight.enable": {
+                    "type": "boolean",
+                    "default": true,
+                    "title": "Svelte: Document Highlight",
+                    "description": "Enable document highlight support. Requires a restart."
                 }
             }
         },
@@ -732,7 +738,7 @@
         "@types/vscode": "^1.67",
         "js-yaml": "^3.14.0",
         "tslib": "^2.4.0",
-        "typescript": "~5.6.3",
+        "typescript": "^5.7.2",
         "vscode-tmgrammar-test": "^0.0.11"
     },
     "dependencies": {
diff --git a/packages/svelte-vscode/src/tsplugin.ts b/packages/svelte-vscode/src/tsplugin.ts
index 066b2afe6..2b0b46e9e 100644
--- a/packages/svelte-vscode/src/tsplugin.ts
+++ b/packages/svelte-vscode/src/tsplugin.ts
@@ -46,7 +46,7 @@ export class TsPlugin {
             return;
         }
 
-        const answers = ['Ask again later', "Don't show this message again", 'Enable Plugin'];
+        const answers = ['Enable', 'Later', 'Do not show again'];
         const response = await window.showInformationMessage(
             'The Svelte for VS Code extension now contains a TypeScript plugin. ' +
                 'Enabling it will provide intellisense for Svelte files from TS/JS files. ' +
@@ -55,9 +55,9 @@ export class TsPlugin {
             ...answers
         );
 
-        if (response === answers[2]) {
+        if (response === answers[0]) {
             workspace.getConfiguration('svelte').update('enable-ts-plugin', true, true);
-        } else if (response === answers[1]) {
+        } else if (response === answers[2]) {
             workspace.getConfiguration('svelte').update('ask-to-enable-ts-plugin', false, true);
         }
     }
diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
index c608983da..4797af3bc 100644
--- a/packages/svelte2tsx/package.json
+++ b/packages/svelte2tsx/package.json
@@ -40,7 +40,7 @@
         "svelte": "~4.2.19",
         "tiny-glob": "^0.2.6",
         "tslib": "^2.4.0",
-        "typescript": "~5.6.3"
+        "typescript": "^5.7.2"
     },
     "peerDependencies": {
         "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0",
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Attribute.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Attribute.ts
index 0ef4095cc..d68e24078 100644
--- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Attribute.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Attribute.ts
@@ -128,7 +128,14 @@ export function handleAttribute(
 
     if (attributeValueIsOfType(attr.value, 'AttributeShorthand')) {
         // For the attribute shorthand, the name will be the mapped part
-        addAttribute([[attr.value[0].start, attr.value[0].end]]);
+        let [start, end] = [attr.value[0].start, attr.value[0].end];
+        if (start === end) {
+            // Loose parsing mode, we have an empty attribute value, e.g. {}
+            // For proper intellisense we need to make this a non-empty expression.
+            start--;
+            str.overwrite(start, end, ' ', { contentOnly: true });
+        }
+        addAttribute([[start, end]]);
         return;
     } else {
         let name =
@@ -208,7 +215,14 @@ export function handleAttribute(
 
             addAttribute(attributeName, attributeValue);
         } else if (attrVal.type == 'MustacheTag') {
-            attributeValue.push(rangeWithTrailingPropertyAccess(str.original, attrVal.expression));
+            let [start, end] = rangeWithTrailingPropertyAccess(str.original, attrVal.expression);
+            if (start === end) {
+                // Loose parsing mode, we have an empty attribute value, e.g. attr={}
+                // For proper intellisense we need to make this a non-empty expression.
+                start--;
+                str.overwrite(start, end, ' ', { contentOnly: true });
+            }
+            attributeValue.push([start, end]);
             addAttribute(attributeName, attributeValue);
         }
         return;
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/AwaitPendingCatchBlock.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/AwaitPendingCatchBlock.ts
index 89a539e65..d322dd9c5 100644
--- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/AwaitPendingCatchBlock.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/AwaitPendingCatchBlock.ts
@@ -78,5 +78,5 @@ export function handleAwait(str: MagicString, awaitBlock: BaseNode): void {
         transforms.push('}');
     }
     transforms.push('}');
-    transform(str, awaitBlock.start, awaitBlock.end, awaitBlock.end, transforms);
+    transform(str, awaitBlock.start, awaitBlock.end, transforms);
 }
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/EachBlock.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/EachBlock.ts
index 51dcb950e..d10c96bb4 100644
--- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/EachBlock.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/EachBlock.ts
@@ -1,6 +1,11 @@
 import MagicString from 'magic-string';
 import { BaseNode } from '../../interfaces';
-import { getEnd, transform, TransformationArray } from '../utils/node-utils';
+import {
+    getEnd,
+    isImplicitlyClosedBlock,
+    transform,
+    TransformationArray
+} from '../utils/node-utils';
 
 /**
  * Transform #each into a for-of loop
@@ -65,7 +70,7 @@ export function handleEach(str: MagicString, eachBlock: BaseNode): void {
     if (eachBlock.key) {
         transforms.push([eachBlock.key.start, eachBlock.key.end], ';');
     }
-    transform(str, eachBlock.start, startEnd, startEnd, transforms);
+    transform(str, eachBlock.start, startEnd, transforms);
 
     const endEach = str.original.lastIndexOf('{', eachBlock.end - 1);
     // {/each} -> } or {:else} -> }
@@ -75,10 +80,18 @@ export function handleEach(str: MagicString, eachBlock: BaseNode): void {
         str.overwrite(elseStart, elseEnd + 1, '}' + (arrayAndItemVarTheSame ? '}' : ''), {
             contentOnly: true
         });
-        str.remove(endEach, eachBlock.end);
+
+        if (!isImplicitlyClosedBlock(endEach, eachBlock)) {
+            str.remove(endEach, eachBlock.end);
+        }
     } else {
-        str.overwrite(endEach, eachBlock.end, '}' + (arrayAndItemVarTheSame ? '}' : ''), {
-            contentOnly: true
-        });
+        const closing = '}' + (arrayAndItemVarTheSame ? '}' : '');
+        if (isImplicitlyClosedBlock(endEach, eachBlock)) {
+            str.prependLeft(eachBlock.end, closing);
+        } else {
+            str.overwrite(endEach, eachBlock.end, closing, {
+                contentOnly: true
+            });
+        }
     }
 }
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Element.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Element.ts
index 5b0b30285..e7d1b4a55 100644
--- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Element.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Element.ts
@@ -205,7 +205,7 @@ export class Element {
         }
 
         if (this.isSelfclosing) {
-            transform(this.str, this.startTagStart, this.startTagEnd, this.startTagEnd, [
+            transform(this.str, this.startTagStart, this.startTagEnd, [
                 // Named slot transformations go first inside a outer block scope because
                 // <div let:xx {x} /> means "use the x of let:x", and without a separate
                 // block scope this would give a "used before defined" error
@@ -217,7 +217,7 @@ export class Element {
                 ...this.endTransformation
             ]);
         } else {
-            transform(this.str, this.startTagStart, this.startTagEnd, this.startTagEnd, [
+            transform(this.str, this.startTagStart, this.startTagEnd, [
                 ...slotLetTransformation,
                 ...this.actionsTransformation,
                 ...this.getStartTransformation(),
@@ -230,7 +230,7 @@ export class Element {
                 .lastIndexOf(`</${this.node.name}`);
             // tagEndIdx === -1 happens in situations of unclosed tags like `<p>fooo <p>anothertag</p>`
             const endStart = tagEndIdx === -1 ? this.node.end : tagEndIdx + this.node.start;
-            transform(this.str, endStart, this.node.end, this.node.end, this.endTransformation);
+            transform(this.str, endStart, this.node.end, this.endTransformation);
         }
     }
 
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/IfElseBlock.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/IfElseBlock.ts
index b3380869f..658b13317 100644
--- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/IfElseBlock.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/IfElseBlock.ts
@@ -1,6 +1,6 @@
 import MagicString from 'magic-string';
 import { Node } from 'estree-walker';
-import { withTrailingPropertyAccess } from '../utils/node-utils';
+import { isImplicitlyClosedBlock, withTrailingPropertyAccess } from '../utils/node-utils';
 
 /**
  * Transforms #if and :else if to a regular if control block.
@@ -18,9 +18,13 @@ export function handleIf(str: MagicString, ifBlock: Node): void {
     const end = str.original.indexOf('}', expressionEnd);
     str.overwrite(expressionEnd, end + 1, '){');
 
-    // {/if} -> }
     const endif = str.original.lastIndexOf('{', ifBlock.end - 1);
-    str.overwrite(endif, ifBlock.end, '}');
+    if (isImplicitlyClosedBlock(endif, ifBlock)) {
+        str.prependLeft(ifBlock.end, '}');
+    } else {
+        // {/if} -> }
+        str.overwrite(endif, ifBlock.end, '}');
+    }
 }
 
 /**
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/InlineComponent.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/InlineComponent.ts
index b1bab058d..66f6d0818 100644
--- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/InlineComponent.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/InlineComponent.ts
@@ -207,7 +207,7 @@ export class InlineComponent {
 
         if (this.isSelfclosing) {
             this.endTransformation.push('}');
-            transform(this.str, this.startTagStart, this.startTagEnd, this.startTagEnd, [
+            transform(this.str, this.startTagStart, this.startTagEnd, [
                 // Named slot transformations go first inside a outer block scope because
                 // <Comp let:xx {x} /> means "use the x of let:x", and without a separate
                 // block scope this would give a "used before defined" error
@@ -221,17 +221,24 @@ export class InlineComponent {
                 ...this.endTransformation
             ]);
         } else {
-            const endStart =
-                this.str.original
-                    .substring(this.node.start, this.node.end)
-                    .lastIndexOf(`</${this.node.name}`) + this.node.start;
-            if (!this.node.name.startsWith('svelte:')) {
+            let endStart = this.str.original
+                .substring(this.node.start, this.node.end)
+                .lastIndexOf(`</${this.node.name}`);
+            if (endStart === -1) {
+                // Can happen in loose parsing mode when there's no closing tag
+                endStart = this.node.end;
+                this.startTagEnd = this.node.end - 1;
+            } else {
+                endStart += this.node.start;
+            }
+
+            if (!this.node.name.startsWith('svelte:') && endStart !== this.node.end) {
                 // Ensure the end tag is mapped, too. </Component> -> Component}
                 this.endTransformation.push([endStart + 2, endStart + this.node.name.length + 2]);
             }
             this.endTransformation.push('}');
 
-            transform(this.str, this.startTagStart, this.startTagEnd, this.startTagEnd, [
+            transform(this.str, this.startTagStart, this.startTagEnd, [
                 // See comment above why this goes first
                 ...namedSlotLetTransformation,
                 ...this.startTransformation,
@@ -241,7 +248,7 @@ export class InlineComponent {
                 snippetPropVariablesDeclaration,
                 ...defaultSlotLetTransformation
             ]);
-            transform(this.str, endStart, this.node.end, this.node.end, this.endTransformation);
+            transform(this.str, endStart, this.node.end, this.endTransformation);
         }
     }
 
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Key.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Key.ts
index 6f0ae9ebe..edf269d2b 100644
--- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Key.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Key.ts
@@ -1,6 +1,6 @@
 import MagicString from 'magic-string';
 import { BaseNode } from '../../interfaces';
-import { withTrailingPropertyAccess } from '../utils/node-utils';
+import { isImplicitlyClosedBlock, withTrailingPropertyAccess } from '../utils/node-utils';
 
 /**
  * {#key expr}content{/key}   --->   expr; content
@@ -14,5 +14,7 @@ export function handleKey(str: MagicString, keyBlock: BaseNode): void {
 
     // {/key}   ->
     const endKey = str.original.lastIndexOf('{', keyBlock.end - 1);
-    str.overwrite(endKey, keyBlock.end, '', { contentOnly: true });
+    if (!isImplicitlyClosedBlock(endKey, keyBlock)) {
+        str.overwrite(endKey, keyBlock.end, '', { contentOnly: true });
+    }
 }
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/SnippetBlock.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/SnippetBlock.ts
index 701e1b83a..7dd6633a8 100644
--- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/SnippetBlock.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/SnippetBlock.ts
@@ -1,6 +1,6 @@
 import MagicString from 'magic-string';
 import { BaseNode } from '../../interfaces';
-import { transform, TransformationArray } from '../utils/node-utils';
+import { isImplicitlyClosedBlock, transform, TransformationArray } from '../utils/node-utils';
 import { InlineComponent } from './InlineComponent';
 import { IGNORE_POSITION_COMMENT, surroundWithIgnoreComments } from '../../utils/ignore';
 import { Element } from './Element';
@@ -38,9 +38,13 @@ export function handleSnippet(
         ? `};return __sveltets_2_any(0)}`
         : `};return __sveltets_2_any(0)};`;
 
-    str.overwrite(endSnippet, snippetBlock.end, afterSnippet, {
-        contentOnly: true
-    });
+    if (isImplicitlyClosedBlock(endSnippet, snippetBlock)) {
+        str.prependLeft(snippetBlock.end, afterSnippet);
+    } else {
+        str.overwrite(endSnippet, snippetBlock.end, afterSnippet, {
+            contentOnly: true
+        });
+    }
 
     const lastParameter = snippetBlock.parameters?.at(-1);
 
@@ -63,7 +67,23 @@ export function handleSnippet(
     const afterParameters = ` => { async ()${IGNORE_POSITION_COMMENT} => {`;
 
     if (isImplicitProp) {
-        str.overwrite(snippetBlock.start, snippetBlock.expression.start, '', { contentOnly: true });
+        /** Can happen in loose parsing mode, e.g. code is currently `{#snippet }` */
+        const emptyId = snippetBlock.expression.start === snippetBlock.expression.end;
+
+        if (emptyId) {
+            // Give intellisense a way to map into the right position for implicit prop completion
+            str.overwrite(snippetBlock.start, snippetBlock.expression.start - 1, '', {
+                contentOnly: true
+            });
+            str.overwrite(snippetBlock.expression.start - 1, snippetBlock.expression.start, ' ', {
+                contentOnly: true
+            });
+        } else {
+            str.overwrite(snippetBlock.start, snippetBlock.expression.start, '', {
+                contentOnly: true
+            });
+        }
+
         const transforms: TransformationArray = ['('];
 
         if (parameters) {
@@ -82,12 +102,12 @@ export function handleSnippet(
 
         if (component instanceof InlineComponent) {
             component.addImplicitSnippetProp(
-                [snippetBlock.expression.start, snippetBlock.expression.end],
+                [snippetBlock.expression.start - (emptyId ? 1 : 0), snippetBlock.expression.end],
                 transforms
             );
         } else {
             component.addAttribute(
-                [[snippetBlock.expression.start, snippetBlock.expression.end]],
+                [[snippetBlock.expression.start - (emptyId ? 1 : 0), snippetBlock.expression.end]],
                 transforms
             );
         }
@@ -109,7 +129,7 @@ export function handleSnippet(
             afterParameters
         );
 
-        transform(str, snippetBlock.start, startEnd, startEnd, transforms);
+        transform(str, snippetBlock.start, startEnd, transforms);
     }
 }
 
diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/utils/node-utils.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/utils/node-utils.ts
index d3c95164a..0630c71b3 100644
--- a/packages/svelte2tsx/src/htmlxtojsx_v2/utils/node-utils.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx_v2/utils/node-utils.ts
@@ -27,7 +27,6 @@ export function transform(
     str: MagicString,
     start: number,
     end: number,
-    _xxx: number, // TODO
     transformations: TransformationArray
 ) {
     const moves: Array<[number, number]> = [];
@@ -128,6 +127,10 @@ export function transform(
     }
 
     for (let i = deletePos; i < moves.length; i++) {
+        // Can happen when there's not enough space left at the end of an unfininished element/component tag.
+        // Better to leave potentially slightly disarranged code than fail loudly
+        if (moves[i][1] >= end && moves[i][0] <= end) break;
+
         str.move(moves[i][0], moves[i][1], end);
     }
 }
@@ -243,3 +246,19 @@ export function isTypescriptNode(node: any) {
         node.type === 'TSNonNullExpression'
     );
 }
+
+/**
+ * Returns `true` if the given block is implicitly closed, which could be the case in loose parsing mode.
+ * E.g.:
+ * ```html
+ * <div>
+ *   {#if x}
+ * </div>
+ * ```
+ * @param end
+ * @param block
+ * @returns
+ */
+export function isImplicitlyClosedBlock(end: number, block: Node) {
+    return end < (block.children[block.children.length - 1]?.end ?? block.expression.end);
+}
diff --git a/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts b/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts
index 5df9a5281..c4f016398 100644
--- a/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts
@@ -49,6 +49,7 @@ function addGenericsComponentExport({
     fileName,
     mode,
     usesAccessors,
+    isTsFile,
     str,
     generics,
     usesSlots,
@@ -65,6 +66,8 @@ function addGenericsComponentExport({
         return `ReturnType<__sveltets_Render${genericsRef}['${forPart}']>`;
     }
 
+    // TODO once Svelte 4 compatibility is dropped, we can simplify this, because since TS 4.7 it is possible to use generics
+    // like this: `typeof render<T>` - which wasn't possibly before, hence the class + methods workaround.
     let statement = `
 class __sveltets_Render${genericsDef} {
     props() {
@@ -76,14 +79,23 @@ class __sveltets_Render${genericsDef} {
     slots() {
         return render${genericsRef}().slots;
     }
-${
-    isSvelte5
+`;
+
+    // For Svelte 5+ we assume TS > 4.7
+    if (isSvelte5 && !isTsFile && exportedNames.usesRunes()) {
+        statement = `
+class __sveltets_Render${genericsDef} {
+    props(): ReturnType<typeof render${genericsRef}>['props'] { return null as any; }
+    events(): ReturnType<typeof render${genericsRef}>['events'] { return null as any; }
+    slots(): ReturnType<typeof render${genericsRef}>['slots'] { return null as any; }
+`;
+    }
+
+    statement += isSvelte5
         ? `    bindings() { return ${exportedNames.createBindingsStr()}; }
     exports() { return ${exportedNames.hasExports() ? `render${genericsRef}().exports` : '{}'}; }
-}`
-        : '}'
-}
-`;
+}\n`
+        : '}\n';
 
     const svelteComponentClass = noSvelteComponentTyped
         ? 'SvelteComponent'
diff --git a/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts b/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts
index 6a929fe94..16f65d207 100644
--- a/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts
@@ -2,7 +2,11 @@ import MagicString from 'magic-string';
 import { Node } from 'estree-walker';
 import { ComponentEvents } from './nodes/ComponentEvents';
 import { InstanceScriptProcessResult } from './processInstanceScriptContent';
-import { surroundWithIgnoreComments } from '../utils/ignore';
+import {
+    IGNORE_END_COMMENT,
+    IGNORE_START_COMMENT,
+    surroundWithIgnoreComments
+} from '../utils/ignore';
 
 export interface CreateRenderFunctionPara extends InstanceScriptProcessResult {
     str: MagicString;
@@ -12,6 +16,7 @@ export interface CreateRenderFunctionPara extends InstanceScriptProcessResult {
     events: ComponentEvents;
     uses$$SlotsInterface: boolean;
     svelte5Plus: boolean;
+    isTsFile: boolean;
     mode?: 'ts' | 'dts';
 }
 
@@ -27,6 +32,7 @@ export function createRenderFunction({
     uses$$slots,
     uses$$SlotsInterface,
     generics,
+    isTsFile,
     mode
 }: CreateRenderFunctionPara) {
     const htmlx = str.original;
@@ -70,8 +76,12 @@ export function createRenderFunction({
                 end--;
             }
             str.overwrite(scriptTag.start + 1, start - 1, `function render`);
-            str.overwrite(start - 1, start, `<`); // if the generics are unused, only this char is colored opaque
-            str.overwrite(end, scriptTagEnd, `>() {${propsDecl}\n`);
+            str.overwrite(start - 1, start, isTsFile ? '<' : `<${IGNORE_START_COMMENT}`); // if the generics are unused, only this char is colored opaque
+            str.overwrite(
+                end,
+                scriptTagEnd,
+                `>${isTsFile ? '' : IGNORE_END_COMMENT}() {${propsDecl}\n`
+            );
         } else {
             str.overwrite(
                 scriptTag.start + 1,
diff --git a/packages/svelte2tsx/src/svelte2tsx/index.ts b/packages/svelte2tsx/src/svelte2tsx/index.ts
index 0b48cc607..b5e2a9e65 100644
--- a/packages/svelte2tsx/src/svelte2tsx/index.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/index.ts
@@ -48,6 +48,7 @@ export function svelte2tsx(
     const str = new MagicString(svelte);
     const basename = path.basename(options.filename || '');
     const svelte5Plus = Number(options.version![0]) > 4;
+    const isTsFile = options?.isTsFile;
 
     // process the htmlx as a svelte template
     let {
@@ -95,14 +96,7 @@ export function svelte2tsx(
         : instanceScriptTarget;
     const implicitStoreValues = new ImplicitStoreValues(resolvedStores, renderFunctionStart);
     //move the instance script and process the content
-    let exportedNames = new ExportedNames(
-        str,
-        0,
-        basename,
-        options?.isTsFile,
-        svelte5Plus,
-        isRunes
-    );
+    let exportedNames = new ExportedNames(str, 0, basename, isTsFile, svelte5Plus, isRunes);
     let generics = new Generics(str, 0, { attributes: [] } as any);
     let uses$$SlotsInterface = false;
     if (scriptTag) {
@@ -117,7 +111,7 @@ export function svelte2tsx(
             implicitStoreValues,
             options.mode,
             moduleAst,
-            options?.isTsFile,
+            isTsFile,
             basename,
             svelte5Plus,
             isRunes
@@ -148,6 +142,7 @@ export function svelte2tsx(
         uses$$SlotsInterface,
         generics,
         svelte5Plus,
+        isTsFile,
         mode: options.mode
     });
 
@@ -171,11 +166,13 @@ export function svelte2tsx(
     }
 
     if (moduleScriptTag || scriptTag) {
-        const allowed = exportedNames.hoistableInterfaces.getAllowedValues();
         for (const [start, end, globals] of rootSnippets) {
             const hoist_to_module =
                 moduleScriptTag &&
-                (globals.size === 0 || [...globals.keys()].every((id) => allowed.has(id)));
+                (globals.size === 0 ||
+                    [...globals.keys()].every((id) =>
+                        exportedNames.hoistableInterfaces.isAllowedReference(id)
+                    ));
 
             if (hoist_to_module) {
                 str.move(
@@ -195,7 +192,7 @@ export function svelte2tsx(
         str,
         canHaveAnyProp: !exportedNames.uses$$Props && (uses$$props || uses$$restProps),
         events,
-        isTsFile: options?.isTsFile,
+        isTsFile,
         exportedNames,
         usesAccessors,
         usesSlots: slots.size > 0,
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/HoistableInterfaces.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/HoistableInterfaces.ts
index 7ee4de9b9..bca4a25ce 100644
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/HoistableInterfaces.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/HoistableInterfaces.ts
@@ -5,8 +5,9 @@ import MagicString from 'magic-string';
  * Collects all imports and module-level declarations to then find out which interfaces/types are hoistable.
  */
 export class HoistableInterfaces {
-    private import_value_set: Set<string> = new Set();
-    private import_type_set: Set<string> = new Set();
+    private module_types: Set<string> = new Set();
+    private disallowed_types = new Set<string>();
+    private disallowed_values = new Set<string>();
     private interface_map: Map<
         string,
         { type_deps: Set<string>; value_deps: Set<string>; node: ts.Node }
@@ -18,6 +19,7 @@ export class HoistableInterfaces {
         value_deps: new Set<string>()
     };
 
+    /** should be called before analyzeInstanceScriptNode */
     analyzeModuleScriptNode(node: ts.Node) {
         // Handle Import Declarations
         if (ts.isImportDeclaration(node) && node.importClause) {
@@ -30,9 +32,7 @@ export class HoistableInterfaces {
                 node.importClause.namedBindings.elements.forEach((element) => {
                     const import_name = element.name.text;
                     if (is_type_only || element.isTypeOnly) {
-                        this.import_type_set.add(import_name);
-                    } else {
-                        this.import_value_set.add(import_name);
+                        this.module_types.add(import_name);
                     }
                 });
             }
@@ -41,9 +41,7 @@ export class HoistableInterfaces {
             if (node.importClause.name) {
                 const default_import = node.importClause.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(default_import);
-                } else {
-                    this.import_value_set.add(default_import);
+                    this.module_types.add(default_import);
                 }
             }
 
@@ -54,40 +52,17 @@ export class HoistableInterfaces {
             ) {
                 const namespace_import = node.importClause.namedBindings.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(namespace_import);
-                } else {
-                    this.import_value_set.add(namespace_import);
+                    this.module_types.add(namespace_import);
                 }
             }
         }
 
-        // Handle top-level declarations
-        if (ts.isVariableStatement(node)) {
-            node.declarationList.declarations.forEach((declaration) => {
-                if (ts.isIdentifier(declaration.name)) {
-                    this.import_value_set.add(declaration.name.text);
-                }
-            });
-        }
-
-        if (ts.isFunctionDeclaration(node) && node.name) {
-            this.import_value_set.add(node.name.text);
-        }
-
-        if (ts.isClassDeclaration(node) && node.name) {
-            this.import_value_set.add(node.name.text);
-        }
-
-        if (ts.isEnumDeclaration(node)) {
-            this.import_value_set.add(node.name.text);
-        }
-
         if (ts.isTypeAliasDeclaration(node)) {
-            this.import_type_set.add(node.name.text);
+            this.module_types.add(node.name.text);
         }
 
         if (ts.isInterfaceDeclaration(node)) {
-            this.import_type_set.add(node.name.text);
+            this.module_types.add(node.name.text);
         }
     }
 
@@ -103,9 +78,7 @@ export class HoistableInterfaces {
                 node.importClause.namedBindings.elements.forEach((element) => {
                     const import_name = element.name.text;
                     if (is_type_only) {
-                        this.import_type_set.add(import_name);
-                    } else {
-                        this.import_value_set.add(import_name);
+                        this.module_types.add(import_name);
                     }
                 });
             }
@@ -114,9 +87,7 @@ export class HoistableInterfaces {
             if (node.importClause.name) {
                 const default_import = node.importClause.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(default_import);
-                } else {
-                    this.import_value_set.add(default_import);
+                    this.module_types.add(default_import);
                 }
             }
 
@@ -127,9 +98,7 @@ export class HoistableInterfaces {
             ) {
                 const namespace_import = node.importClause.namedBindings.name.text;
                 if (is_type_only) {
-                    this.import_type_set.add(namespace_import);
-                } else {
-                    this.import_value_set.add(namespace_import);
+                    this.module_types.add(namespace_import);
                 }
             }
         }
@@ -167,9 +136,9 @@ export class HoistableInterfaces {
                 }
             });
 
-            if (this.import_type_set.has(interface_name)) {
-                // shadowed; delete because we can't hoist
-                this.import_type_set.delete(interface_name);
+            if (this.module_types.has(interface_name)) {
+                // shadowed; we can't hoist
+                this.disallowed_types.add(interface_name);
             } else {
                 this.interface_map.set(interface_name, {
                     type_deps: type_dependencies,
@@ -193,9 +162,9 @@ export class HoistableInterfaces {
                 generics
             );
 
-            if (this.import_type_set.has(alias_name)) {
-                // shadowed; delete because we can't hoist
-                this.import_type_set.delete(alias_name);
+            if (this.module_types.has(alias_name)) {
+                // shadowed; we can't hoist
+                this.disallowed_types.add(alias_name);
             } else {
                 this.interface_map.set(alias_name, {
                     type_deps: type_dependencies,
@@ -209,29 +178,21 @@ export class HoistableInterfaces {
         if (ts.isVariableStatement(node)) {
             node.declarationList.declarations.forEach((declaration) => {
                 if (ts.isIdentifier(declaration.name)) {
-                    this.import_value_set.delete(declaration.name.text);
+                    this.disallowed_values.add(declaration.name.text);
                 }
             });
         }
 
         if (ts.isFunctionDeclaration(node) && node.name) {
-            this.import_value_set.delete(node.name.text);
+            this.disallowed_values.add(node.name.text);
         }
 
         if (ts.isClassDeclaration(node) && node.name) {
-            this.import_value_set.delete(node.name.text);
+            this.disallowed_values.add(node.name.text);
         }
 
         if (ts.isEnumDeclaration(node)) {
-            this.import_value_set.delete(node.name.text);
-        }
-
-        if (ts.isTypeAliasDeclaration(node)) {
-            this.import_type_set.delete(node.name.text);
-        }
-
-        if (ts.isInterfaceDeclaration(node)) {
-            this.import_type_set.delete(node.name.text);
+            this.disallowed_values.add(node.name.text);
         }
     }
 
@@ -281,13 +242,26 @@ export class HoistableInterfaces {
                     continue;
                 }
 
-                const can_hoist = [...deps.type_deps, ...deps.value_deps].every((dep) => {
-                    return (
-                        this.import_type_set.has(dep) ||
-                        this.import_value_set.has(dep) ||
-                        hoistable_interfaces.has(dep)
-                    );
-                });
+                let can_hoist = true;
+
+                for (const dep of deps.type_deps) {
+                    if (this.disallowed_types.has(dep)) {
+                        this.disallowed_types.add(interface_name);
+                        can_hoist = false;
+                        break;
+                    }
+                    if (this.interface_map.has(dep) && !hoistable_interfaces.has(dep)) {
+                        can_hoist = false;
+                    }
+                }
+
+                for (const dep of deps.value_deps) {
+                    if (this.disallowed_values.has(dep)) {
+                        this.disallowed_types.add(interface_name);
+                        can_hoist = false;
+                        break;
+                    }
+                }
 
                 if (can_hoist) {
                     hoistable_interfaces.set(interface_name, deps.node);
@@ -301,11 +275,7 @@ export class HoistableInterfaces {
                 ...this.props_interface.type_deps,
                 ...this.props_interface.value_deps
             ].every((dep) => {
-                return (
-                    this.import_type_set.has(dep) ||
-                    this.import_value_set.has(dep) ||
-                    hoistable_interfaces.has(dep)
-                );
+                return !this.disallowed_types.has(dep) && !this.disallowed_values.has(dep);
             });
 
             if (can_hoist) {
@@ -328,7 +298,7 @@ export class HoistableInterfaces {
         if (!this.props_interface.name) return;
 
         for (const generic of generics) {
-            this.import_type_set.delete(generic);
+            this.disallowed_types.add(generic);
         }
 
         const hoistable = this.determineHoistableInterfaces();
@@ -362,8 +332,8 @@ export class HoistableInterfaces {
         }
     }
 
-    getAllowedValues() {
-        return this.import_value_set;
+    isAllowedReference(reference: string) {
+        return !this.disallowed_values.has(reference);
     }
 
     /**
diff --git a/packages/svelte2tsx/src/utils/htmlxparser.ts b/packages/svelte2tsx/src/utils/htmlxparser.ts
index 3757f8452..999621d70 100644
--- a/packages/svelte2tsx/src/utils/htmlxparser.ts
+++ b/packages/svelte2tsx/src/utils/htmlxparser.ts
@@ -114,7 +114,7 @@ function blankVerbatimContent(htmlx: string, verbatimElements: Node[]) {
 export function parseHtmlx(
     htmlx: string,
     parse: typeof import('svelte/compiler').parse,
-    options: { emitOnTemplateError?: boolean }
+    options: { emitOnTemplateError?: boolean; svelte5Plus: boolean }
 ) {
     //Svelte tries to parse style and script tags which doesn't play well with typescript, so we blank them out.
     //HTMLx spec says they should just be retained after processing as is, so this is fine
@@ -122,10 +122,16 @@ export function parseHtmlx(
     const deconstructed = blankVerbatimContent(htmlx, verbatimElements);
 
     //extract the html content parsed as htmlx this excludes our script and style tags
-    const parsingCode = options.emitOnTemplateError
-        ? blankPossiblyErrorOperatorOrPropertyAccess(deconstructed)
-        : deconstructed;
-    const htmlxAst = parse(parsingCode).html as any;
+    const parsingCode =
+        options.emitOnTemplateError && !options.svelte5Plus
+            ? blankPossiblyErrorOperatorOrPropertyAccess(deconstructed)
+            : deconstructed;
+    const htmlxAst = (
+        parse(
+            parsingCode,
+            options.svelte5Plus ? ({ loose: options.emitOnTemplateError } as any) : undefined
+        ) as any
+    ).html;
 
     //restore our script and style tags as nodes to maintain validity with HTMLx
     for (const s of verbatimElements) {
diff --git a/packages/svelte2tsx/test/helpers.ts b/packages/svelte2tsx/test/helpers.ts
index 7fa3f5acf..9b50f5774 100644
--- a/packages/svelte2tsx/test/helpers.ts
+++ b/packages/svelte2tsx/test/helpers.ts
@@ -56,7 +56,8 @@ export class Sample {
 
     constructor(
         dir: string,
-        readonly name: string
+        readonly name: string,
+        public emitOnTemplateError = false
     ) {
         this.directory = path.resolve(dir, 'samples', name);
         this.folder = fs.readdirSync(this.directory);
@@ -110,7 +111,7 @@ export class Sample {
 
         const sample = this;
 
-        _it(this.name, function () {
+        _it(this.name + (this.emitOnTemplateError ? ' (loose parser mode)' : ''), function () {
             try {
                 fn();
                 if (sample.skipped) this.skip();
@@ -237,7 +238,7 @@ export function test_samples(dir: string, transform: TransformSampleFn, js: 'js'
         const config = {
             filename: svelteFile,
             sampleName: sample.name,
-            emitOnTemplateError: false,
+            emitOnTemplateError: sample.emitOnTemplateError,
             preserveAttributeCase: sample.name.endsWith('-foreign-ns')
         };
 
@@ -382,6 +383,9 @@ export function get_svelte2tsx_config(base: BaseConfig, sampleName: string): Sve
 export function* each_sample(dir: string) {
     for (const name of fs.readdirSync(`${dir}/samples`)) {
         yield new Sample(dir, name);
+        if (isSvelte5Plus && !fs.existsSync(`${dir}/samples/${name}/expected.error.json`)) {
+            yield new Sample(dir, `${name}`, true);
+        }
     }
 }
 
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-binding/expected-svelte5.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-binding/expected-svelte5.js
index 7bb207fea..4e136e37c 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-binding/expected-svelte5.js
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-binding/expected-svelte5.js
@@ -1,3 +1,3 @@
-  { svelteHTML.createElement("input", { });obj = __sveltets_2_any(null);}
- { svelteHTML.createElement("input", { "bind:value":obj.,});/*Ωignore_startΩ*/() => obj = __sveltets_2_any(null);/*Ωignore_endΩ*/}
- { const $$_tupnI0C = __sveltets_2_ensureComponent(Input); const $$_tupnI0 = new $$_tupnI0C({ target: __sveltets_2_any(), props: {   value:obj.,}});/*Ωignore_startΩ*/() => obj = __sveltets_2_any(null);/*Ωignore_endΩ*/$$_tupnI0.$$bindings = 'value';}
\ No newline at end of file
+ { svelteHTML.createElement("input", { });obj. = __sveltets_2_any(null);}
+ { svelteHTML.createElement("input", { "bind:value":obj.,});/*Ωignore_startΩ*/() => obj. = __sveltets_2_any(null);/*Ωignore_endΩ*/}
+ { const $$_tupnI0C = __sveltets_2_ensureComponent(Input); const $$_tupnI0 = new $$_tupnI0C({ target: __sveltets_2_any(), props: {   value:obj.,}});/*Ωignore_startΩ*/() => obj. = __sveltets_2_any(null);/*Ωignore_endΩ*/$$_tupnI0.$$bindings = 'value';}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-empty-expression.v5/expected.error.json b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-empty-expression.v5/expected.error.json
new file mode 100644
index 000000000..f351fbbd7
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-empty-expression.v5/expected.error.json
@@ -0,0 +1,20 @@
+{
+    "code": "js_parse_error",
+    "message": "Unexpected token\nhttps://svelte.dev/e/js_parse_error",
+    "filename": "(unknown)",
+    "start": {
+        "line": 1,
+        "column": 6,
+        "character": 6
+    },
+    "end": {
+        "line": 1,
+        "column": 6,
+        "character": 6
+    },
+    "position": [
+        6,
+        6
+    ],
+    "frame": "1: <div>{}</div>\n         ^\n2: \n3: <div attr={}></div>"
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-empty-expression.v5/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-empty-expression.v5/expectedv2.js
new file mode 100644
index 000000000..cf23d1cda
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-empty-expression.v5/expectedv2.js
@@ -0,0 +1,7 @@
+ { svelteHTML.createElement("div", {});; }
+
+ { svelteHTML.createElement("div", {"attr": ,}); }
+ { svelteHTML.createElement("div", { ,}); }
+
+ { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: {"prop": ,}}); Component}
+ { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { ,}}); Component}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-empty-expression.v5/input.svelte b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-empty-expression.v5/input.svelte
new file mode 100644
index 000000000..aabd2d50e
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-empty-expression.v5/input.svelte
@@ -0,0 +1,7 @@
+<div>{}</div>
+
+<div attr={}></div>
+<div {}></div>
+
+<Component prop={}></Component>
+<Component {}></Component>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-block.v5/expected.error.json b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-block.v5/expected.error.json
new file mode 100644
index 000000000..73fd4ce8d
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-block.v5/expected.error.json
@@ -0,0 +1,20 @@
+{
+    "code": "element_invalid_closing_tag",
+    "message": "`</div>` attempted to close an element that was not open\nhttps://svelte.dev/e/element_invalid_closing_tag",
+    "filename": "(unknown)",
+    "start": {
+        "line": 3,
+        "column": 0,
+        "character": 20
+    },
+    "end": {
+        "line": 3,
+        "column": 0,
+        "character": 20
+    },
+    "position": [
+        20,
+        20
+    ],
+    "frame": "1: <div>\n2:     {#if foo}\n3: </div>\n   ^\n4: \n5: <div>"
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-block.v5/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-block.v5/expectedv2.js
new file mode 100644
index 000000000..b93c8d8cf
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-block.v5/expectedv2.js
@@ -0,0 +1,12 @@
+ { svelteHTML.createElement("div", {});
+    if(foo){
+} }
+
+ { svelteHTML.createElement("div", {});
+      for(let item of __sveltets_2_ensureArray(array)){
+        if(i){
+}} }
+
+ { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: {f:() => { async ()/*Ωignore_positionΩ*/ => {
+};return __sveltets_2_any(0)},}});/*Ωignore_startΩ*/const {f} = $$_tnenopmoC0.$$prop_def;/*Ωignore_endΩ*/
+     Component}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-block.v5/input.svelte b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-block.v5/input.svelte
new file mode 100644
index 000000000..4b4130816
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-block.v5/input.svelte
@@ -0,0 +1,12 @@
+<div>
+    {#if foo}
+</div>
+
+<div>
+    {#each array as item}
+        {#if i}
+</div>
+
+<Component>
+    {#snippet f}
+</Component>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-tag.v5/expected.error.json b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-tag.v5/expected.error.json
new file mode 100644
index 000000000..d7dea39f6
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-tag.v5/expected.error.json
@@ -0,0 +1,20 @@
+{
+    "code": "expected_token",
+    "message": "Expected token >\nhttps://svelte.dev/e/expected_token",
+    "filename": "(unknown)",
+    "start": {
+        "line": 3,
+        "column": 2,
+        "character": 24
+    },
+    "end": {
+        "line": 3,
+        "column": 2,
+        "character": 24
+    },
+    "position": [
+        24,
+        24
+    ],
+    "frame": "1: <div>\n2:     <Comp a={b}\n3: </div>\n     ^\n4: \n5: <div>"
+}
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-tag.v5/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-tag.v5/expectedv2.js
new file mode 100644
index 000000000..5b87c6c58
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-tag.v5/expectedv2.js
@@ -0,0 +1,6 @@
+ { svelteHTML.createElement("div", {});
+     { const $$_pmoC1C = __sveltets_2_ensureComponent(Comp); new $$_pmoC1C({ target: __sveltets_2_any(), props: { "a":b,}});
+} }
+
+ { svelteHTML.createElement("div", {});
+     { svelteHTML.createElement("span", { "a":b,});} }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-tag.v5/input.svelte b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-tag.v5/input.svelte
new file mode 100644
index 000000000..154202db2
--- /dev/null
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/editing-unclosed-tag.v5/input.svelte
@@ -0,0 +1,7 @@
+<div>
+    <Comp a={b}
+</div>
+
+<div>
+    <span a={b}
+</div>
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/generics-attribute.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/generics-attribute.v5/expectedv2.ts
new file mode 100644
index 000000000..2333b42ea
--- /dev/null
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/generics-attribute.v5/expectedv2.ts
@@ -0,0 +1,28 @@
+///<reference types="svelte" />
+;function render</*Ωignore_startΩ*/A, B extends keyof A, C extends boolean>/*Ωignore_endΩ*/() {
+
+    /** @typedef {{ a: A; b: B; c: C }}  $$ComponentProps *//** @type {$$ComponentProps} */
+    const { a, b, c } = $props();
+
+     function getA() {
+        return a;
+    }
+;
+async () => {};
+return { props: /** @type {$$ComponentProps} */({}), exports: /** @type {{getA: typeof getA}} */ ({}), bindings: __sveltets_$$bindings(''), slots: {}, events: {} }}
+class __sveltets_Render<A,B extends keyof A,C extends boolean> {
+    props(): ReturnType<typeof render<A,B,C>>['props'] { return null as any; }
+    events(): ReturnType<typeof render<A,B,C>>['events'] { return null as any; }
+    slots(): ReturnType<typeof render<A,B,C>>['slots'] { return null as any; }
+    bindings() { return __sveltets_$$bindings(''); }
+    exports() { return render<A,B,C>().exports; }
+}
+
+interface $$IsomorphicComponent {
+    new <A,B extends keyof A,C extends boolean>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<A,B,C>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<A,B,C>['props']>, ReturnType<__sveltets_Render<A,B,C>['events']>, ReturnType<__sveltets_Render<A,B,C>['slots']>> & { $$bindings?: ReturnType<__sveltets_Render<A,B,C>['bindings']> } & ReturnType<__sveltets_Render<A,B,C>['exports']>;
+    <A,B extends keyof A,C extends boolean>(internal: unknown, props: ReturnType<__sveltets_Render<A,B,C>['props']> & {}): ReturnType<__sveltets_Render<A,B,C>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any,any,any>['bindings']>;
+}
+const Input__SvelteComponent_: $$IsomorphicComponent = null as any;
+/*Ωignore_startΩ*/type Input__SvelteComponent_<A,B extends keyof A,C extends boolean> = InstanceType<typeof Input__SvelteComponent_<A,B,C>>;
+/*Ωignore_endΩ*/export default Input__SvelteComponent_;
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/generics-attribute.v5/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/generics-attribute.v5/input.svelte
new file mode 100644
index 000000000..304329dac
--- /dev/null
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/generics-attribute.v5/input.svelte
@@ -0,0 +1,8 @@
+<script generics="A, B extends keyof A, C extends boolean">
+    /** @type {{ a: A; b: B; c: C }} */
+    const { a, b, c } = $props();
+
+    export function getA() {
+        return a;
+    }
+</script>
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/expectedv2.ts
index 69587fe79..0c2610728 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/expectedv2.ts
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/expectedv2.ts
@@ -18,6 +18,11 @@ import { imported } from './x';
      { svelteHTML.createElement("div", {});module; }
 };return __sveltets_2_any(0)};  const hoistable7/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType<import('svelte').Snippet>/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => {
      { svelteHTML.createElement("div", {});imported; }
+};return __sveltets_2_any(0)};  const hoistable8/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType<import('svelte').Snippet>/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => {
+     { svelteHTML.createElement("div", {});global; }
+};return __sveltets_2_any(0)}; const hoistable9/*Ωignore_positionΩ*/ = (props: HTMLAttributes<HTMLDivElement>)/*Ωignore_startΩ*/: ReturnType<import('svelte').Snippet>/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => {  };return __sveltets_2_any(0)}; const hoistable10/*Ωignore_positionΩ*/ = (foo)/*Ωignore_startΩ*/: ReturnType<import('svelte').Snippet>/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => {
+  const bar = foo;
+  bar;
 };return __sveltets_2_any(0)};function render() {
   const not_hoistable/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType<import('svelte').Snippet>/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => {
      { svelteHTML.createElement("div", {});foo; }
@@ -40,6 +45,12 @@ async () => {
 
 
 
+
+
+
+
+
+
 
 
 
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/input.svelte
index 924dc61aa..fd7c1c4fd 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/input.svelte
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/input.svelte
@@ -35,6 +35,19 @@
     <div>{imported}</div>
 {/snippet}
 
+{#snippet hoistable8()}
+    <div>{global}</div>
+{/snippet}
+
+{#snippet hoistable9(props: HTMLAttributes<HTMLDivElement>)}
+    Referencing global types
+{/snippet}
+
+{#snippet hoistable10(foo)}
+  {@const bar = foo}
+  {bar}
+{/snippet}
+
 {#snippet not_hoistable()}
     <div>{foo}</div>
 {/snippet}
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/generic-attribute-const-modifier/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expected-svelte5.ts
similarity index 93%
rename from packages/svelte2tsx/test/svelte2tsx/samples/generic-attribute-const-modifier/expected-svelte5.ts
rename to packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expected-svelte5.ts
index b3b5e5088..90ca76530 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/generic-attribute-const-modifier/expected-svelte5.ts
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expected-svelte5.ts
@@ -4,7 +4,7 @@
  let items: T/*Ωignore_startΩ*/;items = __sveltets_2_any(items);/*Ωignore_endΩ*/;
 ;
 async () => {};
-return { props: {items: items}, exports: {}, bindings: "", slots: {}, events: {} }}
+return { props: {items: items} as {items: T}, exports: {}, bindings: "", slots: {}, events: {} }}
 class __sveltets_Render<const T extends readonly string[]> {
     props() {
         return render<T>().props;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/generic-attribute-const-modifier/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expectedv2.ts
similarity index 91%
rename from packages/svelte2tsx/test/svelte2tsx/samples/generic-attribute-const-modifier/expectedv2.ts
rename to packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expectedv2.ts
index 2d6b82d01..59aa438d6 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/generic-attribute-const-modifier/expectedv2.ts
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expectedv2.ts
@@ -4,7 +4,7 @@
  let items: T/*Ωignore_startΩ*/;items = __sveltets_2_any(items);/*Ωignore_endΩ*/;
 ;
 async () => {};
-return { props: {items: items}, slots: {}, events: {} }}
+return { props: {items: items} as {items: T}, slots: {}, events: {} }}
 class __sveltets_Render<const T extends readonly string[]> {
     props() {
         return render<T>().props;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/generic-attribute-const-modifier/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/input.svelte
similarity index 100%
rename from packages/svelte2tsx/test/svelte2tsx/samples/generic-attribute-const-modifier/input.svelte
rename to packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/input.svelte
diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
index 9f41a5dfe..0cb00eb55 100644
--- a/packages/typescript-plugin/package.json
+++ b/packages/typescript-plugin/package.json
@@ -24,7 +24,7 @@
     "license": "MIT",
     "devDependencies": {
         "@types/node": "^18.0.0",
-        "typescript": "~5.6.3",
+        "typescript": "^5.7.2",
         "svelte": "^4.2.19"
     },
     "dependencies": {
diff --git a/packages/typescript-plugin/src/utils.ts b/packages/typescript-plugin/src/utils.ts
index 1b14a6dbe..71425bc31 100644
--- a/packages/typescript-plugin/src/utils.ts
+++ b/packages/typescript-plugin/src/utils.ts
@@ -255,6 +255,14 @@ export function hasNodeModule(startPath: string, module: string) {
 }
 
 export function isSvelteProject(project: ts.server.Project) {
+    // internal api, the way to check requires checking the files config in tsconfig.json
+    // so we can't reimplement it without reading the tsconfig.json again
+    // The solution project is mostly just a container we don't need to patch it
+    // and having any files in this project cause TSServer to send config error while it originally won't
+    if ((project as any).isSolution?.()) {
+        return false;
+    }
+
     const projectDirectory = getProjectDirectory(project);
     if (projectDirectory) {
         return hasNodeModule(projectDirectory, 'svelte');
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8e27e7797..6745c3f39 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       typescript:
-        specifier: ~5.6.3
-        version: 5.6.3
+        specifier: ^5.7.2
+        version: 5.7.2
     devDependencies:
       cross-env:
         specifier: ^7.0.2
@@ -20,7 +20,7 @@ importers:
         version: 3.3.3
       ts-node:
         specifier: ^10.0.0
-        version: 10.9.1(@types/node@18.19.46)(typescript@5.6.3)
+        version: 10.9.1(@types/node@18.19.46)(typescript@5.7.2)
 
   packages/language-server:
     dependencies:
@@ -58,8 +58,8 @@ importers:
         specifier: workspace:~
         version: link:../svelte2tsx
       typescript:
-        specifier: ~5.6.3
-        version: 5.6.3
+        specifier: ^5.7.2
+        version: 5.7.2
       typescript-auto-import-cache:
         specifier: ^0.3.5
         version: 0.3.5
@@ -111,7 +111,7 @@ importers:
         version: 11.1.2
       ts-node:
         specifier: ^10.0.0
-        version: 10.9.1(@types/node@18.19.46)(typescript@5.6.3)
+        version: 10.9.1(@types/node@18.19.46)(typescript@5.7.2)
 
   packages/svelte-check:
     dependencies:
@@ -145,7 +145,7 @@ importers:
         version: 5.0.2(rollup@3.7.5)
       '@rollup/plugin-typescript':
         specifier: ^10.0.0
-        version: 10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.6.3)
+        version: 10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.7.2)
       '@types/sade':
         specifier: ^1.7.2
         version: 1.7.4
@@ -168,8 +168,8 @@ importers:
         specifier: workspace:*
         version: link:../language-server
       typescript:
-        specifier: ~5.6.3
-        version: 5.6.3
+        specifier: ^5.7.2
+        version: 5.7.2
       vscode-languageserver:
         specifier: 8.0.2
         version: 8.0.2
@@ -217,8 +217,8 @@ importers:
         specifier: ^2.4.0
         version: 2.5.2
       typescript:
-        specifier: ~5.6.3
-        version: 5.6.3
+        specifier: ^5.7.2
+        version: 5.7.2
       vscode-tmgrammar-test:
         specifier: ^0.0.11
         version: 0.0.11
@@ -249,7 +249,7 @@ importers:
         version: 15.0.2(rollup@3.7.5)
       '@rollup/plugin-typescript':
         specifier: ^10.0.0
-        version: 10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.6.3)
+        version: 10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.7.2)
       '@types/estree':
         specifier: ^0.0.42
         version: 0.0.42
@@ -299,8 +299,8 @@ importers:
         specifier: ^2.4.0
         version: 2.5.2
       typescript:
-        specifier: ~5.6.3
-        version: 5.6.3
+        specifier: ^5.7.2
+        version: 5.7.2
 
   packages/typescript-plugin:
     dependencies:
@@ -318,8 +318,8 @@ importers:
         specifier: ^4.2.19
         version: 4.2.19
       typescript:
-        specifier: ~5.6.3
-        version: 5.6.3
+        specifier: ^5.7.2
+        version: 5.7.2
 
 packages:
 
@@ -1281,8 +1281,8 @@ packages:
   typescript-auto-import-cache@0.3.5:
     resolution: {integrity: sha512-fAIveQKsoYj55CozUiBoj4b/7WpN0i4o74wiGY5JVUEoD0XiqDk1tJqTEjgzL2/AizKQrXxyRosSebyDzBZKjw==}
 
-  typescript@5.6.3:
-    resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==}
+  typescript@5.7.2:
+    resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -1496,11 +1496,11 @@ snapshots:
     optionalDependencies:
       rollup: 3.7.5
 
-  '@rollup/plugin-typescript@10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.6.3)':
+  '@rollup/plugin-typescript@10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.7.2)':
     dependencies:
       '@rollup/pluginutils': 5.0.2(rollup@3.7.5)
       resolve: 1.22.2
-      typescript: 5.6.3
+      typescript: 5.7.2
     optionalDependencies:
       rollup: 3.7.5
       tslib: 2.5.2
@@ -2329,7 +2329,7 @@ snapshots:
     dependencies:
       is-number: 7.0.0
 
-  ts-node@10.9.1(@types/node@18.19.46)(typescript@5.6.3):
+  ts-node@10.9.1(@types/node@18.19.46)(typescript@5.7.2):
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
       '@tsconfig/node10': 1.0.9
@@ -2343,7 +2343,7 @@ snapshots:
       create-require: 1.1.1
       diff: 4.0.2
       make-error: 1.3.6
-      typescript: 5.6.3
+      typescript: 5.7.2
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
@@ -2355,7 +2355,7 @@ snapshots:
     dependencies:
       semver: 7.5.1
 
-  typescript@5.6.3: {}
+  typescript@5.7.2: {}
 
   undici-types@5.26.5: {}
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/sveltejs/language-tools/compare/svelte-check-4.1.1...svelte-check-4.1.2.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/sveltejs/language-tools/compare/svelte-check-4.1.1...svelte-check-4.1.2.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/sveltejs/language-tools/compare/svelte-check-4.1.1...svelte-check-4.1.2.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/sveltejs/language-tools/compare/svelte-check-4.1.1...svelte-check-4.1.2.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>