fix: improve concise mode highlighting

Author: DylanPiercey

.changeset/fancy-bobcats-shout.md

@@ -0,0 +1,7 @@
+---
+"@marko/language-server": major
+"@marko/type-check": major
+"marko-vscode": major
+---
+
+Improve import tag shorthand regexp false positives.

.changeset/funny-ties-lay.md

@@ -0,0 +1,5 @@
+---
+"marko-vscode": patch
+---
+
+Fix syntax highlighting of nested closing bracketed section in concise mode.

packages/language-server/src/ts-plugin/host.ts

@@ -10,7 +10,7 @@ import type ts from "typescript/lib/tsserverlibrary";
 
 const fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
 const modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
-const importTagReg = /<([^>]+)>/;
+const importTagReg = /^<([^>]+)>$/;
 
 export interface ExtractedSnapshot extends Extracted {
   snapshot: ts.IScriptSnapshot;

packages/type-check/src/run.ts

@@ -38,7 +38,7 @@ const getCanonicalFileName = ts.sys.useCaseSensitiveFileNames
   ? (fileName: string) => fileName
   : (fileName: string) => fileName.toLowerCase();
 const fsPathReg = /^(?:[./\\]|[A-Z]:)/i;
-const importTagReg = /<([^>]+)>/;
+const importTagReg = /^<([^>]+)>$/;
 const modulePartsReg = /^((?:@(?:[^/]+)\/)?(?:[^/]+))(.*)$/;
 const isRemapExtensionReg = /\.ts$/;
 const isSourceMapExtensionReg = /\.map$/;

packages/vscode/syntaxes/marko.tmLanguage.json

@@ -382,7 +382,7 @@
             {
               "comment": "Concise Marko html-comment tag",
               "begin": "^(\\s*)(?=html-comment\\b)",
-              "while": "(?=^(?:[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
+              "while": "(?=^(?:\\s*[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
               "patterns": [
                 { "include": "#concise-open-tag-content" },
                 { "include": "#concise-comment-block" },
@@ -392,7 +392,7 @@
             {
               "comment": "Concise style tag less",
               "begin": "^(\\s*)(?=(?:html-)?style\\b[^\\s]*\\.less\\b)",
-              "while": "(?=^(?:[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
+              "while": "(?=^(?:\\s*[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
               "patterns": [
                 { "include": "#concise-open-tag-content" },
                 { "include": "#concise-style-block-less" },
@@ -402,7 +402,7 @@
             {
               "comment": "Concise style tag scss",
               "begin": "^(\\s*)(?=(?:html-)?style\\b[^\\s]*\\.scss\\b)",
-              "while": "(?=^(?:[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
+              "while": "(?=^(?:\\s*[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
               "patterns": [
                 { "include": "#concise-open-tag-content" },
                 { "include": "#concise-style-block-scss" },
@@ -412,7 +412,7 @@
             {
               "comment": "Concise style tag js/ts",
               "begin": "^(\\s*)(?=(?:html-)?style\\b[^\\s]*\\.[tj]s\\b)",
-              "while": "(?=^(?:[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
+              "while": "(?=^(?:\\s*[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
               "patterns": [
                 { "include": "#concise-open-tag-content" },
                 { "include": "#concise-script-block" },
@@ -422,7 +422,7 @@
             {
               "comment": "Concise style tag",
               "begin": "^(\\s*)(?=(?:html-)?style\\b)",
-              "while": "(?=^(?:[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
+              "while": "(?=^(?:\\s*[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
               "patterns": [
                 { "include": "#concise-open-tag-content" },
                 { "include": "#concise-style-block" },
@@ -432,7 +432,7 @@
             {
               "comment": "Concise script tag",
               "begin": "^(\\s*)(?=(?:html-)?script\\b)",
-              "while": "(?=^(?:[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
+              "while": "(?=^(?:\\s*[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
               "patterns": [
                 { "include": "#concise-open-tag-content" },
                 { "include": "#concise-script-block" },
@@ -442,7 +442,7 @@
             {
               "comment": "Normal concise tag",
               "begin": "^([ \\t]*)(?=[a-zA-Z0-9_$@.#])",
-              "while": "(?=^(?:[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
+              "while": "(?=^(?:\\s*[})\\]`]|\\*/|\\s*$|\\1\\s+(\\S|$)))",
               "patterns": [
                 { "include": "#concise-open-tag-content" },
                 { "include": "#content-concise-mode" }