@pierre/diffs 1.3.0-beta.9 → 1.3.0-rc.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (219) hide show
  1. package/dist/components/CodeView.d.ts +12 -12
  2. package/dist/components/CodeView.d.ts.map +1 -1
  3. package/dist/components/CodeView.js +49 -42
  4. package/dist/components/CodeView.js.map +1 -1
  5. package/dist/components/File.d.ts +7 -2
  6. package/dist/components/File.d.ts.map +1 -1
  7. package/dist/components/File.js +36 -8
  8. package/dist/components/File.js.map +1 -1
  9. package/dist/components/FileDiff.d.ts +34 -6
  10. package/dist/components/FileDiff.d.ts.map +1 -1
  11. package/dist/components/FileDiff.js +198 -17
  12. package/dist/components/FileDiff.js.map +1 -1
  13. package/dist/components/VirtualizedFile.d.ts +2 -1
  14. package/dist/components/VirtualizedFile.d.ts.map +1 -1
  15. package/dist/components/VirtualizedFile.js +9 -5
  16. package/dist/components/VirtualizedFile.js.map +1 -1
  17. package/dist/components/VirtualizedFileDiff.d.ts +14 -0
  18. package/dist/components/VirtualizedFileDiff.d.ts.map +1 -1
  19. package/dist/components/VirtualizedFileDiff.js +61 -3
  20. package/dist/components/VirtualizedFileDiff.js.map +1 -1
  21. package/dist/components/Virtualizer.d.ts +14 -2
  22. package/dist/components/Virtualizer.d.ts.map +1 -1
  23. package/dist/components/Virtualizer.js +27 -2
  24. package/dist/components/Virtualizer.js.map +1 -1
  25. package/dist/edit/index.d.ts +5 -0
  26. package/dist/edit/index.js +3 -0
  27. package/dist/editor/command.d.ts +1 -1
  28. package/dist/editor/command.d.ts.map +1 -1
  29. package/dist/editor/command.js +11 -0
  30. package/dist/editor/command.js.map +1 -1
  31. package/dist/editor/editStack.d.ts +6 -2
  32. package/dist/editor/editStack.d.ts.map +1 -1
  33. package/dist/editor/editStack.js +53 -12
  34. package/dist/editor/editStack.js.map +1 -1
  35. package/dist/editor/editor.d.ts +51 -23
  36. package/dist/editor/editor.d.ts.map +1 -1
  37. package/dist/editor/editor.js +978 -238
  38. package/dist/editor/editor.js.map +1 -1
  39. package/dist/editor/editor2.js +1 -1
  40. package/dist/editor/languages.d.ts +26 -0
  41. package/dist/editor/languages.d.ts.map +1 -0
  42. package/dist/editor/languages.js +363 -0
  43. package/dist/editor/languages.js.map +1 -0
  44. package/dist/editor/lineAnnotations.d.ts.map +1 -1
  45. package/dist/editor/lineAnnotations.js +25 -26
  46. package/dist/editor/lineAnnotations.js.map +1 -1
  47. package/dist/editor/marker.d.ts +5 -3
  48. package/dist/editor/marker.d.ts.map +1 -1
  49. package/dist/editor/marker.js +111 -91
  50. package/dist/editor/marker.js.map +1 -1
  51. package/dist/editor/matchBrackets.d.ts +3 -2
  52. package/dist/editor/matchBrackets.d.ts.map +1 -1
  53. package/dist/editor/matchBrackets.js +2 -10
  54. package/dist/editor/matchBrackets.js.map +1 -1
  55. package/dist/editor/pieceTable.d.ts +2 -1
  56. package/dist/editor/pieceTable.d.ts.map +1 -1
  57. package/dist/editor/pieceTable.js +103 -39
  58. package/dist/editor/pieceTable.js.map +1 -1
  59. package/dist/editor/platform.js +2 -0
  60. package/dist/editor/platform.js.map +1 -1
  61. package/dist/editor/popover.d.ts +25 -5
  62. package/dist/editor/popover.d.ts.map +1 -1
  63. package/dist/editor/popover.js +60 -14
  64. package/dist/editor/popover.js.map +1 -1
  65. package/dist/editor/searchPanel.d.ts.map +1 -1
  66. package/dist/editor/searchPanel.js +9 -2
  67. package/dist/editor/searchPanel.js.map +1 -1
  68. package/dist/editor/selection.d.ts +31 -11
  69. package/dist/editor/selection.d.ts.map +1 -1
  70. package/dist/editor/selection.js +198 -70
  71. package/dist/editor/selection.js.map +1 -1
  72. package/dist/editor/selectionAction.d.ts +4 -3
  73. package/dist/editor/selectionAction.d.ts.map +1 -1
  74. package/dist/editor/selectionAction.js +9 -5
  75. package/dist/editor/selectionAction.js.map +1 -1
  76. package/dist/editor/stateStorage.d.ts +15 -0
  77. package/dist/editor/stateStorage.d.ts.map +1 -0
  78. package/dist/editor/stateStorage.js +65 -0
  79. package/dist/editor/stateStorage.js.map +1 -0
  80. package/dist/editor/textDocument.d.ts +12 -77
  81. package/dist/editor/textDocument.d.ts.map +1 -1
  82. package/dist/editor/textDocument.js +76 -34
  83. package/dist/editor/textDocument.js.map +1 -1
  84. package/dist/editor/textMeasure.d.ts +7 -12
  85. package/dist/editor/textMeasure.d.ts.map +1 -1
  86. package/dist/editor/textMeasure.js +40 -32
  87. package/dist/editor/textMeasure.js.map +1 -1
  88. package/dist/editor/{tokenzier.d.ts → tokenizer.d.ts} +3 -3
  89. package/dist/editor/tokenizer.d.ts.map +1 -0
  90. package/dist/editor/{tokenzier.js → tokenizer.js} +91 -26
  91. package/dist/editor/tokenizer.js.map +1 -0
  92. package/dist/editor/utils.js +1 -1
  93. package/dist/editor/utils.js.map +1 -1
  94. package/dist/index.d.ts +4 -3
  95. package/dist/index.js +6 -5
  96. package/dist/managers/InteractionManager.d.ts +18 -7
  97. package/dist/managers/InteractionManager.d.ts.map +1 -1
  98. package/dist/managers/InteractionManager.js +154 -99
  99. package/dist/managers/InteractionManager.js.map +1 -1
  100. package/dist/managers/UniversalRenderingManager.d.ts.map +1 -1
  101. package/dist/managers/UniversalRenderingManager.js +1 -2
  102. package/dist/managers/UniversalRenderingManager.js.map +1 -1
  103. package/dist/react/CodeView.d.ts +13 -13
  104. package/dist/react/CodeView.d.ts.map +1 -1
  105. package/dist/react/CodeView.js +38 -29
  106. package/dist/react/CodeView.js.map +1 -1
  107. package/dist/react/EditContext.d.ts +20 -0
  108. package/dist/react/EditContext.d.ts.map +1 -0
  109. package/dist/react/EditContext.js +20 -0
  110. package/dist/react/EditContext.js.map +1 -0
  111. package/dist/react/File.d.ts +2 -1
  112. package/dist/react/File.d.ts.map +1 -1
  113. package/dist/react/File.js +3 -2
  114. package/dist/react/File.js.map +1 -1
  115. package/dist/react/FileDiff.d.ts +2 -2
  116. package/dist/react/FileDiff.d.ts.map +1 -1
  117. package/dist/react/FileDiff.js +3 -2
  118. package/dist/react/FileDiff.js.map +1 -1
  119. package/dist/react/MultiFileDiff.d.ts +2 -2
  120. package/dist/react/MultiFileDiff.d.ts.map +1 -1
  121. package/dist/react/MultiFileDiff.js +3 -2
  122. package/dist/react/MultiFileDiff.js.map +1 -1
  123. package/dist/react/PatchDiff.d.ts +2 -2
  124. package/dist/react/PatchDiff.d.ts.map +1 -1
  125. package/dist/react/PatchDiff.js +3 -2
  126. package/dist/react/PatchDiff.js.map +1 -1
  127. package/dist/react/UnresolvedFile.d.ts +1 -1
  128. package/dist/react/UnresolvedFile.js.map +1 -1
  129. package/dist/react/index.d.ts +4 -4
  130. package/dist/react/index.js +3 -3
  131. package/dist/react/types.d.ts +9 -1
  132. package/dist/react/types.d.ts.map +1 -1
  133. package/dist/react/utils/useFileDiffInstance.d.ts +5 -3
  134. package/dist/react/utils/useFileDiffInstance.d.ts.map +1 -1
  135. package/dist/react/utils/useFileDiffInstance.js +28 -27
  136. package/dist/react/utils/useFileDiffInstance.js.map +1 -1
  137. package/dist/react/utils/useFileInstance.d.ts +5 -3
  138. package/dist/react/utils/useFileInstance.d.ts.map +1 -1
  139. package/dist/react/utils/useFileInstance.js +29 -25
  140. package/dist/react/utils/useFileInstance.js.map +1 -1
  141. package/dist/react/utils/useUnresolvedFileInstance.js +3 -3
  142. package/dist/react/utils/useUnresolvedFileInstance.js.map +1 -1
  143. package/dist/renderers/DiffHunksRenderer.d.ts +33 -1
  144. package/dist/renderers/DiffHunksRenderer.d.ts.map +1 -1
  145. package/dist/renderers/DiffHunksRenderer.js +134 -21
  146. package/dist/renderers/DiffHunksRenderer.js.map +1 -1
  147. package/dist/renderers/FileRenderer.d.ts +2 -0
  148. package/dist/renderers/FileRenderer.d.ts.map +1 -1
  149. package/dist/renderers/FileRenderer.js +33 -11
  150. package/dist/renderers/FileRenderer.js.map +1 -1
  151. package/dist/ssr/FileDiffReact.js +1 -1
  152. package/dist/ssr/index.d.ts +2 -2
  153. package/dist/ssr/preloadDiffs.js +1 -1
  154. package/dist/style.js +1 -1
  155. package/dist/types.d.ts +185 -42
  156. package/dist/types.d.ts.map +1 -1
  157. package/dist/utils/annotationHelpers.d.ts +20 -0
  158. package/dist/utils/annotationHelpers.d.ts.map +1 -0
  159. package/dist/utils/annotationHelpers.js +29 -0
  160. package/dist/utils/annotationHelpers.js.map +1 -0
  161. package/dist/utils/computeFileOffsets.d.ts.map +1 -1
  162. package/dist/utils/computeFileOffsets.js +34 -5
  163. package/dist/utils/computeFileOffsets.js.map +1 -1
  164. package/dist/utils/editSessionHunks.d.ts +66 -0
  165. package/dist/utils/editSessionHunks.d.ts.map +1 -0
  166. package/dist/utils/editSessionHunks.js +437 -0
  167. package/dist/utils/editSessionHunks.js.map +1 -0
  168. package/dist/utils/getHunkSideBoundaries.d.ts +7 -0
  169. package/dist/utils/getHunkSideBoundaries.d.ts.map +1 -0
  170. package/dist/utils/getHunkSideBoundaries.js +12 -0
  171. package/dist/utils/getHunkSideBoundaries.js.map +1 -0
  172. package/dist/utils/getTotalLineCountFromHunks.d.ts.map +1 -1
  173. package/dist/utils/getTotalLineCountFromHunks.js +2 -1
  174. package/dist/utils/getTotalLineCountFromHunks.js.map +1 -1
  175. package/dist/utils/hydratePartialDiff.d.ts.map +1 -1
  176. package/dist/utils/hydratePartialDiff.js +4 -3
  177. package/dist/utils/hydratePartialDiff.js.map +1 -1
  178. package/dist/utils/isGutterUtilityPath.d.ts +5 -0
  179. package/dist/utils/isGutterUtilityPath.d.ts.map +1 -0
  180. package/dist/utils/isGutterUtilityPath.js +12 -0
  181. package/dist/utils/isGutterUtilityPath.js.map +1 -0
  182. package/dist/utils/iterateOverDiff.d.ts.map +1 -1
  183. package/dist/utils/iterateOverDiff.js +17 -12
  184. package/dist/utils/iterateOverDiff.js.map +1 -1
  185. package/dist/utils/parseMergeConflictDiffFromFile.d.ts.map +1 -1
  186. package/dist/utils/parseMergeConflictDiffFromFile.js +9 -6
  187. package/dist/utils/parseMergeConflictDiffFromFile.js.map +1 -1
  188. package/dist/utils/parsePatchFiles.d.ts.map +1 -1
  189. package/dist/utils/parsePatchFiles.js +6 -3
  190. package/dist/utils/parsePatchFiles.js.map +1 -1
  191. package/dist/utils/realignChangeContent.d.ts +33 -0
  192. package/dist/utils/realignChangeContent.d.ts.map +1 -0
  193. package/dist/utils/realignChangeContent.js +148 -0
  194. package/dist/utils/realignChangeContent.js.map +1 -0
  195. package/dist/utils/renderDiffWithHighlighter.js +1 -1
  196. package/dist/utils/resolveRegion.d.ts.map +1 -1
  197. package/dist/utils/resolveRegion.js +18 -2
  198. package/dist/utils/resolveRegion.js.map +1 -1
  199. package/dist/utils/updateDiffHunks.d.ts +8 -2
  200. package/dist/utils/updateDiffHunks.d.ts.map +1 -1
  201. package/dist/utils/updateDiffHunks.js +9 -7
  202. package/dist/utils/updateDiffHunks.js.map +1 -1
  203. package/dist/utils/virtualDiffLayout.d.ts +42 -2
  204. package/dist/utils/virtualDiffLayout.d.ts.map +1 -1
  205. package/dist/utils/virtualDiffLayout.js +101 -7
  206. package/dist/utils/virtualDiffLayout.js.map +1 -1
  207. package/dist/worker/worker-portable.js +60 -20
  208. package/dist/worker/worker-portable.js.map +1 -1
  209. package/dist/worker/worker.js +61 -19
  210. package/dist/worker/worker.js.map +1 -1
  211. package/package.json +10 -7
  212. package/dist/editor/index.d.ts +0 -3
  213. package/dist/editor/index.js +0 -3
  214. package/dist/editor/tokenzier.d.ts.map +0 -1
  215. package/dist/editor/tokenzier.js.map +0 -1
  216. package/dist/react/EditorContext.d.ts +0 -15
  217. package/dist/react/EditorContext.d.ts.map +0 -1
  218. package/dist/react/EditorContext.js +0 -23
  219. package/dist/react/EditorContext.js.map +0 -1
@@ -1,6 +1,7 @@
1
1
  import { getGraphemeSegmenter, h, round } from "./utils.js";
2
2
  //#region src/editor/textMeasure.ts
3
3
  const TEXT_WIDTH_CACHE_LIMIT = 4096;
4
+ const COMBINING_MARK_PATTERN = /\p{Mark}/u;
4
5
  var Metrics = class {
5
6
  #root;
6
7
  #canvasCtx;
@@ -40,29 +41,52 @@ var Metrics = class {
40
41
  }
41
42
  /**
42
43
  * Re-measure the '0' character width against the font that is loaded right
43
- * now, returning true when it changed.
44
+ * now, returning true when measurement-dependent UI should refresh.
44
45
  *
45
46
  * A custom web font can finish loading after the editor first renders.
46
47
  * Until then canvas measureText reports the fallback font's width, and
47
48
  * getComputedStyle returns the same font-family string before and after the
48
49
  * file arrives, so init()'s font guard never re-measures on its own. Call
49
50
  * this once fonts have settled (e.g. on document.fonts.ready) to replace a
50
- * width measured against the fallback font with the real glyph width. The
51
- * boolean return lets the caller skip re-rendering when nothing changed.
51
+ * width measured against the fallback font with the real glyph width. Font
52
+ * completion can also change DOM-measured emoji/ZWJ widths while leaving the
53
+ * ASCII width unchanged, and the computed font string stays the same in both
54
+ * cases. The boolean return lets the caller skip re-rendering when there is no
55
+ * measured state to refresh.
52
56
  */
53
57
  remeasureCharacterWidth() {
54
58
  if (this.#canvasCtx === void 0 || this.#font === void 0) return false;
55
59
  this.#canvasCtx.font = this.#font;
56
60
  const ch = this.canvasMeasureTextWidth("0");
57
- if (ch === this.ch) return false;
58
- this.ch = ch;
59
- return true;
61
+ const characterWidthChanged = ch !== this.ch;
62
+ if (characterWidthChanged) this.ch = ch;
63
+ const textWidthCacheCleared = this.#clearTextWidthCache();
64
+ return characterWidthChanged || textWidthCacheCleared;
60
65
  }
61
66
  /** measure the width of the text */
62
67
  measureTextWidth(text) {
63
- const textWithExpandedTabs = expandTabsToSpaces(text, this.tabSize);
64
- if (needsDomTextMeasurement(textWithExpandedTabs)) return this.domMeasureTextWidth(textWithExpandedTabs);
65
- return this.canvasMeasureTextWidth(textWithExpandedTabs);
68
+ if (!text.includes(" ")) return this.#measureTextWidthWithoutTabs(text);
69
+ if (this.#canvasCtx === void 0) throw new Error("Metrics not initialized");
70
+ const asciiColumns = getExpandedAsciiTextColumns(text, this.tabSize);
71
+ if (asciiColumns !== -1) return asciiColumns * this.ch;
72
+ let width = 0;
73
+ let runStart = 0;
74
+ const tabStopWidth = this.tabSize * this.ch;
75
+ for (let i = 0; i < text.length; i++) {
76
+ if (text.charCodeAt(i) !== 9) continue;
77
+ if (i > runStart) width += this.#measureTextWidthWithoutTabs(text.slice(runStart, i));
78
+ if (tabStopWidth > 0) {
79
+ const remainder = width % tabStopWidth;
80
+ width += remainder === 0 ? tabStopWidth : tabStopWidth - remainder;
81
+ }
82
+ runStart = i + 1;
83
+ }
84
+ if (runStart < text.length) width += this.#measureTextWidthWithoutTabs(text.slice(runStart));
85
+ return round(width);
86
+ }
87
+ #measureTextWidthWithoutTabs(text) {
88
+ if (needsDomTextMeasurement(text)) return this.domMeasureTextWidth(text);
89
+ return this.canvasMeasureTextWidth(text);
66
90
  }
67
91
  /** measure the width of the text using the canvas measureText API */
68
92
  canvasMeasureTextWidth(text) {
@@ -110,14 +134,19 @@ var Metrics = class {
110
134
  * init(), e.g. on a layout reflow, so stale widths are not reused
111
135
  */
112
136
  clearTextWidthCache() {
137
+ this.#clearTextWidthCache();
138
+ }
139
+ #clearTextWidthCache() {
140
+ const hadCachedTextWidths = this.#textWidthCache.size > 0;
113
141
  this.#textWidthCache.clear();
142
+ return hadCachedTextWidths;
114
143
  }
115
144
  };
116
145
  /** Check if the text needs DOM text measurement. */
117
146
  function needsDomTextMeasurement(text) {
118
147
  for (let i = 0; i < text.length; i++) {
119
148
  const code = text.charCodeAt(i);
120
- if (code >= 55296 && code <= 57343 || code === 8205 || code === 65038 || code === 65039) return true;
149
+ if (code >= 55296 && code <= 57343 || code === 8205 || code === 65038 || code === 65039 || code > 127 && COMBINING_MARK_PATTERN.test(text.charAt(i))) return true;
121
150
  }
122
151
  return false;
123
152
  }
@@ -161,27 +190,6 @@ function getUnicodeMeasurementOffsets(text) {
161
190
  return offsets;
162
191
  }
163
192
  /**
164
- * Expand tab characters to spaces using fixed tab stops: each tab advances to
165
- * the next multiple of tabSize from its running column, matching how the
166
- * rendered text expands tabs via CSS `tab-size`. Expanding every tab to a flat
167
- * tabSize would mis-measure tabs that follow other characters on the same line
168
- * (e.g. an alignment tab in `foo\tbar`).
169
- */
170
- function expandTabsToSpaces(text, tabSize) {
171
- if (!text.includes(" ")) return text;
172
- let result = "";
173
- let column = 0;
174
- for (let i = 0; i < text.length; i++) if (text.charCodeAt(i) === 9) {
175
- const advance = tabSize - column % tabSize;
176
- result += " ".repeat(advance);
177
- column += advance;
178
- } else {
179
- result += text[i];
180
- column += 1;
181
- }
182
- return result;
183
- }
184
- /**
185
193
  * Count the rendered columns of ASCII text, advancing each tab to the next
186
194
  * fixed tab stop (a multiple of tabSize) to match CSS `tab-size`. Returns -1
187
195
  * for non-ASCII text, which must be measured glyph-by-glyph instead.
@@ -196,6 +204,6 @@ function getExpandedAsciiTextColumns(text, tabSize) {
196
204
  return columns;
197
205
  }
198
206
  //#endregion
199
- export { Metrics, expandTabsToSpaces, getExpandedAsciiTextColumns, getUnicodeMeasurementOffsets, needsDomTextMeasurement, snapTextOffsetToUnicodeBoundary };
207
+ export { Metrics, getExpandedAsciiTextColumns, getUnicodeMeasurementOffsets, needsDomTextMeasurement, snapTextOffsetToUnicodeBoundary };
200
208
 
201
209
  //# sourceMappingURL=textMeasure.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"textMeasure.js","names":["#root","#canvasCtx","#font","#textWidthCache"],"sources":["../../src/editor/textMeasure.ts"],"sourcesContent":["import { getGraphemeSegmenter, h, round } from './utils';\n\n// Upper bound on cached DOM text-width measurements. The cache only holds\n// non-ASCII runs (emoji, ZWJ sequences, variation selectors), so it stays\n// small for ordinary code, but capping it prevents unbounded growth on\n// emoji-heavy documents. Past the cap the oldest entry is evicted.\nconst TEXT_WIDTH_CACHE_LIMIT = 4096;\n\nexport class Metrics {\n #root?: HTMLElement;\n #canvasCtx?: CanvasRenderingContext2D;\n #font?: string;\n\n // Memoizes domMeasureTextWidth() results\n #textWidthCache = new Map<string, number>();\n\n /** Width of the '0' character. */\n ch: number = -1;\n /** Size of a tab(\\t) character. */\n tabSize: number = 2;\n /** Height of the code line. */\n lineHeight: number = 20;\n /** Padding top of the root element. */\n paddingTop: number = 0;\n\n /** initialize the metrics */\n init(root: HTMLElement): void {\n if (\n this.#root === root &&\n this.#canvasCtx !== undefined &&\n this.ch !== -1\n ) {\n // already initialized\n return;\n }\n\n this.#root = root;\n this.#canvasCtx ??=\n document.createElement('canvas').getContext('2d') ?? undefined;\n if (this.#canvasCtx === undefined) {\n throw new Error('Could not get canvas context');\n }\n\n const parent = root.parentElement;\n if (parent !== null) {\n const { paddingTop } = getComputedStyle(parent);\n if (paddingTop.endsWith('px')) {\n this.paddingTop = parseFloat(paddingTop.slice(0, -2));\n }\n }\n\n const { fontSize, fontFamily, tabSize, lineHeight } =\n getComputedStyle(root);\n if (lineHeight.endsWith('px')) {\n this.lineHeight = parseFloat(lineHeight.slice(0, -2));\n } else if (fontSize.endsWith('px')) {\n this.lineHeight = round(\n parseFloat(fontSize.slice(0, -2)) * parseFloat(lineHeight)\n );\n }\n const font = fontSize + ' ' + fontFamily;\n if (this.#font !== font || this.ch === -1) {\n this.#font = font;\n this.#canvasCtx.font = font;\n this.ch = this.canvasMeasureTextWidth('0');\n // Cached DOM widths were measured against the previous font.\n this.clearTextWidthCache();\n }\n const nextTabSize = parseInt(tabSize, 10);\n if (!Number.isNaN(nextTabSize)) {\n this.tabSize = nextTabSize;\n }\n }\n\n /**\n * Re-measure the '0' character width against the font that is loaded right\n * now, returning true when it changed.\n *\n * A custom web font can finish loading after the editor first renders.\n * Until then canvas measureText reports the fallback font's width, and\n * getComputedStyle returns the same font-family string before and after the\n * file arrives, so init()'s font guard never re-measures on its own. Call\n * this once fonts have settled (e.g. on document.fonts.ready) to replace a\n * width measured against the fallback font with the real glyph width. The\n * boolean return lets the caller skip re-rendering when nothing changed.\n */\n remeasureCharacterWidth(): boolean {\n if (this.#canvasCtx === undefined || this.#font === undefined) {\n return false;\n }\n this.#canvasCtx.font = this.#font;\n const ch = this.canvasMeasureTextWidth('0');\n if (ch === this.ch) {\n return false;\n }\n this.ch = ch;\n return true;\n }\n\n /** measure the width of the text */\n measureTextWidth(text: string): number {\n const textWithExpandedTabs = expandTabsToSpaces(text, this.tabSize);\n if (needsDomTextMeasurement(textWithExpandedTabs)) {\n return this.domMeasureTextWidth(textWithExpandedTabs);\n }\n return this.canvasMeasureTextWidth(textWithExpandedTabs);\n }\n\n /** measure the width of the text using the canvas measureText API */\n canvasMeasureTextWidth(text: string): number {\n if (this.#canvasCtx === undefined) {\n throw new Error('Metrics not initialized');\n }\n return round(this.#canvasCtx.measureText(text).width);\n }\n\n /**\n * measure the width of the text using the DOM\n * this is slow because it cause a reflow, use it for non-ascii text;\n * results are memoized per text so repeated measurements skip the reflow\n */\n domMeasureTextWidth(text: string): number {\n if (this.#root === undefined) {\n throw new Error('Metrics not initialized');\n }\n const cacheKey = text + '|' + this.#font;\n const cached = this.#textWidthCache.get(cacheKey);\n if (cached !== undefined) {\n return cached;\n }\n const measureEl = h(\n 'span',\n {\n style: {\n position: 'absolute',\n top: '0',\n left: '0',\n visibility: 'hidden',\n pointerEvents: 'none',\n whiteSpace: 'pre',\n font: 'inherit',\n },\n textContent: text,\n },\n this.#root\n );\n let width: number;\n try {\n // round() to match canvasMeasureTextWidth and ch; otherwise the DOM path\n // returns raw sub-pixel widths and caret/selection offsets drift between\n // ASCII and non-ASCII runs on the same line.\n width = round(measureEl.getBoundingClientRect().width);\n } finally {\n measureEl.remove();\n }\n if (this.#textWidthCache.size >= TEXT_WIDTH_CACHE_LIMIT) {\n const oldestKey = this.#textWidthCache.keys().next().value;\n if (oldestKey !== undefined) {\n this.#textWidthCache.delete(oldestKey);\n }\n }\n this.#textWidthCache.set(cacheKey, width);\n return width;\n }\n\n /**\n * discard memoized DOM text widths\n * call this when the inherited font may have changed without re-running\n * init(), e.g. on a layout reflow, so stale widths are not reused\n */\n clearTextWidthCache(): void {\n this.#textWidthCache.clear();\n }\n}\n\n/** Check if the text needs DOM text measurement. */\nexport function needsDomTextMeasurement(text: string): boolean {\n for (let i = 0; i < text.length; i++) {\n const code = text.charCodeAt(i);\n if (\n (code >= 0xd800 && code <= 0xdfff) ||\n code === 0x200d ||\n code === 0xfe0e ||\n code === 0xfe0f\n ) {\n return true;\n }\n }\n return false;\n}\n\n/** snap the text offset to the Unicode boundary */\nexport function snapTextOffsetToUnicodeBoundary(\n text: string,\n offset: number\n): number {\n const boundedOffset = Math.max(0, Math.min(offset, text.length));\n if (\n boundedOffset === 0 ||\n boundedOffset === text.length ||\n !needsDomTextMeasurement(text)\n ) {\n return boundedOffset;\n }\n // Avoid measuring a caret position inside one visual emoji/grapheme.\n // Browser caret movement can report offsets around UTF-16 surrogate\n // pairs and emoji joiners; measuring a partial sequence gives a\n // replacement-glyph width.\n const segmenter = getGraphemeSegmenter();\n if (segmenter !== undefined) {\n for (const segment of segmenter.segment(text)) {\n const segmentStart = segment.index;\n const segmentEnd = segmentStart + segment.segment.length;\n if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n return segmentEnd;\n }\n if (boundedOffset <= segmentStart) {\n break;\n }\n }\n return boundedOffset;\n }\n // Degraded path for engines lacking Intl.Segmenter: snap out of a\n // surrogate pair by stepping over code points.\n let segmentStart = 0;\n for (const codePoint of text) {\n const segmentEnd = segmentStart + codePoint.length;\n if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n return segmentEnd;\n }\n if (boundedOffset <= segmentStart) {\n break;\n }\n segmentStart = segmentEnd;\n }\n return boundedOffset;\n}\n\n/** get the offsets of the Unicode grapheme clusters in the text */\nexport function getUnicodeMeasurementOffsets(\n text: string\n): number[] | undefined {\n if (!needsDomTextMeasurement(text)) {\n return undefined;\n }\n const offsets = [0];\n const segmenter = getGraphemeSegmenter();\n if (segmenter !== undefined) {\n for (const segment of segmenter.segment(text)) {\n offsets.push(segment.index + segment.segment.length);\n }\n return offsets;\n }\n // Degraded path for engines lacking Intl.Segmenter: step by code point.\n let offset = 0;\n for (const codePoint of text) {\n offset += codePoint.length;\n offsets.push(offset);\n }\n return offsets;\n}\n\n/**\n * Expand tab characters to spaces using fixed tab stops: each tab advances to\n * the next multiple of tabSize from its running column, matching how the\n * rendered text expands tabs via CSS `tab-size`. Expanding every tab to a flat\n * tabSize would mis-measure tabs that follow other characters on the same line\n * (e.g. an alignment tab in `foo\\tbar`).\n */\nexport function expandTabsToSpaces(text: string, tabSize: number): string {\n if (!text.includes('\\t')) {\n return text;\n }\n let result = '';\n let column = 0;\n for (let i = 0; i < text.length; i++) {\n if (text.charCodeAt(i) === /* '\\t' */ 9) {\n const advance = tabSize - (column % tabSize);\n result += ' '.repeat(advance);\n column += advance;\n } else {\n result += text[i];\n column += 1;\n }\n }\n return result;\n}\n\n/**\n * Count the rendered columns of ASCII text, advancing each tab to the next\n * fixed tab stop (a multiple of tabSize) to match CSS `tab-size`. Returns -1\n * for non-ASCII text, which must be measured glyph-by-glyph instead.\n */\nexport function getExpandedAsciiTextColumns(\n text: string,\n tabSize: number\n): number {\n let columns = 0;\n for (let i = 0; i < text.length; i++) {\n const code = text.charCodeAt(i);\n if (code > 127) {\n return -1;\n }\n columns += code === /* '\\t' */ 9 ? tabSize - (columns % tabSize) : 1;\n }\n return columns;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"textMeasure.js","names":["#root","#canvasCtx","#font","#clearTextWidthCache","#measureTextWidthWithoutTabs","#textWidthCache"],"sources":["../../src/editor/textMeasure.ts"],"sourcesContent":["import { getGraphemeSegmenter, h, round } from './utils';\n\n// Upper bound on cached DOM text-width measurements. The cache only holds\n// non-ASCII runs (emoji, ZWJ sequences, variation selectors, combining marks),\n// so it stays small for ordinary code, but capping it prevents unbounded growth\n// on emoji-heavy documents. Past the cap the oldest entry is evicted.\nconst TEXT_WIDTH_CACHE_LIMIT = 4096;\n\nconst COMBINING_MARK_PATTERN = /\\p{Mark}/u;\n\nexport class Metrics {\n #root?: HTMLElement;\n #canvasCtx?: CanvasRenderingContext2D;\n #font?: string;\n\n // Memoizes domMeasureTextWidth() results\n #textWidthCache = new Map<string, number>();\n\n /** Width of the '0' character. */\n ch: number = -1;\n /** Size of a tab(\\t) character. */\n tabSize: number = 2;\n /** Height of the code line. */\n lineHeight: number = 20;\n /** Padding top of the root element. */\n paddingTop: number = 0;\n\n /** initialize the metrics */\n init(root: HTMLElement): void {\n if (\n this.#root === root &&\n this.#canvasCtx !== undefined &&\n this.ch !== -1\n ) {\n // already initialized\n return;\n }\n\n this.#root = root;\n this.#canvasCtx ??=\n document.createElement('canvas').getContext('2d') ?? undefined;\n if (this.#canvasCtx === undefined) {\n throw new Error('Could not get canvas context');\n }\n\n const parent = root.parentElement;\n if (parent !== null) {\n const { paddingTop } = getComputedStyle(parent);\n if (paddingTop.endsWith('px')) {\n this.paddingTop = parseFloat(paddingTop.slice(0, -2));\n }\n }\n\n const { fontSize, fontFamily, tabSize, lineHeight } =\n getComputedStyle(root);\n if (lineHeight.endsWith('px')) {\n this.lineHeight = parseFloat(lineHeight.slice(0, -2));\n } else if (fontSize.endsWith('px')) {\n this.lineHeight = round(\n parseFloat(fontSize.slice(0, -2)) * parseFloat(lineHeight)\n );\n }\n const font = fontSize + ' ' + fontFamily;\n if (this.#font !== font || this.ch === -1) {\n this.#font = font;\n this.#canvasCtx.font = font;\n this.ch = this.canvasMeasureTextWidth('0');\n // Cached DOM widths were measured against the previous font.\n this.clearTextWidthCache();\n }\n const nextTabSize = parseInt(tabSize, 10);\n if (!Number.isNaN(nextTabSize)) {\n this.tabSize = nextTabSize;\n }\n }\n\n /**\n * Re-measure the '0' character width against the font that is loaded right\n * now, returning true when measurement-dependent UI should refresh.\n *\n * A custom web font can finish loading after the editor first renders.\n * Until then canvas measureText reports the fallback font's width, and\n * getComputedStyle returns the same font-family string before and after the\n * file arrives, so init()'s font guard never re-measures on its own. Call\n * this once fonts have settled (e.g. on document.fonts.ready) to replace a\n * width measured against the fallback font with the real glyph width. Font\n * completion can also change DOM-measured emoji/ZWJ widths while leaving the\n * ASCII width unchanged, and the computed font string stays the same in both\n * cases. The boolean return lets the caller skip re-rendering when there is no\n * measured state to refresh.\n */\n remeasureCharacterWidth(): boolean {\n if (this.#canvasCtx === undefined || this.#font === undefined) {\n return false;\n }\n this.#canvasCtx.font = this.#font;\n const ch = this.canvasMeasureTextWidth('0');\n const characterWidthChanged = ch !== this.ch;\n if (characterWidthChanged) {\n this.ch = ch;\n }\n const textWidthCacheCleared = this.#clearTextWidthCache();\n return characterWidthChanged || textWidthCacheCleared;\n }\n\n /** measure the width of the text */\n measureTextWidth(text: string): number {\n if (!text.includes('\\t')) {\n return this.#measureTextWidthWithoutTabs(text);\n }\n if (this.#canvasCtx === undefined) {\n throw new Error('Metrics not initialized');\n }\n const asciiColumns = getExpandedAsciiTextColumns(text, this.tabSize);\n if (asciiColumns !== -1) {\n return asciiColumns * this.ch;\n }\n\n let width = 0;\n let runStart = 0;\n const tabStopWidth = this.tabSize * this.ch;\n for (let i = 0; i < text.length; i++) {\n if (text.charCodeAt(i) !== /* '\\t' */ 9) {\n continue;\n }\n\n if (i > runStart) {\n width += this.#measureTextWidthWithoutTabs(text.slice(runStart, i));\n }\n // CSS tab stops are pixel positions, so wide glyphs before a tab must\n // contribute their measured width rather than one logical column.\n if (tabStopWidth > 0) {\n const remainder = width % tabStopWidth;\n width += remainder === 0 ? tabStopWidth : tabStopWidth - remainder;\n }\n runStart = i + 1;\n }\n\n if (runStart < text.length) {\n width += this.#measureTextWidthWithoutTabs(text.slice(runStart));\n }\n return round(width);\n }\n\n #measureTextWidthWithoutTabs(text: string): number {\n if (needsDomTextMeasurement(text)) {\n return this.domMeasureTextWidth(text);\n }\n return this.canvasMeasureTextWidth(text);\n }\n\n /** measure the width of the text using the canvas measureText API */\n canvasMeasureTextWidth(text: string): number {\n if (this.#canvasCtx === undefined) {\n throw new Error('Metrics not initialized');\n }\n return round(this.#canvasCtx.measureText(text).width);\n }\n\n /**\n * measure the width of the text using the DOM\n * this is slow because it cause a reflow, use it for non-ascii text;\n * results are memoized per text so repeated measurements skip the reflow\n */\n domMeasureTextWidth(text: string): number {\n if (this.#root === undefined) {\n throw new Error('Metrics not initialized');\n }\n const cacheKey = text + '|' + this.#font;\n const cached = this.#textWidthCache.get(cacheKey);\n if (cached !== undefined) {\n return cached;\n }\n const measureEl = h(\n 'span',\n {\n style: {\n position: 'absolute',\n top: '0',\n left: '0',\n visibility: 'hidden',\n pointerEvents: 'none',\n whiteSpace: 'pre',\n font: 'inherit',\n },\n textContent: text,\n },\n this.#root\n );\n let width: number;\n try {\n // round() to match canvasMeasureTextWidth and ch; otherwise the DOM path\n // returns raw sub-pixel widths and caret/selection offsets drift between\n // ASCII and non-ASCII runs on the same line.\n width = round(measureEl.getBoundingClientRect().width);\n } finally {\n measureEl.remove();\n }\n if (this.#textWidthCache.size >= TEXT_WIDTH_CACHE_LIMIT) {\n const oldestKey = this.#textWidthCache.keys().next().value;\n if (oldestKey !== undefined) {\n this.#textWidthCache.delete(oldestKey);\n }\n }\n this.#textWidthCache.set(cacheKey, width);\n return width;\n }\n\n /**\n * discard memoized DOM text widths\n * call this when the inherited font may have changed without re-running\n * init(), e.g. on a layout reflow, so stale widths are not reused\n */\n clearTextWidthCache(): void {\n this.#clearTextWidthCache();\n }\n\n #clearTextWidthCache(): boolean {\n const hadCachedTextWidths = this.#textWidthCache.size > 0;\n this.#textWidthCache.clear();\n return hadCachedTextWidths;\n }\n}\n\n/** Check if the text needs DOM text measurement. */\nexport function needsDomTextMeasurement(text: string): boolean {\n for (let i = 0; i < text.length; i++) {\n const code = text.charCodeAt(i);\n if (\n (code >= 0xd800 && code <= 0xdfff) ||\n code === 0x200d ||\n code === 0xfe0e ||\n code === 0xfe0f ||\n (code > 0x7f && COMBINING_MARK_PATTERN.test(text.charAt(i)))\n ) {\n return true;\n }\n }\n return false;\n}\n\n/** snap the text offset to the Unicode boundary */\nexport function snapTextOffsetToUnicodeBoundary(\n text: string,\n offset: number\n): number {\n const boundedOffset = Math.max(0, Math.min(offset, text.length));\n if (\n boundedOffset === 0 ||\n boundedOffset === text.length ||\n !needsDomTextMeasurement(text)\n ) {\n return boundedOffset;\n }\n // Avoid measuring a caret position inside one visual emoji/grapheme.\n // Browser caret movement can report offsets around UTF-16 surrogate\n // pairs and emoji joiners; measuring a partial sequence gives a\n // replacement-glyph width.\n const segmenter = getGraphemeSegmenter();\n if (segmenter !== undefined) {\n for (const segment of segmenter.segment(text)) {\n const segmentStart = segment.index;\n const segmentEnd = segmentStart + segment.segment.length;\n if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n return segmentEnd;\n }\n if (boundedOffset <= segmentStart) {\n break;\n }\n }\n return boundedOffset;\n }\n // Degraded path for engines lacking Intl.Segmenter: snap out of a\n // surrogate pair by stepping over code points.\n let segmentStart = 0;\n for (const codePoint of text) {\n const segmentEnd = segmentStart + codePoint.length;\n if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n return segmentEnd;\n }\n if (boundedOffset <= segmentStart) {\n break;\n }\n segmentStart = segmentEnd;\n }\n return boundedOffset;\n}\n\n/** get the offsets of the Unicode grapheme clusters in the text */\nexport function getUnicodeMeasurementOffsets(\n text: string\n): number[] | undefined {\n if (!needsDomTextMeasurement(text)) {\n return undefined;\n }\n const offsets = [0];\n const segmenter = getGraphemeSegmenter();\n if (segmenter !== undefined) {\n for (const segment of segmenter.segment(text)) {\n offsets.push(segment.index + segment.segment.length);\n }\n return offsets;\n }\n // Degraded path for engines lacking Intl.Segmenter: step by code point.\n let offset = 0;\n for (const codePoint of text) {\n offset += codePoint.length;\n offsets.push(offset);\n }\n return offsets;\n}\n\n/**\n * Count the rendered columns of ASCII text, advancing each tab to the next\n * fixed tab stop (a multiple of tabSize) to match CSS `tab-size`. Returns -1\n * for non-ASCII text, which must be measured glyph-by-glyph instead.\n */\nexport function getExpandedAsciiTextColumns(\n text: string,\n tabSize: number\n): number {\n let columns = 0;\n for (let i = 0; i < text.length; i++) {\n const code = text.charCodeAt(i);\n if (code > 127) {\n return -1;\n }\n columns += code === /* '\\t' */ 9 ? tabSize - (columns % tabSize) : 1;\n }\n return columns;\n}\n"],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { BaseCodeOptions, DiffsHighlighter, HighlightedToken, RenderRange } from "../types.js";
2
2
  import { TextDocument, TextDocumentChange } from "./textDocument.js";
3
3
 
4
- //#region src/editor/tokenzier.d.ts
4
+ //#region src/editor/tokenizer.d.ts
5
5
  interface EditorTokenizerProps {
6
6
  highlighter: DiffsHighlighter;
7
7
  textDocument: TextDocument<unknown>;
@@ -35,7 +35,7 @@ declare class EditorTokenizer {
35
35
  pauseBackgroundTokenize(): void;
36
36
  resumeBackgroundTokenize(): void;
37
37
  }
38
- declare function renderLineTokens(tokens: Array<HighlightedToken>, themeType: 'light' | 'dark'): (HTMLElement | string)[];
38
+ declare function renderLineTokens(tokens: Array<HighlightedToken>): (HTMLElement | string)[];
39
39
  //#endregion
40
40
  export { EditorTokenizer, EditorTokenizerProps, renderLineTokens };
41
- //# sourceMappingURL=tokenzier.d.ts.map
41
+ //# sourceMappingURL=tokenizer.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tokenizer.d.ts","names":[],"sources":["../../src/editor/tokenizer.ts"],"mappings":";;;;UAoBiB,oBAAA;EACf,WAAA,EAAa,gBAAA;EACb,YAAA,EAAc,YAAA;EACd,WAAA,EAAa,eAAA;EACb,aAAA;EACA,QAAA,GAAW,KAAA;EACX,eAAA,GACE,KAAA,EAAO,GAAA,SAAY,KAAA,CAAM,gBAAA,IACzB,SAAA;EAKF,aAAA;EACA,OAAA;AAAA;;cAIW,eAAA;EAAA;MA4EP,SAAA;EAIJ,kCAAA,CACE,SAAA;EAsBF,WAAA;IACE,WAAA;IACA,WAAA;IACA,YAAA;IACA,aAAA;IACA,QAAA;IACA,eAAA;IACA,aAAA;IACA;EAAA,GACC,oBAAA;EA6GH,SAAA,CAAU,WAAA,EAAa,eAAA;EAgFvB,OAAA;EAUA,QAAA,CACE,MAAA,EAAQ,kBAAA,EACR,WAAA,GAAc,WAAA,GACb,GAAA,SAAY,KAAA,CAAM,gBAAA;EA+LrB,kBAAA,CAAmB,WAAA,GAAc,WAAA;EAKjC,sBAAA;EAaA,uBAAA;EAYA,wBAAA;AAAA;AAAA,iBAuXc,gBAAA,CACd,MAAA,EAAQ,KAAA,CAAM,gBAAA,KACZ,WAAA"}
@@ -1,14 +1,15 @@
1
1
  import { DEFAULT_THEMES } from "../constants.js";
2
2
  import { addEventListener, debounce, h } from "./utils.js";
3
+ import { colorUtils } from "@pierre/theming/color";
3
4
  import { EncodedTokenMetadata, INITIAL } from "shiki/textmate";
4
- //#region src/editor/tokenzier.ts
5
+ //#region src/editor/tokenizer.ts
5
6
  const TOKENIZE_TIME_LIMIT = 500;
6
7
  /** Stoppable code tokenizer for the editor */
7
8
  var EditorTokenizer = class {
8
9
  #highlighter;
9
10
  #grammar;
10
11
  #mediaQueryList;
11
- #themeType;
12
+ #themeType = "dark";
12
13
  #themeName = "";
13
14
  #colorMap;
14
15
  #textDocument;
@@ -19,7 +20,9 @@ var EditorTokenizer = class {
19
20
  #matchBrackets;
20
21
  #debug;
21
22
  #disposes;
23
+ #isCleanedUp = false;
22
24
  #stateStack = [INITIAL];
25
+ #comparisonStateStack = [];
23
26
  #lastLine = -1;
24
27
  #isStopped = true;
25
28
  #isPaused = false;
@@ -29,12 +32,15 @@ var EditorTokenizer = class {
29
32
  #bracketIgnoredRanges = /* @__PURE__ */ new Map();
30
33
  #isMessageListenerAttached = false;
31
34
  #prebuildStateStack = debounce(async (renderRange) => {
35
+ if (this.#isCleanedUp) return;
32
36
  const { startingLine = 0, totalLines = Infinity } = renderRange ?? {};
33
37
  const endLine = Math.min(totalLines === Infinity ? Infinity : startingLine + totalLines, this.#textDocument.lineCount);
34
38
  if (this.#grammar === void 0 && !isGrammarlessLanguage(this.#textDocument.languageId)) {
35
39
  await this.#highlighter.loadLanguage(this.#textDocument.languageId);
40
+ if (this.#isCleanedUp) return;
36
41
  this.#grammar = this.#highlighter.getLanguage(this.#textDocument.languageId);
37
42
  }
43
+ this.#ensureActiveTheme();
38
44
  this.#buildStateStack(endLine);
39
45
  }, 500);
40
46
  #onMessage = ({ data }) => {
@@ -58,22 +64,23 @@ var EditorTokenizer = class {
58
64
  return this.#bracketIgnoredRanges.get(lineIndex) ?? null;
59
65
  }
60
66
  constructor({ codeOptions, highlighter, textDocument, matchBrackets, setStyle, onDeferTokenize, onThemeChange, __debug }) {
61
- const { themeType = "system", theme = DEFAULT_THEMES, tokenizeMaxLineLength = 1e3 } = codeOptions;
67
+ const { themeType: themeTypeOption = "system", theme = DEFAULT_THEMES, tokenizeMaxLineLength = 1e3 } = codeOptions;
62
68
  this.#mediaQueryList = window.matchMedia("(prefers-color-scheme: dark)");
63
- if (themeType === "system") this.#themeType = this.#mediaQueryList.matches ? "dark" : "light";
64
- else this.#themeType = themeType;
65
- if (typeof theme !== "string" && themeType === "system") {
69
+ let themeType;
70
+ if (themeTypeOption === "system") themeType = this.#resolveSystemThemeType();
71
+ else themeType = themeTypeOption;
72
+ if (typeof theme !== "string" && themeTypeOption === "system") {
66
73
  const observer = new MutationObserver((mutations) => {
67
74
  for (const { type, attributeName } of mutations) if (type === "attributes" && attributeName !== null && (attributeName === "class" || attributeName.startsWith("data-"))) {
68
- const themeType = getComputedStyle(document.body).colorScheme === "dark" ? "dark" : "light";
75
+ const themeType = this.#resolveSystemThemeType();
69
76
  this.#emitThemeChange(theme[themeType], themeType);
70
77
  break;
71
78
  }
72
79
  });
73
80
  observer.observe(document.documentElement, { attributes: true });
74
81
  observer.observe(document.body, { attributes: true });
75
- this.#disposes = [addEventListener(this.#mediaQueryList, "change", (e) => {
76
- const themeType = e.matches ? "dark" : "light";
82
+ this.#disposes = [addEventListener(this.#mediaQueryList, "change", () => {
83
+ const themeType = this.#resolveSystemThemeType();
77
84
  this.#emitThemeChange(theme[themeType], themeType);
78
85
  }), () => observer.disconnect()];
79
86
  }
@@ -87,29 +94,37 @@ var EditorTokenizer = class {
87
94
  this.#debug = __debug ?? false;
88
95
  this.#ensureGrammar();
89
96
  this.#colorMap = [];
90
- this.#setTheme(typeof theme === "string" ? theme : theme[this.#themeType]);
97
+ this.#setTheme(typeof theme === "string" ? theme : theme[themeType], themeType);
91
98
  }
92
99
  #emitThemeChange(themeName, themeType) {
93
- this.#themeType = themeType;
94
- this.#setTheme(themeName);
100
+ this.#setTheme(themeName, themeType);
95
101
  this.stopBackgroundTokenize();
96
102
  this.#stateStack = [INITIAL];
103
+ this.#comparisonStateStack = [];
97
104
  if (this.#grammar !== void 0 && this.#textDocument.lineCount > 0) this.#scheduleBackgroundTokenize(0);
98
105
  this.#onThemeChange?.();
99
106
  }
107
+ #resolveSystemThemeType() {
108
+ try {
109
+ if (typeof document !== "undefined" && typeof getComputedStyle === "function" && document.body != null) return getComputedStyle(document.body).colorScheme === "dark" ? "dark" : "light";
110
+ } catch {}
111
+ return this.#mediaQueryList.matches ? "dark" : "light";
112
+ }
100
113
  syncTheme(codeOptions) {
101
114
  const { themeType = "system", theme = DEFAULT_THEMES } = codeOptions;
102
- const nextThemeType = themeType === "system" ? this.#mediaQueryList.matches ? "dark" : "light" : themeType;
115
+ const nextThemeType = themeType === "system" ? this.#resolveSystemThemeType() : themeType;
103
116
  const nextThemeName = typeof theme === "string" ? theme : theme[nextThemeType];
104
117
  if (nextThemeType === this.#themeType && nextThemeName === this.#themeName) return;
105
118
  this.#emitThemeChange(nextThemeName, nextThemeType);
106
119
  }
107
- #setTheme(themeName) {
108
- this.#themeName = themeName;
109
- this.#colorMap = this.#highlighter.setTheme(themeName).colorMap;
120
+ #setTheme(themeName, themeType) {
121
+ const { theme, colorMap } = this.#highlighter.setTheme(themeName);
110
122
  const { colors = {} } = this.#highlighter.getTheme(themeName);
111
123
  const selectionBackground = colors["editor.selectionBackground"];
112
- const lineHighlightBackground = colors["editor.lineHighlightBackground"];
124
+ const themeLineHighlightBackground = colors["editor.lineHighlightBackground"];
125
+ const lineHighlightBackground = themeLineHighlightBackground != null && themeLineHighlightBackground.trim() !== "" && !colorUtils.isFullyTransparent(themeLineHighlightBackground) ? themeLineHighlightBackground : void 0;
126
+ const lineHighlightBorder = colors["editor.lineHighlightBorder"] ?? (lineHighlightBackground == null ? "color-mix(in lab, var(--diffs-bg) 70%, var(--diffs-fg))" : "transparent");
127
+ const activeLineSourceMix = lineHighlightBackground == null ? "100%" : "85%";
113
128
  const cursorForeground = colors["editorCursor.foreground"];
114
129
  const findMatchBackground = colors["editor.findMatchBackground"];
115
130
  const findMatchHighlightBackground = colors["editor.findMatchHighlightBackground"];
@@ -121,7 +136,8 @@ var EditorTokenizer = class {
121
136
  const errorForeground = colors["editorError.foreground"];
122
137
  this.#setStyle(`:host {
123
138
  --diffs-editor-selection-bg: ${selectionBackground ?? "var(--diffs-line-bg)"};
124
- --diffs-editor-line-highlight-bg: ${lineHighlightBackground ?? "var(--diffs-line-bg)"};
139
+ --diffs-editor-line-highlight-border: ${lineHighlightBorder};
140
+ --diffs-editor-active-line-source-mix: ${activeLineSourceMix};
125
141
  --diffs-editor-match-bg: ${findMatchBackground ?? "initial"};
126
142
  --diffs-editor-match-highlight-bg: ${findMatchHighlightBackground ?? "initial"};
127
143
  --diffs-editor-bracket-match-bg: ${bracketMatchBackground ?? "initial"};
@@ -132,8 +148,17 @@ var EditorTokenizer = class {
132
148
  --diffs-editor-warning-fg: ${warningForeground ?? "initial"};
133
149
  --diffs-editor-error-fg: ${errorForeground ?? "initial"};
134
150
  }`);
151
+ this.#themeName = themeName;
152
+ this.#themeType = themeType ?? theme.type;
153
+ this.#colorMap = colorMap;
154
+ }
155
+ #ensureActiveTheme() {
156
+ if (this.#themeName === "") return;
157
+ const { colorMap } = this.#highlighter.setTheme(this.#themeName);
158
+ this.#colorMap = colorMap;
135
159
  }
136
160
  cleanUp() {
161
+ this.#isCleanedUp = true;
137
162
  this.stopBackgroundTokenize();
138
163
  this.#detachMessageListener();
139
164
  this.#disposes?.forEach((dispose) => dispose());
@@ -141,6 +166,7 @@ var EditorTokenizer = class {
141
166
  }
142
167
  tokenize(change, renderRange) {
143
168
  this.#ensureGrammar();
169
+ this.#ensureActiveTheme();
144
170
  if (this.#grammar === void 0 && !isGrammarlessLanguage(this.#textDocument.languageId)) throw new Error(`Grammar for language "${this.#textDocument.languageId}" not loaded`);
145
171
  if (this.#matchBrackets) {
146
172
  for (const line of this.#bracketIgnoredRanges.keys()) if (line >= change.startLine) this.#bracketIgnoredRanges.delete(line);
@@ -153,7 +179,8 @@ var EditorTokenizer = class {
153
179
  const crossesRenderRangeEnd = renderRange !== void 0 && totalLines !== Infinity && change.lineDelta > 0 && dirtyStart < renderRangeEndLine && change.endLine >= renderRangeEndLine;
154
180
  const canReuseCachedStates = change.lineDelta === 0;
155
181
  const canCacheTokenizedStates = canReuseCachedStates || renderRange === void 0 || dirtyStart >= viewStart;
156
- const changedLineRanges = canReuseCachedStates ? change.changedLineRanges ?? [[dirtyStart, change.endLine]] : [[dirtyStart, change.endLine]];
182
+ const changedLineRanges = change.changedLineRanges ?? [[dirtyStart, change.endLine]];
183
+ this.#comparisonStateStack = [];
157
184
  let offscreenSyncEnd = -1;
158
185
  if (dirtyStart < viewStart) {
159
186
  for (const [rangeStart, rangeEnd] of changedLineRanges) if (rangeStart < viewStart) offscreenSyncEnd = Math.max(offscreenSyncEnd, Math.min(rangeEnd, viewStart - 1));
@@ -161,7 +188,7 @@ var EditorTokenizer = class {
161
188
  const shouldFlushOffscreenLines = offscreenSyncEnd >= dirtyStart && (canReuseCachedStates || change.lineDelta < 0);
162
189
  if (canReuseCachedStates) this.#buildStateStack(dirtyStart);
163
190
  else {
164
- this.#stateStack.length = Math.min(this.#stateStack.length, dirtyStart + 1);
191
+ this.#shiftComparisonStateStack(change);
165
192
  if (renderRange === void 0 || dirtyStart >= viewStart) this.#buildStateStack(viewStart);
166
193
  }
167
194
  let changedRangeIndex = 0;
@@ -183,7 +210,7 @@ var EditorTokenizer = class {
183
210
  offscreenState = resolved.state;
184
211
  offscreenDirtyLines.set(offscreenLine, resolved.resolvedTokens);
185
212
  }
186
- if (canCacheTokenizedStates) this.#stateStack[offscreenEnd] = offscreenState;
213
+ this.#stateStack[offscreenEnd] = offscreenState;
187
214
  }
188
215
  }
189
216
  let state = this.#stateStack[line] ?? INITIAL;
@@ -224,7 +251,7 @@ var EditorTokenizer = class {
224
251
  if (backgroundStartLine !== void 0) this.#scheduleBackgroundTokenize(backgroundStartLine, changedLineRanges, backgroundChangedRangeIndex);
225
252
  else if (!settled && line < lineCount) {
226
253
  const backgroundLine = crossesRenderRangeEnd && dirtyStart >= viewStart ? renderRangeEndLine : dirtyStart < viewStart && !canReuseCachedStates ? dirtyStart : line;
227
- this.#scheduleBackgroundTokenize(backgroundLine, canReuseCachedStates ? changedLineRanges : void 0, changedRangeIndex);
254
+ this.#scheduleBackgroundTokenize(backgroundLine, changedLineRanges, changedRangeIndex);
228
255
  }
229
256
  return dirtyLines;
230
257
  }
@@ -239,6 +266,7 @@ var EditorTokenizer = class {
239
266
  this.#lastLine = -1;
240
267
  this.#backgroundChangedLineRanges = void 0;
241
268
  this.#backgroundChangedRangeIndex = 0;
269
+ this.#comparisonStateStack = [];
242
270
  this.#detachMessageListener();
243
271
  }
244
272
  pauseBackgroundTokenize() {
@@ -323,6 +351,42 @@ var EditorTokenizer = class {
323
351
  #cacheBracketIgnoredRanges(line, ranges) {
324
352
  if (this.#matchBrackets) this.#bracketIgnoredRanges.set(line, ranges);
325
353
  }
354
+ #shiftComparisonStateStack(change) {
355
+ const lineChanges = change.changedLineChanges ?? [[
356
+ change.startLine,
357
+ change.endLine,
358
+ change.lineDelta
359
+ ]];
360
+ const comparisonStateStack = this.#stateStack.slice();
361
+ for (const [startLine, endLine, lineDelta] of lineChanges) {
362
+ if (lineDelta === 0) continue;
363
+ const insertedLineSpan = endLine - startLine;
364
+ const sourceStart = startLine + (insertedLineSpan - lineDelta) + 1;
365
+ const targetStart = startLine + insertedLineSpan + 1;
366
+ const originalLength = comparisonStateStack.length;
367
+ if (lineDelta > 0) for (let line = originalLength - 1; line >= sourceStart; line--) {
368
+ const targetLine = line + lineDelta;
369
+ if (line in comparisonStateStack) comparisonStateStack[targetLine] = comparisonStateStack[line];
370
+ else Reflect.deleteProperty(comparisonStateStack, targetLine);
371
+ }
372
+ else {
373
+ for (let line = sourceStart; line < originalLength; line++) {
374
+ const targetLine = line + lineDelta;
375
+ if (line in comparisonStateStack) comparisonStateStack[targetLine] = comparisonStateStack[line];
376
+ else Reflect.deleteProperty(comparisonStateStack, targetLine);
377
+ }
378
+ comparisonStateStack.length = Math.max(Math.min(originalLength, startLine + 1), originalLength + lineDelta);
379
+ }
380
+ for (let line = startLine + 1; line < targetStart; line++) Reflect.deleteProperty(comparisonStateStack, line);
381
+ }
382
+ this.#stateStack.length = Math.min(this.#stateStack.length, change.startLine + 1);
383
+ comparisonStateStack.length = Math.min(comparisonStateStack.length, this.#textDocument.lineCount + 1);
384
+ for (let line = 0; line <= change.startLine; line++) Reflect.deleteProperty(comparisonStateStack, line);
385
+ this.#comparisonStateStack = comparisonStateStack;
386
+ }
387
+ #getPreviousEndState(line) {
388
+ return this.#comparisonStateStack[line] ?? this.#stateStack[line];
389
+ }
326
390
  #buildStateStack(endAt) {
327
391
  const boundedEndAt = Math.min(Math.max(0, endAt), this.#textDocument.lineCount);
328
392
  if (this.#stateStack.length > boundedEndAt || this.#grammar === void 0) return;
@@ -341,6 +405,7 @@ var EditorTokenizer = class {
341
405
  }
342
406
  #backgroundTokenize(jobId) {
343
407
  if (this.#isStopped || this.#isPaused || this.#grammar === void 0 || jobId !== this.#backgroundJobId) return;
408
+ this.#ensureActiveTheme();
344
409
  const t = performance.now();
345
410
  const lines = /* @__PURE__ */ new Map();
346
411
  const totalLines = this.#textDocument.lineCount;
@@ -352,7 +417,7 @@ var EditorTokenizer = class {
352
417
  let currentChangedRangeEnd = changedLineRanges?.[changedRangeIndex]?.[1];
353
418
  for (; line < totalLines;) {
354
419
  this.#stateStack[line] = state;
355
- const previousNextState = currentChangedRangeEnd !== void 0 ? this.#stateStack[line + 1] : void 0;
420
+ const previousNextState = currentChangedRangeEnd !== void 0 ? this.#getPreviousEndState(line + 1) : void 0;
356
421
  const lineText = this.#textDocument.getLineText(line);
357
422
  if (lineText.length > this.#tokenizeMaxLineLength) {
358
423
  console.warn(`[diffs] Line(${line}) too long to tokenize: ${lineText.length}`);
@@ -431,7 +496,7 @@ function tokenizeLine(grammar, colorMap, lineText, stateStack, timeLimit, collec
431
496
  bracketIgnoredRanges
432
497
  };
433
498
  }
434
- function renderLineTokens(tokens, themeType) {
499
+ function renderLineTokens(tokens) {
435
500
  return tokens.map(([char, fg, textContent]) => {
436
501
  if (char === 0 && fg === "") {
437
502
  if (textContent === "") return h("br");
@@ -439,7 +504,7 @@ function renderLineTokens(tokens, themeType) {
439
504
  }
440
505
  return h("span", {
441
506
  dataset: { char: char.toString() },
442
- style: `--diffs-token-${themeType}:${fg};`,
507
+ style: `color:${fg};`,
443
508
  textContent
444
509
  });
445
510
  });
@@ -450,4 +515,4 @@ function isGrammarlessLanguage(languageId) {
450
515
  //#endregion
451
516
  export { EditorTokenizer, renderLineTokens };
452
517
 
453
- //# sourceMappingURL=tokenzier.js.map
518
+ //# sourceMappingURL=tokenizer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tokenizer.js","names":["#isCleanedUp","#textDocument","#grammar","#highlighter","#ensureActiveTheme","#buildStateStack","#backgroundJobId","#backgroundTokenize","#themeType","#matchBrackets","#ensureGrammar","#bracketIgnoredRanges","#stateStack","#tokenizeLineAt","#mediaQueryList","#resolveSystemThemeType","#emitThemeChange","#disposes","#tokenizeMaxLineLength","#setStyle","#onDeferTokenize","#onThemeChange","#debug","#colorMap","#setTheme","#comparisonStateStack","#scheduleBackgroundTokenize","#themeName","#detachMessageListener","#shiftComparisonStateStack","#prebuildStateStack","#isStopped","#isPaused","#lastLine","#backgroundChangedLineRanges","#backgroundChangedRangeIndex","#postTokenizeMessage","#isMessageListenerAttached","#onMessage","#attachMessageListener","#cacheBracketIgnoredRanges","#getPreviousEndState"],"sources":["../../src/editor/tokenizer.ts"],"sourcesContent":["import { colorUtils } from '@pierre/theming/color';\nimport {\n EncodedTokenMetadata,\n type IGrammar,\n INITIAL,\n type StateStack,\n} from 'shiki/textmate';\n\nimport { DEFAULT_THEMES } from '../constants';\nimport type {\n BaseCodeOptions,\n DiffsHighlighter,\n HighlightedToken,\n RenderRange,\n} from '../types';\nimport type { TextDocument, TextDocumentChange } from './textDocument';\nimport { addEventListener, debounce, h } from './utils';\n\nconst TOKENIZE_TIME_LIMIT = 500;\n\nexport interface EditorTokenizerProps {\n highlighter: DiffsHighlighter;\n textDocument: TextDocument<unknown>;\n codeOptions: BaseCodeOptions;\n matchBrackets?: boolean;\n setStyle: (style: string) => void;\n onDeferTokenize: (\n lines: Map<number, Array<HighlightedToken>>,\n themeType: 'dark' | 'light'\n ) => void;\n // Fired after the active theme (light/dark mode or theme name) changes and the\n // new theme CSS has been applied. Lets the editor recompute overlay pieces\n // that captured a resolved theme color, e.g. rounded selection corner masks.\n onThemeChange?: () => void;\n __debug?: boolean;\n}\n\n/** Stoppable code tokenizer for the editor */\nexport class EditorTokenizer {\n #highlighter: DiffsHighlighter;\n #grammar: IGrammar | undefined;\n #mediaQueryList: MediaQueryList;\n #themeType: 'light' | 'dark' = 'dark';\n // The resolved name of the theme currently applied to the editor (e.g.\n // `github-light`). Tracked so `syncTheme` can detect a host-driven theme swap\n // even when the light/dark mode itself is unchanged.\n #themeName = '';\n #colorMap: string[];\n #textDocument: TextDocument<unknown>;\n #tokenizeMaxLineLength: number;\n #setStyle: EditorTokenizerProps['setStyle'];\n #onDeferTokenize: EditorTokenizerProps['onDeferTokenize'];\n #onThemeChange: EditorTokenizerProps['onThemeChange'];\n #matchBrackets: boolean;\n #debug: boolean;\n #disposes?: (() => void)[];\n #isCleanedUp = false;\n\n // state\n #stateStack: StateStack[] = [INITIAL]; // cached state stack by line index\n #comparisonStateStack: StateStack[] = [];\n #lastLine: number = -1;\n #isStopped: boolean = true;\n #isPaused: boolean = false;\n #backgroundJobId: number = 0;\n #backgroundChangedLineRanges: readonly [number, number][] | undefined;\n #backgroundChangedRangeIndex: number = 0;\n #bracketIgnoredRanges: Map<number, [number, number][] | null> = new Map();\n #isMessageListenerAttached: boolean = false;\n\n #prebuildStateStack = debounce(async (renderRange?: RenderRange) => {\n // Drop work scheduled before cleanUp; a late timer must not call setTheme\n // on a highlighter that tests (or hosts) have already disposed.\n if (this.#isCleanedUp) {\n return;\n }\n const { startingLine = 0, totalLines = Infinity } = renderRange ?? {};\n const endLine = Math.min(\n totalLines === Infinity ? Infinity : startingLine + totalLines,\n this.#textDocument.lineCount\n );\n if (\n this.#grammar === undefined &&\n !isGrammarlessLanguage(this.#textDocument.languageId)\n ) {\n await this.#highlighter.loadLanguage(this.#textDocument.languageId);\n if (this.#isCleanedUp) {\n return;\n }\n this.#grammar = this.#highlighter.getLanguage(\n this.#textDocument.languageId\n );\n }\n this.#ensureActiveTheme();\n this.#buildStateStack(endLine);\n }, 500);\n\n #onMessage = ({ data }: MessageEvent<unknown>) => {\n if (typeof data !== 'object' || data === null) {\n return;\n }\n const { type, jobId } = data as {\n type?: unknown;\n jobId?: unknown;\n };\n if (\n type === 'tokenize' &&\n typeof jobId === 'number' &&\n jobId === this.#backgroundJobId\n ) {\n this.#backgroundTokenize(jobId);\n }\n };\n\n get themeType(): 'light' | 'dark' {\n return this.#themeType;\n }\n\n getStringCommentRegexpRangesInLine(\n lineIndex: number\n ): [number, number][] | null {\n if (\n !this.#matchBrackets ||\n lineIndex < 0 ||\n lineIndex >= this.#textDocument.lineCount\n ) {\n return null;\n }\n this.#ensureGrammar();\n if (this.#grammar === undefined) {\n return null;\n }\n if (!this.#bracketIgnoredRanges.has(lineIndex)) {\n this.#buildStateStack(lineIndex);\n const state = this.#stateStack[lineIndex] ?? INITIAL;\n const result = this.#tokenizeLineAt(lineIndex, state);\n this.#stateStack[lineIndex + 1] = result.state;\n }\n return this.#bracketIgnoredRanges.get(lineIndex) ?? null;\n }\n\n constructor({\n codeOptions,\n highlighter,\n textDocument,\n matchBrackets,\n setStyle,\n onDeferTokenize,\n onThemeChange,\n __debug,\n }: EditorTokenizerProps) {\n const {\n themeType: themeTypeOption = 'system',\n theme = DEFAULT_THEMES,\n tokenizeMaxLineLength = 1000,\n } = codeOptions;\n this.#mediaQueryList = window.matchMedia('(prefers-color-scheme: dark)');\n let themeType: 'light' | 'dark' | undefined;\n if (themeTypeOption === 'system') {\n // Prefer the host document's computed color-scheme (page CSS/classes can\n // force light/dark while the OS media query differs) over matchMedia.\n themeType = this.#resolveSystemThemeType();\n } else {\n themeType = themeTypeOption;\n }\n // Only track the document/system color scheme when the surface follows it\n // (`themeType: 'system'`). A surface pinned to an explicit 'dark'/'light'\n // theme keeps that theme regardless of the page, so re-tokenizing after an\n // edit must emit the same `--diffs-token-{theme}` variable the SSR markup\n // used; otherwise the edited tokens fall back to the default foreground.\n if (typeof theme !== 'string' && themeTypeOption === 'system') {\n const observer = new MutationObserver((mutations) => {\n for (const { type, attributeName } of mutations) {\n if (\n type === 'attributes' &&\n attributeName !== null &&\n (attributeName === 'class' || attributeName.startsWith('data-'))\n ) {\n const themeType = this.#resolveSystemThemeType();\n this.#emitThemeChange(theme[themeType], themeType);\n break;\n }\n }\n });\n observer.observe(document.documentElement, { attributes: true });\n observer.observe(document.body, { attributes: true });\n this.#disposes = [\n addEventListener(this.#mediaQueryList, 'change', () => {\n // Re-read computed color-scheme so a host-forced scheme still wins\n // when the OS preference changes underneath it.\n const themeType = this.#resolveSystemThemeType();\n this.#emitThemeChange(theme[themeType], themeType);\n }),\n () => observer.disconnect(),\n ];\n }\n this.#highlighter = highlighter;\n this.#textDocument = textDocument;\n this.#tokenizeMaxLineLength = tokenizeMaxLineLength;\n this.#setStyle = setStyle;\n this.#onDeferTokenize = onDeferTokenize;\n this.#onThemeChange = onThemeChange;\n this.#matchBrackets = matchBrackets !== false;\n this.#debug = __debug ?? false;\n this.#ensureGrammar();\n this.#colorMap = [];\n this.#setTheme(\n typeof theme === 'string' ? theme : theme[themeType],\n themeType\n );\n }\n\n // By default, diffs components support dual themes, but the tokenizer only renders\n // the preferred theme. When the theme type is changed, the tokenizer will re-tokenize the document.\n #emitThemeChange(themeName: string, themeType: 'light' | 'dark') {\n this.#setTheme(themeName, themeType);\n this.stopBackgroundTokenize();\n this.#stateStack = [INITIAL];\n this.#comparisonStateStack = [];\n if (this.#grammar !== undefined && this.#textDocument.lineCount > 0) {\n this.#scheduleBackgroundTokenize(0);\n }\n // The theme CSS is now applied, so overlay pieces that captured a resolved\n // theme color (e.g. rounded selection corner masks) can recompute against\n // the new colors instead of keeping the old light/dark value.\n this.#onThemeChange?.();\n }\n\n // Resolve `themeType: 'system'` the same way the MutationObserver does: from\n // the host document's computed `color-scheme`. Apps often force a scheme via\n // page CSS/classes while the OS `prefers-color-scheme` media query differs;\n // using matchMedia here would flip tokens back to the OS preference on every\n // render sync and fight the observer.\n #resolveSystemThemeType(): 'light' | 'dark' {\n try {\n if (\n typeof document !== 'undefined' &&\n typeof getComputedStyle === 'function' &&\n document.body != null\n ) {\n return getComputedStyle(document.body).colorScheme === 'dark'\n ? 'dark'\n : 'light';\n }\n } catch {\n // jsdom and similar harnesses may lack getComputedStyle or throw; fall\n // through to the OS media query.\n }\n return this.#mediaQueryList.matches ? 'dark' : 'light';\n }\n\n // Re-apply the editor's theme from the surface's current code options. Edit\n // mode reuses a single tokenizer across re-renders, so when the host swaps the\n // theme — a theme picker, a light/dark toggle, etc. — we must recompute the\n // active theme and re-tokenize. Without this the editor keeps rendering the\n // theme it captured when it first attached (stale line-highlight background\n // and token colors). System-driven changes are still handled by the\n // observers wired up in the constructor; this covers explicit `themeType`/\n // `theme` option changes that those observers don't see.\n syncTheme(codeOptions: BaseCodeOptions): void {\n const { themeType = 'system', theme = DEFAULT_THEMES } = codeOptions;\n const nextThemeType =\n themeType === 'system' ? this.#resolveSystemThemeType() : themeType;\n const nextThemeName =\n typeof theme === 'string' ? theme : theme[nextThemeType];\n if (\n nextThemeType === this.#themeType &&\n nextThemeName === this.#themeName\n ) {\n return;\n }\n this.#emitThemeChange(nextThemeName, nextThemeType);\n }\n\n #setTheme(themeName: string, themeType?: 'light' | 'dark') {\n const { theme, colorMap } = this.#highlighter.setTheme(themeName);\n const { colors = {} } = this.#highlighter.getTheme(themeName);\n const selectionBackground = colors['editor.selectionBackground'];\n const themeLineHighlightBackground =\n colors['editor.lineHighlightBackground'];\n const lineHighlightBackground =\n themeLineHighlightBackground != null &&\n themeLineHighlightBackground.trim() !== '' &&\n !colorUtils.isFullyTransparent(themeLineHighlightBackground)\n ? themeLineHighlightBackground\n : undefined;\n // A usable theme background opts into the semantic active-line mix.\n // Missing backgrounds retain the resolved row color and rely on a border.\n const lineHighlightBorder =\n colors['editor.lineHighlightBorder'] ??\n (lineHighlightBackground == null\n ? 'color-mix(in lab, var(--diffs-bg) 70%, var(--diffs-fg))'\n : 'transparent');\n const activeLineSourceMix =\n lineHighlightBackground == null ? '100%' : '85%';\n const cursorForeground = colors['editorCursor.foreground'];\n const findMatchBackground = colors['editor.findMatchBackground'];\n const findMatchHighlightBackground =\n colors['editor.findMatchHighlightBackground'];\n const bracketMatchBackground = colors['editorBracketMatch.background'];\n const bracketMatchBorder = colors['editorBracketMatch.border'];\n const hintForeground = colors['editorHint.foreground'];\n const infoForeground = colors['editorInfo.foreground'];\n const warningForeground = colors['editorWarning.foreground'];\n const errorForeground = colors['editorError.foreground'];\n this.#setStyle(`:host {\n --diffs-editor-selection-bg: ${selectionBackground ?? 'var(--diffs-line-bg)'};\n --diffs-editor-line-highlight-border: ${lineHighlightBorder};\n --diffs-editor-active-line-source-mix: ${activeLineSourceMix};\n --diffs-editor-match-bg: ${findMatchBackground ?? 'initial'};\n --diffs-editor-match-highlight-bg: ${findMatchHighlightBackground ?? 'initial'};\n --diffs-editor-bracket-match-bg: ${bracketMatchBackground ?? 'initial'};\n --diffs-editor-bracket-match-border: ${bracketMatchBorder ?? 'initial'};\n --diffs-editor-cursor-fg: ${cursorForeground ?? 'initial'};\n --diffs-editor-hint-fg: ${hintForeground ?? 'initial'};\n --diffs-editor-info-fg: ${infoForeground ?? 'initial'};\n --diffs-editor-warning-fg: ${warningForeground ?? 'initial'};\n --diffs-editor-error-fg: ${errorForeground ?? 'initial'};\n }`);\n this.#themeName = themeName;\n this.#themeType = themeType ?? theme.type;\n this.#colorMap = colorMap;\n }\n\n // The shared highlighter is also used for dual-theme SSR (`themes: {dark,light}`),\n // which leaves its active theme on whichever pass finished last (usually light).\n // The tokenizer caches a single-theme colorMap from construction; if we tokenize\n // without re-activating that theme, grammar color indices are looked up in the\n // wrong map — property names resolve to a near-foreground gray while types and\n // comments (stable across maps) still look correct. Re-apply before every\n // tokenize path so a first edit after load matches a later file-switch re-attach.\n #ensureActiveTheme(): void {\n if (this.#themeName === '') {\n return;\n }\n const { colorMap } = this.#highlighter.setTheme(this.#themeName);\n this.#colorMap = colorMap;\n }\n\n cleanUp(): void {\n this.#isCleanedUp = true;\n this.stopBackgroundTokenize();\n this.#detachMessageListener();\n this.#disposes?.forEach((dispose) => dispose());\n this.#disposes = undefined;\n }\n\n // to use `tokenize`, call `prebuildStateStackMap` first to prebuild\n // the state stack map for the given render range.\n tokenize(\n change: TextDocumentChange,\n renderRange?: RenderRange\n ): Map<number, Array<HighlightedToken>> {\n this.#ensureGrammar();\n this.#ensureActiveTheme();\n if (\n this.#grammar === undefined &&\n !isGrammarlessLanguage(this.#textDocument.languageId)\n ) {\n throw new Error(\n `Grammar for language \"${this.#textDocument.languageId}\" not loaded`\n );\n }\n\n if (this.#matchBrackets) {\n // Clear ignored token ranges for lines invalidated by the edit.\n for (const line of this.#bracketIgnoredRanges.keys()) {\n if (line >= change.startLine) {\n this.#bracketIgnoredRanges.delete(line);\n }\n }\n }\n\n const { lineCount } = this.#textDocument;\n const { startingLine = 0, totalLines = Infinity } = renderRange ?? {};\n const renderRangeEndLine =\n totalLines === Infinity\n ? lineCount\n : Math.min(startingLine + totalLines, lineCount);\n\n const dirtyStart = change.startLine;\n const viewStart = Math.max(startingLine, dirtyStart);\n const crossesRenderRangeEnd =\n renderRange !== undefined &&\n totalLines !== Infinity &&\n change.lineDelta > 0 &&\n dirtyStart < renderRangeEndLine &&\n change.endLine >= renderRangeEndLine;\n const canReuseCachedStates = change.lineDelta === 0;\n const canCacheTokenizedStates =\n canReuseCachedStates ||\n renderRange === undefined ||\n dirtyStart >= viewStart;\n const changedLineRanges: readonly [number, number][] =\n change.changedLineRanges ?? [[dirtyStart, change.endLine]];\n this.#comparisonStateStack = [];\n let offscreenSyncEnd = -1;\n if (dirtyStart < viewStart) {\n for (const [rangeStart, rangeEnd] of changedLineRanges) {\n if (rangeStart < viewStart) {\n offscreenSyncEnd = Math.max(\n offscreenSyncEnd,\n Math.min(rangeEnd, viewStart - 1)\n );\n }\n }\n }\n const shouldFlushOffscreenLines =\n offscreenSyncEnd >= dirtyStart &&\n (canReuseCachedStates || change.lineDelta < 0);\n if (canReuseCachedStates) {\n this.#buildStateStack(dirtyStart);\n } else {\n this.#shiftComparisonStateStack(change);\n if (renderRange === undefined || dirtyStart >= viewStart) {\n this.#buildStateStack(viewStart);\n }\n }\n\n let changedRangeIndex = 0;\n let currentChangedRangeEnd = changedLineRanges[changedRangeIndex][1];\n let backgroundStartLine: number | undefined;\n let backgroundChangedRangeIndex = 0;\n let line = canReuseCachedStates\n ? changedLineRanges[changedRangeIndex][0]\n : viewStart;\n let settled = false;\n const dirtyLines: Map<number, Array<HighlightedToken>> = new Map();\n const offscreenDirtyLines:\n | Map<number, Array<HighlightedToken>>\n | undefined = shouldFlushOffscreenLines ? new Map() : undefined;\n if (offscreenDirtyLines !== undefined && !canReuseCachedStates) {\n const offscreenEnd = Math.min(\n offscreenSyncEnd + 1,\n viewStart,\n renderRangeEndLine\n );\n if (offscreenEnd > dirtyStart) {\n this.#buildStateStack(offscreenEnd);\n let offscreenLine = dirtyStart;\n let offscreenState = this.#stateStack[offscreenLine] ?? INITIAL;\n for (; offscreenLine < offscreenEnd; offscreenLine++) {\n const resolved = this.#tokenizeLineAt(offscreenLine, offscreenState);\n offscreenState = resolved.state;\n offscreenDirtyLines.set(offscreenLine, resolved.resolvedTokens);\n }\n this.#stateStack[offscreenEnd] = offscreenState;\n }\n }\n // Seed the loop's grammar state after the offscreen flush, not before it.\n // When a delete's removed lines reach the viewport's first line, the flush\n // rebuilds the cached state up to `line`; reading it earlier would capture\n // the truncated INITIAL state and color the viewport as if outside an open\n // construct (block comment, template literal) it is actually inside.\n let state = this.#stateStack[line] ?? INITIAL;\n for (; line < renderRangeEndLine; ) {\n const previousNextState = canReuseCachedStates\n ? this.#stateStack[line + 1]\n : undefined;\n if (canCacheTokenizedStates) {\n this.#stateStack[line] = state;\n }\n\n const { resolvedTokens, state: nextState } = this.#tokenizeLineAt(\n line,\n state\n );\n state = nextState;\n\n if (line >= viewStart) {\n dirtyLines.set(line, resolvedTokens);\n } else {\n offscreenDirtyLines?.set(line, resolvedTokens);\n }\n\n if (canCacheTokenizedStates) {\n this.#stateStack[line + 1] = state;\n }\n settled =\n line >= currentChangedRangeEnd &&\n canReuseCachedStates &&\n previousNextState !== undefined &&\n state.equals(previousNextState);\n if (settled) {\n changedRangeIndex++;\n const nextRange = changedLineRanges[changedRangeIndex];\n if (nextRange === undefined) {\n break;\n }\n if (nextRange[0] >= renderRangeEndLine) {\n backgroundStartLine = nextRange[0];\n backgroundChangedRangeIndex = changedRangeIndex;\n break;\n }\n if (this.#stateStack[nextRange[0]] === undefined) {\n currentChangedRangeEnd = nextRange[1];\n line++;\n } else {\n line = nextRange[0];\n state = this.#stateStack[line] ?? state;\n currentChangedRangeEnd = nextRange[1];\n }\n settled = false;\n continue;\n }\n line++;\n }\n\n if (canCacheTokenizedStates) {\n if (line < renderRangeEndLine) {\n this.#stateStack[line + 1] = state;\n } else {\n this.#stateStack[line] = state;\n }\n }\n\n if (offscreenDirtyLines !== undefined && offscreenDirtyLines.size > 0) {\n this.#onDeferTokenize(offscreenDirtyLines, this.#themeType);\n }\n\n if (backgroundStartLine !== undefined) {\n this.#scheduleBackgroundTokenize(\n backgroundStartLine,\n changedLineRanges,\n backgroundChangedRangeIndex\n );\n } else if (!settled && line < lineCount) {\n const backgroundLine =\n crossesRenderRangeEnd && dirtyStart >= viewStart\n ? renderRangeEndLine\n : dirtyStart < viewStart && !canReuseCachedStates\n ? dirtyStart\n : line;\n this.#scheduleBackgroundTokenize(\n backgroundLine,\n changedLineRanges,\n changedRangeIndex\n );\n }\n\n return dirtyLines;\n }\n\n prebuildStateStack(renderRange?: RenderRange): void {\n this.#ensureGrammar();\n this.#prebuildStateStack(renderRange);\n }\n\n stopBackgroundTokenize(): void {\n if (this.#isStopped) {\n return;\n }\n this.#isStopped = true;\n this.#isPaused = false;\n this.#lastLine = -1;\n this.#backgroundChangedLineRanges = undefined;\n this.#backgroundChangedRangeIndex = 0;\n this.#comparisonStateStack = [];\n this.#detachMessageListener();\n }\n\n pauseBackgroundTokenize(): void {\n if (this.#isStopped || this.#isPaused) {\n return;\n }\n if (this.#debug) {\n console.log('[diffs/editor] background tokenization paused', {\n jobId: this.#backgroundJobId,\n });\n }\n this.#isPaused = true;\n }\n\n resumeBackgroundTokenize(): void {\n if (\n this.#isStopped ||\n !this.#isPaused ||\n this.#grammar === undefined ||\n this.#lastLine < 0\n ) {\n return;\n }\n if (this.#debug) {\n console.log('[diffs/editor] background tokenization resumed', {\n jobId: this.#backgroundJobId,\n });\n }\n this.#isPaused = false;\n this.#postTokenizeMessage(this.#backgroundJobId);\n }\n\n #ensureGrammar(): void {\n if (\n this.#grammar === undefined &&\n !isGrammarlessLanguage(this.#textDocument.languageId) &&\n this.#highlighter\n .getLoadedLanguages()\n .includes(this.#textDocument.languageId)\n ) {\n this.#grammar = this.#highlighter.getLanguage(\n this.#textDocument.languageId\n );\n }\n }\n\n #attachMessageListener(): void {\n if (this.#isMessageListenerAttached) {\n return;\n }\n globalThis.addEventListener('message', this.#onMessage);\n this.#isMessageListenerAttached = true;\n }\n\n #detachMessageListener(): void {\n if (!this.#isMessageListenerAttached) {\n return;\n }\n globalThis.removeEventListener('message', this.#onMessage);\n this.#isMessageListenerAttached = false;\n }\n\n #postTokenizeMessage(jobId: number): void {\n // use `postMessage` instead of `setTimeout(fn, 0)` to avoid 4ms delay\n globalThis.postMessage({ type: 'tokenize', jobId });\n }\n\n #scheduleBackgroundTokenize(\n startLine: number,\n changedLineRanges?: readonly [number, number][],\n changedRangeIndex = 0\n ): void {\n if (isGrammarlessLanguage(this.#textDocument.languageId)) {\n return;\n }\n\n const jobId = ++this.#backgroundJobId;\n\n if (this.#debug) {\n console.log('[diffs/editor] background tokenization scheduled', {\n jobId,\n startLine,\n changedLineRanges,\n changedRangeIndex,\n });\n }\n\n this.#isStopped = false;\n this.#isPaused = false;\n this.#lastLine = startLine;\n this.#backgroundChangedLineRanges = changedLineRanges;\n this.#backgroundChangedRangeIndex = changedRangeIndex;\n this.#attachMessageListener();\n this.#postTokenizeMessage(jobId);\n }\n\n #tokenizeLineAt(\n line: number,\n state: StateStack\n ): { resolvedTokens: Array<HighlightedToken>; state: StateStack } {\n const lineText = this.#textDocument.getLineText(line);\n if (lineText.length > this.#tokenizeMaxLineLength) {\n console.warn(\n `[diffs] Line(${line}) too long to tokenize: ${lineText.length}`\n );\n this.#cacheBracketIgnoredRanges(line, null);\n return { resolvedTokens: [[0, '', lineText]], state };\n }\n if (\n this.#grammar === undefined ||\n lineText === '' ||\n lineText.trim() === ''\n ) {\n this.#cacheBracketIgnoredRanges(line, null);\n return { resolvedTokens: [[0, '', lineText]], state };\n }\n const result = tokenizeLine(\n this.#grammar,\n this.#colorMap,\n lineText,\n state,\n TOKENIZE_TIME_LIMIT,\n this.#matchBrackets\n );\n this.#cacheBracketIgnoredRanges(line, result.bracketIgnoredRanges);\n return {\n resolvedTokens: result.resolvedTokens,\n state: result.ruleStack,\n };\n }\n\n #cacheBracketIgnoredRanges(\n line: number,\n ranges: [number, number][] | null\n ): void {\n if (this.#matchBrackets) {\n this.#bracketIgnoredRanges.set(line, ranges);\n }\n }\n\n // Preserve old end states as comparison-only sentinels. They let background\n // tokenization stop when grammar state reconverges without letting foreground\n // tokenization seed from stale pre-edit states.\n #shiftComparisonStateStack(change: TextDocumentChange): void {\n const lineChanges =\n change.changedLineChanges ??\n ([[change.startLine, change.endLine, change.lineDelta]] as const);\n const comparisonStateStack = this.#stateStack.slice();\n\n for (const [startLine, endLine, lineDelta] of lineChanges) {\n if (lineDelta === 0) {\n continue;\n }\n\n const insertedLineSpan = endLine - startLine;\n const oldLineSpan = insertedLineSpan - lineDelta;\n const sourceStart = startLine + oldLineSpan + 1;\n const targetStart = startLine + insertedLineSpan + 1;\n const originalLength = comparisonStateStack.length;\n\n if (lineDelta > 0) {\n for (let line = originalLength - 1; line >= sourceStart; line--) {\n const targetLine = line + lineDelta;\n if (line in comparisonStateStack) {\n comparisonStateStack[targetLine] = comparisonStateStack[line];\n } else {\n Reflect.deleteProperty(comparisonStateStack, targetLine);\n }\n }\n } else {\n for (let line = sourceStart; line < originalLength; line++) {\n const targetLine = line + lineDelta;\n if (line in comparisonStateStack) {\n comparisonStateStack[targetLine] = comparisonStateStack[line];\n } else {\n Reflect.deleteProperty(comparisonStateStack, targetLine);\n }\n }\n comparisonStateStack.length = Math.max(\n Math.min(originalLength, startLine + 1),\n originalLength + lineDelta\n );\n }\n\n for (let line = startLine + 1; line < targetStart; line++) {\n Reflect.deleteProperty(comparisonStateStack, line);\n }\n }\n\n this.#stateStack.length = Math.min(\n this.#stateStack.length,\n change.startLine + 1\n );\n comparisonStateStack.length = Math.min(\n comparisonStateStack.length,\n this.#textDocument.lineCount + 1\n );\n for (let line = 0; line <= change.startLine; line++) {\n Reflect.deleteProperty(comparisonStateStack, line);\n }\n this.#comparisonStateStack = comparisonStateStack;\n }\n\n #getPreviousEndState(line: number): StateStack | undefined {\n return this.#comparisonStateStack[line] ?? this.#stateStack[line];\n }\n\n #buildStateStack(endAt: number) {\n const boundedEndAt = Math.min(\n Math.max(0, endAt),\n this.#textDocument.lineCount\n );\n if (this.#stateStack.length > boundedEndAt || this.#grammar === undefined) {\n return;\n }\n let line = this.#stateStack.length - 1;\n let state = this.#stateStack[line] ?? INITIAL;\n for (; line < boundedEndAt; line++) {\n this.#stateStack[line] = state;\n const lineText = this.#textDocument.getLineText(line);\n if (\n lineText.length <= this.#tokenizeMaxLineLength &&\n lineText !== '' &&\n lineText.trim() !== ''\n ) {\n const result = tokenizeLine(\n this.#grammar,\n this.#colorMap,\n lineText,\n state,\n TOKENIZE_TIME_LIMIT,\n this.#matchBrackets\n );\n this.#cacheBracketIgnoredRanges(line, result.bracketIgnoredRanges);\n state = result.ruleStack;\n } else {\n this.#cacheBracketIgnoredRanges(line, null);\n }\n }\n this.#stateStack[line] = state;\n }\n\n #backgroundTokenize(jobId: number) {\n if (\n this.#isStopped ||\n this.#isPaused ||\n this.#grammar === undefined ||\n jobId !== this.#backgroundJobId\n ) {\n return;\n }\n\n this.#ensureActiveTheme();\n\n const t = performance.now();\n const lines = new Map<number, Array<HighlightedToken>>();\n const totalLines = this.#textDocument.lineCount;\n const changedLineRanges = this.#backgroundChangedLineRanges;\n\n let line = this.#lastLine;\n let state = this.#stateStack[line] ?? INITIAL;\n let settled = false;\n let changedRangeIndex = this.#backgroundChangedRangeIndex;\n let currentChangedRangeEnd = changedLineRanges?.[changedRangeIndex]?.[1];\n for (; line < totalLines; ) {\n this.#stateStack[line] = state;\n\n const previousNextState =\n currentChangedRangeEnd !== undefined\n ? this.#getPreviousEndState(line + 1)\n : undefined;\n const lineText = this.#textDocument.getLineText(line);\n if (lineText.length > this.#tokenizeMaxLineLength) {\n console.warn(\n `[diffs] Line(${line}) too long to tokenize: ${lineText.length}`\n );\n lines.set(line, [[0, '', lineText]]);\n this.#cacheBracketIgnoredRanges(line, null);\n } else if (lineText === '' || lineText.trim() === '') {\n lines.set(line, [[0, '', lineText]]);\n this.#cacheBracketIgnoredRanges(line, null);\n } else {\n const ret = tokenizeLine(\n this.#grammar,\n this.#colorMap,\n lineText,\n state,\n TOKENIZE_TIME_LIMIT,\n this.#matchBrackets\n );\n lines.set(line, ret.resolvedTokens);\n this.#cacheBracketIgnoredRanges(line, ret.bracketIgnoredRanges);\n state = ret.ruleStack;\n }\n\n this.#stateStack[line + 1] = state;\n settled =\n currentChangedRangeEnd !== undefined &&\n line >= currentChangedRangeEnd &&\n previousNextState !== undefined &&\n state.equals(previousNextState);\n line++;\n if (settled) {\n changedRangeIndex++;\n const nextRange = changedLineRanges?.[changedRangeIndex];\n if (nextRange === undefined) {\n break;\n }\n currentChangedRangeEnd = nextRange[1];\n if (this.#stateStack[nextRange[0]] === undefined) {\n settled = false;\n } else {\n line = nextRange[0];\n state = this.#stateStack[line] ?? state;\n settled = false;\n continue;\n }\n }\n\n // limit the time of partial tokenize to 1ms\n if (performance.now() - t > 1) {\n break;\n }\n }\n\n this.#onDeferTokenize(lines, this.#themeType);\n if (this.#isStopped || this.#isPaused || jobId !== this.#backgroundJobId) {\n return;\n }\n\n if (settled || line >= totalLines) {\n this.stopBackgroundTokenize();\n return;\n }\n\n this.#lastLine = line;\n this.#backgroundChangedRangeIndex = changedRangeIndex;\n this.#postTokenizeMessage(jobId);\n }\n}\n\nfunction tokenizeLine(\n grammar: IGrammar,\n colorMap: string[],\n lineText: string,\n stateStack: StateStack,\n timeLimit?: number,\n collectBracketIgnoredRanges = true\n): {\n ruleStack: StateStack;\n resolvedTokens: Array<HighlightedToken>;\n bracketIgnoredRanges: [number, number][];\n} {\n const result = grammar.tokenizeLine2(lineText, stateStack, timeLimit);\n if (result.stoppedEarly) {\n console.warn(\n `[diffs] Time limit reached when tokenizing line: ${lineText.substring(0, 100)}`\n );\n }\n const rawTokens = result.tokens;\n const tokensLength = rawTokens.length / 2;\n const resolvedTokens: Array<HighlightedToken> = [];\n const bracketIgnoredRanges: [number, number][] = [];\n for (let j = 0; j < tokensLength; j++) {\n const offset = rawTokens[2 * j];\n const nextOffset =\n j + 1 < tokensLength ? rawTokens[2 * j + 2] : lineText.length;\n if (offset === nextOffset) {\n // should never reach here, skip if happens anyway\n continue;\n }\n const metadata = rawTokens[2 * j + 1];\n const fg = EncodedTokenMetadata.getForeground(metadata);\n const tokenText = lineText.slice(offset, nextOffset);\n resolvedTokens.push([offset, colorMap[fg], tokenText]);\n if (\n collectBracketIgnoredRanges &&\n EncodedTokenMetadata.getTokenType(metadata) > 0\n ) {\n bracketIgnoredRanges.push([offset, nextOffset]);\n }\n }\n return {\n ruleStack: result.ruleStack,\n resolvedTokens,\n bracketIgnoredRanges,\n };\n}\n\nexport function renderLineTokens(\n tokens: Array<HighlightedToken>\n): (HTMLElement | string)[] {\n return tokens.map(([char, fg, textContent]) => {\n if (char === 0 && fg === '') {\n if (textContent === '') {\n return h('br');\n }\n return textContent;\n }\n return h('span', {\n dataset: {\n char: char.toString(),\n },\n style: `color:${fg};`,\n textContent: textContent,\n });\n });\n}\n\n// Shiki special-cases `text` and `ansi` in codeToHast but does not expose grammars.\nfunction isGrammarlessLanguage(languageId: string): boolean {\n return languageId === 'text' || languageId === 'ansi';\n}\n"],"mappings":"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"}
@@ -16,7 +16,7 @@ function h(tagName, props, parent) {
16
16
  }
17
17
  function addEventListener(el, event, listener, options) {
18
18
  el.addEventListener(event, listener, options);
19
- return () => el.removeEventListener(event, listener);
19
+ return () => el.removeEventListener(event, listener, options);
20
20
  }
21
21
  function getLineNumberAttr(el, key = "line") {
22
22
  const value = el.dataset[key];