Fix annotation nesting

Author: pomber

.changeset/six-windows-fold.md

@@ -0,0 +1,5 @@
+---
+"@code-hike/lighter": patch
+---
+
+Fix annotation nesting

lib/dist/index.cjs.js

@@ -1,6 +1,29 @@
 type LanguageAlias = "abap" | "actionscript-3" | "ada" | "apache" | "apex" | "apl" | "applescript" | "asm" | "astro" | "awk" | "ballerina" | "bat" | "batch" | "berry" | "be" | "bibtex" | "bicep" | "blade" | "c" | "cadence" | "cdc" | "clarity" | "clojure" | "clj" | "cmake" | "cobol" | "codeql" | "ql" | "coffee" | "cpp" | "crystal" | "csharp" | "c#" | "cs" | "css" | "cue" | "d" | "dart" | "diff" | "docker" | "dream-maker" | "elixir" | "elm" | "erb" | "erlang" | "erl" | "fish" | "fsharp" | "f#" | "fs" | "gherkin" | "git-commit" | "git-rebase" | "glsl" | "gnuplot" | "go" | "graphql" | "groovy" | "hack" | "haml" | "handlebars" | "hbs" | "haskell" | "hs" | "hcl" | "hlsl" | "html" | "http" | "imba" | "ini" | "java" | "javascript" | "js" | "jinja-html" | "json" | "json5" | "jsonc" | "jsonnet" | "jssm" | "fsl" | "jsx" | "julia" | "kotlin" | "latex" | "less" | "liquid" | "lisp" | "logo" | "lua" | "make" | "makefile" | "markdown" | "md" | "marko" | "matlab" | "mdx" | "mermaid" | "nginx" | "nim" | "nix" | "objective-c" | "objc" | "objective-cpp" | "ocaml" | "pascal" | "perl" | "php" | "plsql" | "postcss" | "powershell" | "ps" | "ps1" | "prisma" | "prolog" | "proto" | "pug" | "jade" | "puppet" | "purescript" | "python" | "py" | "r" | "raku" | "perl6" | "razor" | "rel" | "riscv" | "rst" | "ruby" | "rb" | "rust" | "rs" | "sas" | "sass" | "scala" | "scheme" | "scss" | "shaderlab" | "shader" | "shellscript" | "shell" | "bash" | "sh" | "zsh" | "smalltalk" | "solidity" | "sparql" | "sql" | "ssh-config" | "stata" | "stylus" | "styl" | "svelte" | "swift" | "system-verilog" | "tasl" | "tcl" | "tex" | "toml" | "tsx" | "turtle" | "twig" | "typescript" | "ts" | "v" | "vb" | "cmd" | "verilog" | "vhdl" | "viml" | "vim" | "vimscript" | "vue-html" | "vue" | "wasm" | "wenyan" | "文言" | "xml" | "xsl" | "yaml" | "yml" | "zenscript";
 type LanguageName = "abap" | "actionscript-3" | "ada" | "apache" | "apex" | "apl" | "applescript" | "asm" | "astro" | "awk" | "ballerina" | "bat" | "berry" | "bibtex" | "bicep" | "blade" | "c" | "cadence" | "clarity" | "clojure" | "cmake" | "cobol" | "codeql" | "coffee" | "cpp" | "crystal" | "csharp" | "css" | "cue" | "d" | "dart" | "diff" | "docker" | "dream-maker" | "elixir" | "elm" | "erb" | "erlang" | "fish" | "fsharp" | "gherkin" | "git-commit" | "git-rebase" | "glsl" | "gnuplot" | "go" | "graphql" | "groovy" | "hack" | "haml" | "handlebars" | "haskell" | "hcl" | "hlsl" | "html" | "http" | "imba" | "ini" | "java" | "javascript" | "jinja-html" | "json" | "json5" | "jsonc" | "jsonnet" | "jssm" | "jsx" | "julia" | "kotlin" | "latex" | "less" | "liquid" | "lisp" | "logo" | "lua" | "make" | "markdown" | "marko" | "matlab" | "mdx" | "mermaid" | "nginx" | "nim" | "nix" | "objective-c" | "objective-cpp" | "ocaml" | "pascal" | "perl" | "php" | "plsql" | "postcss" | "powershell" | "prisma" | "prolog" | "proto" | "pug" | "puppet" | "purescript" | "python" | "r" | "raku" | "razor" | "rel" | "riscv" | "rst" | "ruby" | "rust" | "sas" | "sass" | "scala" | "scheme" | "scss" | "shaderlab" | "shellscript" | "smalltalk" | "solidity" | "sparql" | "sql" | "ssh-config" | "stata" | "stylus" | "svelte" | "swift" | "system-verilog" | "tasl" | "tcl" | "tex" | "toml" | "tsx" | "turtle" | "twig" | "typescript" | "v" | "vb" | "verilog" | "vhdl" | "viml" | "vue-html" | "vue" | "wasm" | "wenyan" | "xml" | "xsl" | "yaml" | "zenscript";
 
+type RawTheme = {
+    name?: string;
+    type?: string;
+    tokenColors?: ThemeSetting[];
+    colors?: {
+        [key: string]: string;
+    };
+    [key: string]: any;
+};
+type ThemeSetting = {
+    name?: string;
+    scope?: string | string[];
+    settings: {
+        fontStyle?: string;
+        foreground?: string;
+        background?: string;
+    };
+};
+declare const ALL_NAMES: readonly ["dark-plus", "dracula-soft", "dracula", "github-dark", "github-dark-dimmed", "github-light", "light-plus", "material-darker", "material-default", "material-lighter", "material-ocean", "material-palenight", "min-dark", "min-light", "monokai", "nord", "one-dark-pro", "poimandres", "slack-dark", "slack-ochin", "solarized-dark", "solarized-light"];
+type NamesTuple = typeof ALL_NAMES;
+type StringTheme = NamesTuple[number];
+type Theme = StringTheme | RawTheme;
+
 type LineNumber = number;
 type ColumnNumber = number;
 type MultiLineRange = {
@@ -50,29 +73,6 @@ type LineGroup = {
 };
 type Lines = (Line | LineGroup)[];
 
-type RawTheme = {
-    name?: string;
-    type?: string;
-    tokenColors?: ThemeSetting[];
-    colors?: {
-        [key: string]: string;
-    };
-    [key: string]: any;
-};
-type ThemeSetting = {
-    name?: string;
-    scope?: string | string[];
-    settings: {
-        fontStyle?: string;
-        foreground?: string;
-        background?: string;
-    };
-};
-declare const ALL_NAMES: readonly ["dark-plus", "dracula-soft", "dracula", "github-dark", "github-dark-dimmed", "github-light", "light-plus", "material-darker", "material-default", "material-lighter", "material-ocean", "material-palenight", "min-dark", "min-light", "monokai", "nord", "one-dark-pro", "poimandres", "slack-dark", "slack-ochin", "solarized-dark", "solarized-light"];
-type NamesTuple = typeof ALL_NAMES;
-type StringTheme = NamesTuple[number];
-type Theme = StringTheme | RawTheme;
-
 declare class UnknownLanguageError extends Error {
     alias: string;
     constructor(alias: string);
@@ -117,4 +117,4 @@ declare class UnknownThemeError extends Error {
     constructor(theme: string);
 }
 
-export { Annotation, LanguageAlias, Lines, RawTheme, StringTheme, Theme, UnknownLanguageError, UnknownThemeError, annotatedHighlight, extractAnnotations, highlight };
+export { Annotation, LanguageAlias, Line, LineGroup, Lines, RawTheme, StringTheme, Theme, Token, TokenGroup, Tokens, UnknownLanguageError, UnknownThemeError, annotatedHighlight, extractAnnotations, highlight };

lib/dist/index.d.ts

@@ -2503,6 +2503,9 @@ function extractCommentsFromCode(code, grammar, annotationNames) {
         .map((line) => {
         const { annotations, lineWithoutComments } = getAnnotationsFromLine(line, annotationNames, lineNumber);
         allAnnotations.push(...annotations);
+        if (lineWithoutComments) {
+            lineNumber++;
+        }
         return lineWithoutComments;
     })
         .filter((line) => line !== null);
@@ -2588,6 +2591,7 @@ function annotateLine(line, annotations) {
             toColumn: columnNumber + token.content.length - 1,
             token,
         });
+        columnNumber += token.content.length;
     });
     annotations.forEach((annotation) => {
         annotatedLine = reannotateLine(annotatedLine, annotation);
@@ -2610,7 +2614,7 @@ function removeFakeGroups$1(group) {
     }
 }
 function reannotateLine(annotatedLine, annotation) {
-    const { range, name, query } = annotation;
+    const { range } = annotation;
     const { fromColumn, toColumn } = range;
     const newAnnotatedLine = [];
     let i = 0;
@@ -2631,8 +2635,9 @@ function reannotateLine(annotatedLine, annotation) {
     const firstGroup = annotatedLine[i];
     if (firstGroup.fromColumn < fromColumn) {
         // we need to split the first group in two
-        newGroup.tokens.push(Object.assign(Object.assign({}, firstGroup), { toColumn: fromColumn - 1 }));
-        newGroup.tokens.push(Object.assign(Object.assign({}, firstGroup), { fromColumn }));
+        const [firstHalf, secondHalf] = splitGroup$1(firstGroup, fromColumn);
+        newAnnotatedLine.push(firstHalf);
+        newGroup.tokens.push(secondHalf);
         i++;
     }
     while (i < annotatedLine.length && annotatedLine[i].toColumn < toColumn) {
@@ -2646,15 +2651,45 @@ function reannotateLine(annotatedLine, annotation) {
     const lastGroup = annotatedLine[i];
     if (lastGroup.toColumn > toColumn) {
         // we need to split the last group in two
-        newGroup.tokens.push(Object.assign(Object.assign({}, lastGroup), { toColumn }));
-        newGroup.tokens.push(Object.assign(Object.assign({}, lastGroup), { fromColumn: toColumn + 1 }));
+        const [firstHalf, secondHalf] = splitGroup$1(lastGroup, toColumn + 1);
+        newGroup.tokens.push(firstHalf);
+        newAnnotatedLine.push(secondHalf);
         i++;
     }
     while (i < annotatedLine.length) {
         newAnnotatedLine.push(annotatedLine[i]);
         i++;
     }
     return newAnnotatedLine;
+}
+function splitGroup$1(group, column) {
+    if ("token" in group) {
+        const firstToken = Object.assign(Object.assign({}, group.token), { content: group.token.content.slice(0, column - group.fromColumn) });
+        const secondToken = Object.assign(Object.assign({}, group.token), { content: group.token.content.slice(column - group.fromColumn) });
+        const firstGroup = Object.assign(Object.assign({}, group), { toColumn: column - 1, token: firstToken });
+        const secondGroup = Object.assign(Object.assign({}, group), { fromColumn: column, token: secondToken });
+        return [firstGroup, secondGroup];
+    }
+    else {
+        const firstTokens = [];
+        const secondTokens = [];
+        group.tokens.forEach((token) => {
+            if (token.toColumn < column) {
+                firstTokens.push(token);
+            }
+            else if (token.fromColumn >= column) {
+                secondTokens.push(token);
+            }
+            else {
+                const [firstGroup, secondGroup] = splitGroup$1(token, column);
+                firstTokens.push(firstGroup);
+                secondTokens.push(secondGroup);
+            }
+        });
+        const firstGroup = Object.assign(Object.assign({}, group), { toColumn: column - 1, tokens: firstTokens });
+        const secondGroup = Object.assign(Object.assign({}, group), { fromColumn: column, tokens: secondTokens });
+        return [firstGroup, secondGroup];
+    }
 }
 
 function annotateLines(lines, annotations) {
@@ -2707,8 +2742,9 @@ function reannotateLines(annotatedLines, annotation) {
     };
     const firstGroup = annotatedLines[i];
     if (firstGroup.fromLineNumber < fromLineNumber) {
-        newGroup.lines.push(Object.assign(Object.assign({}, firstGroup), { toLineNumber: fromLineNumber - 1 }));
-        newGroup.lines.push(Object.assign(Object.assign({}, firstGroup), { fromLineNumber }));
+        const [firstHalf, secondHalf] = splitGroup(firstGroup, fromLineNumber);
+        newAnnotatedLines.push(firstHalf);
+        newGroup.lines.push(secondHalf);
         i++;
     }
     while (i < annotatedLines.length &&
@@ -2722,15 +2758,45 @@ function reannotateLines(annotatedLines, annotation) {
     }
     const lastGroup = annotatedLines[i];
     if (lastGroup.toLineNumber > toLineNumber) {
-        newAnnotatedLines.push(Object.assign(Object.assign({}, lastGroup), { toLineNumber }));
-        newAnnotatedLines.push(Object.assign(Object.assign({}, lastGroup), { fromLineNumber: toLineNumber + 1 }));
+        const [firstHalf, secondHalf] = splitGroup(lastGroup, toLineNumber + 1);
+        newGroup.lines.push(firstHalf);
+        newAnnotatedLines.push(secondHalf);
         i++;
     }
     while (i < annotatedLines.length) {
         newAnnotatedLines.push(annotatedLines[i]);
         i++;
     }
     return newAnnotatedLines;
+}
+function splitGroup(group, lineNumber) {
+    if ("line" in group) {
+        return [
+            Object.assign(Object.assign({}, group), { toLineNumber: lineNumber - 1 }),
+            Object.assign(Object.assign({}, group), { fromLineNumber: lineNumber }),
+        ];
+    }
+    else {
+        const firstLines = [];
+        const secondLines = [];
+        group.lines.forEach((line) => {
+            if (line.toLineNumber < lineNumber) {
+                firstLines.push(line);
+            }
+            else if (line.fromLineNumber >= lineNumber) {
+                secondLines.push(line);
+            }
+            else {
+                const [firstLine, secondLine] = splitGroup(line, lineNumber);
+                firstLines.push(firstLine);
+                secondLines.push(secondLine);
+            }
+        });
+        return [
+            Object.assign(Object.assign({}, group), { toLineNumber: lineNumber - 1, lines: firstLines }),
+            Object.assign(Object.assign({}, group), { fromLineNumber: lineNumber, lines: secondLines }),
+        ];
+    }
 }
 
 function applyAnnotations(lines, annotations) {