Remove empty lines

antfu · Jan 26, 2024 · 22d89a8 · 22d89a8
1 parent 0cac5a7
commit 22d89a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/shikiji-transformers/src/shared/highlight-word.ts b/packages/shikiji-transformers/src/shared/highlight-word.ts
@@ -31,7 +31,7 @@ function highlightRange(elements: ElementContent[], ignoredElement: Element | nu
       continue
 
     // check if it is overlapped with highlight range
-    if (hasOverlap([currentIdx - 1, textNode.value.length], [index, len])) {
+    if (hasOverlap([currentIdx, currentIdx + textNode.value.length - 1], [index, index + len])) {
       const start = Math.max(0, index - currentIdx)
       const length = len - Math.max(0, currentIdx - index)
 
@@ -51,8 +51,8 @@ function highlightRange(elements: ElementContent[], ignoredElement: Element | nu
   }
 }
 
-function hasOverlap(range1: [idx: number, len: number], range2: [idx: number, len: number]): boolean {
-  return (range1[0] <= range2[0] + range2[1]) && (range1[0] + range1[1]) >= range2[0]
+function hasOverlap(range1: [number, number], range2: [ number, number]): boolean {
+  return (range1[0] <= range2[1]) && (range1[1]) >= range2[0]
 }
 
 function separateToken(span: Element, textNode: Text, index: number, len: number): [

diff --git a/packages/shikiji-transformers/test/fixtures/highlight-word/complex.js.output.html b/packages/shikiji-transformers/test/fixtures/highlight-word/complex.js.output.html
@@ -1,4 +1,4 @@
-<pre class="shiki github-dark" style="background-color:#24292e;color:#e1e4e8" tabindex="0"><code><span class="line"><span style="color:#F97583">export</span><span style="color:#F97583"> function</span><span style="color:#B392F0"> transformerNotationFocus</span><span style="color:#E1E4E8">(</span></span><span class="line"><span style="color:#FFAB70">  options</span><span style="color:#F97583"> =</span><span style="color:#E1E4E8"> {}, </span></span><span class="line"><span style="color:#E1E4E8">) {</span></span><span class="line"><span style="color:#F97583">  const</span><span style="color:#79B8FF"> options</span><span style="color:#F97583"> =</span><span style="color:#9ECBFF"> 'options'</span></span><span class="line"><span style="color:#E1E4E8">  </span><span style="color:#E1E4E8" class="highlighted-word">console.</span><span style="color:#B392F0" class="highlighted-word">log</span><span style="color:#E1E4E8">(options)</span></span><span class="line"><span style="color:#E1E4E8">  </span><span style="color:#E1E4E8" class="highlighted-word">options.a</span><span style="color:#E1E4E8"> </span><span style="color:#F97583" class="highlighted-word"></span><span style="color:#F97583">=</span><span style="color:#9ECBFF"> "HELLO"</span></span><span class="line"><span style="color:#E1E4E8">  console.</span><span style="color:#B392F0">log</span><span style="color:#E1E4E8">(</span><span style="color:#9ECBFF">'// [!code word:</span><span style="color:#9ECBFF" class="highlighted-word">options.a</span><span style="color:#9ECBFF">]'</span><span style="color:#E1E4E8">)</span></span><span class="line"><span style="color:#E1E4E8">}</span></span><span class="line"></span></code></pre>
+<pre class="shiki github-dark" style="background-color:#24292e;color:#e1e4e8" tabindex="0"><code><span class="line"><span style="color:#F97583">export</span><span style="color:#F97583"> function</span><span style="color:#B392F0"> transformerNotationFocus</span><span style="color:#E1E4E8">(</span></span><span class="line"><span style="color:#FFAB70">  options</span><span style="color:#F97583"> =</span><span style="color:#E1E4E8"> {}, </span></span><span class="line"><span style="color:#E1E4E8">) {</span></span><span class="line"><span style="color:#F97583">  const</span><span style="color:#79B8FF"> options</span><span style="color:#F97583"> =</span><span style="color:#9ECBFF"> 'options'</span></span><span class="line"><span style="color:#E1E4E8">  </span><span style="color:#E1E4E8" class="highlighted-word">console.</span><span style="color:#B392F0" class="highlighted-word">log</span><span style="color:#E1E4E8">(options)</span></span><span class="line"><span style="color:#E1E4E8">  </span><span style="color:#E1E4E8" class="highlighted-word">options.a</span><span style="color:#E1E4E8"> </span><span style="color:#F97583">=</span><span style="color:#9ECBFF"> "HELLO"</span></span><span class="line"><span style="color:#E1E4E8">  console.</span><span style="color:#B392F0">log</span><span style="color:#E1E4E8">(</span><span style="color:#9ECBFF">'// [!code word:</span><span style="color:#9ECBFF" class="highlighted-word">options.a</span><span style="color:#9ECBFF">]'</span><span style="color:#E1E4E8">)</span></span><span class="line"><span style="color:#E1E4E8">}</span></span><span class="line"></span></code></pre>
 <style>
 body { margin: 0; }
 .shiki { padding: 1em; }