@pierre/diffs 1.3.0-beta.5 → 1.3.0-beta.7

package/dist/editor/editor2.js

@@ -1,6 +1,6 @@
-//#region src/editor/editor.css
-var editor_default = "@layer base,theme,rendered,unsafe;::selection{background-color:#0000}@keyframes blinking{0%{opacity:1}50%{opacity:0}to{opacity:1}}:host,[data-code],[data-content]{position:relative}[data-content]{caret-color:var(--diffs-bg-caret);background-color:#0000;outline:none}[data-gutter-buffer],[data-line]:not([data-selected-line]),[data-line]:not([data-selected-line]) span,[data-line-annotation]{background-color:#0000}[data-column-number]{color:var(--diffs-editor-line-number-fg)}[data-column-number][data-selected-line]{background-color:var(--diffs-editor-line-number-active-bg);color:var(--diffs-editor-line-number-active-fg)}[data-column-number][data-active]{color:var(--diffs-editor-line-number-active-fg)}[data-line]{cursor:text}[data-line][data-selected-line]{background-color:var(--diffs-editor-line-highlight-bg)}[data-line][data-line-type=change-deletion]{background-color:var(--diffs-line-bg)}[data-editor-overlay]{display:contents}[data-caret],[data-selection-range],[data-match-range],[data-marker-range]{height:1lh;line-height:var(--diffs-line-height);pointer-events:none;position:absolute;top:0;left:0}[data-caret]{background-color:var(--diffs-bg-caret-override,var(--diffs-editor-cursor-fg,light-dark(color-mix(in lab, var(--diffs-fg) 50%, var(--diffs-bg)),color-mix(in lab, var(--diffs-fg) 75%, var(--diffs-bg)))));visibility:hidden;width:2px;animation:1.2s .8s infinite blinking}[data-selection-range]{z-index:-10;background-color:var(--diffs-editor-selection-bg)}[data-selection-corner]{background-color:var(--diffs-bg);width:100%;height:100%}[data-match-range]{z-index:-10;background-color:var(--diffs-editor-match-bg,var(--diffs-editor-selection-bg))}[data-match-range]:not([data-focus]){background-color:var(--diffs-editor-match-highlight-bg,light-dark(#ff963288,#ff963266))}[data-marker-range]{z-index:1;mask-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2IiBoZWlnaHQ9IjMiPjxwYXRoIGQ9Im0wIDIuNSBsMiAtMS41IGwxIDAgbDIgMS41IGwxIDAiIHN0cm9rZT0iI2ZmZiIgZmlsbD0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIi8+PC9zdmc+);mask-position:0 100%;mask-size:6px 3px;mask-repeat:repeat-x}[data-marker-error]{background-color:var(--diffs-editor-error-fg,red)}[data-marker-warning]{background-color:var(--diffs-editor-warning-fg,#cca700)}[data-marker-info]{background-color:var(--diffs-editor-info-fg,#3794ff)}[data-marker-hint]{background-color:var(--diffs-editor-hint-fg,#6a6a6a)}[data-rtl]{border-top-left-radius:3px}[data-rtr]{border-top-right-radius:3px}[data-rbl]{border-bottom-left-radius:3px}[data-rbr]{border-bottom-right-radius:3px}@media (width>=480px){[data-content]{caret-color:#0000}[data-selection-action]{caret-color:currentColor}[data-content]:focus~[data-editor-overlay] [data-caret]{visibility:visible}}[data-editor-widget]{--diffs-widget-bg:color-mix(in lab, var(--diffs-fg) 4%, var(--diffs-bg));--diffs-widget-border:color-mix(in lab, var(--diffs-fg) 20%, transparent);--diffs-widget-shadow:inset 0 0 0 1px var(--diffs-bg), 0 4px 8px #00000013, 0 6px 18px #00000013;z-index:100;border:1px solid var(--diffs-widget-border);background-color:var(--diffs-widget-bg);width:fit-content;max-width:calc(100% - 24px);box-shadow:var(--diffs-widget-shadow);background-clip:padding-box;border-radius:9px;position:absolute;top:0;left:0}[data-marker-popup]{pointer-events:auto;min-width:180px;font-family:var(--diffs-header-font-fallback);padding:8px 12px;font-size:14px;line-height:1.4}[data-marker-popup] code{background-color:#0000;display:inline}[data-selection-action-icon]{z-index:10;width:1lh;height:1lh;color:color-mix(in lab, var(--diffs-fg) 40%, var(--diffs-bg));cursor:pointer;visibility:hidden;border-radius:4px;justify-content:center;align-items:center;transition:background-color .1s ease-in-out,color .1s ease-in-out;display:flex;position:absolute;top:0;left:-1lh}[data-selection-action-icon][data-visible=true]{visibility:visible}[data-selection-action-icon]:hover{background-color:color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg));color:var(--diffs-fg)}[data-selection-action]{padding-inline-end:1ch}[data-search-panel]{z-index:100;flex-direction:column;justify-content:right;width:100%;height:fit-content;margin-bottom:4px;display:flex;position:sticky;top:12px;right:12px}[data-search-panel] [data-editor-widget]{z-index:100;max-width:100%;font-family:var(--diffs-header-font-fallback);align-items:flex-start;gap:8px;margin-inline:auto 12px;padding:4px;font-size:14px;display:flex;position:relative}[data-search-grid]{grid-template-columns:auto auto auto;align-items:center;gap:4px 6px;display:grid}[data-search-grid][data-mode=find] [data-replace-cell]{display:none}[data-input-box]{align-items:center;width:200px;display:flex;position:relative}[data-input-box] input{width:100%;min-width:0;color:var(--diffs-fg);background-color:var(--diffs-bg);border:1px solid color-mix(in lab, var(--diffs-fg) 12%, var(--diffs-bg));border-radius:6px;outline:none;flex-grow:1;padding-inline:6px;font-size:13px;line-height:24px}[data-input-box][data-find] input{padding-inline-end:72px}[data-input-box] input::selection{background-color:color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg))}[data-search-toggles]{align-items:center;gap:1px;display:flex;position:absolute;top:50%;right:4px;transform:translateY(-50%)}[data-matches]{white-space:nowrap;min-width:50px;color:color-mix(in lab, var(--diffs-fg) 50%, var(--diffs-bg));flex-shrink:0;font-size:12px;font-weight:500;line-height:20px}[data-matches][data-no-matches]{color:color-mix(in lab, var(--diffs-fg) 35%, var(--diffs-bg))}[data-replace-actions],[data-search-nav]{align-items:center;display:flex}[data-search-panel] svg{fill:currentColor;display:block}[data-search-panel] [data-icon]{width:24px;height:24px;color:color-mix(in lab, var(--diffs-fg) 65%, var(--diffs-bg));cursor:pointer;border-radius:4px;flex-shrink:0;justify-content:center;align-items:center;transition:background-color .1s ease-in-out,color .1s ease-in-out;display:flex}[data-search-panel] [data-icon][data-disabled=true]{opacity:.25;pointer-events:none}[data-search-panel] [data-icon]:hover{color:var(--diffs-fg)}[data-search-panel] [data-icon][data-active=true]{color:light-dark(var(--diffs-modified-light),var(--diffs-modified-dark))}";
-
+//#region src/editor/editor.css?inline
+var editor_default = "::selection {\n  background-color: #0000;\n}\n\n[data-deleted-text-selection] [data-deletions] ::selection, [data-deleted-text-selection] [data-line-type=\"change-deletion\"] ::selection {\n  background-color: var(--diffs-editor-selection-bg);\n}\n\n@keyframes blinking {\n  0% {\n    opacity: 1;\n  }\n\n  50% {\n    opacity: 0;\n  }\n\n  100% {\n    opacity: 1;\n  }\n}\n\n:host, [data-code], [data-content], [data-diff-type=\"split\"][data-overflow=\"wrap\"] {\n  position: relative;\n}\n\n[data-code] {\n  container-type: inline-size;\n}\n\n[data-content] {\n  cursor: text;\n  caret-color: var(--diffs-bg-caret);\n  background-color: #0000;\n  outline: none;\n}\n\n[data-line] {\n  cursor: text;\n  background-color: #0000;\n}\n\n[data-line]:after {\n  content: \"\";\n  z-index: -20;\n  background-color: var(--diffs-line-bg);\n  pointer-events: none;\n  position: absolute;\n  inset: 0;\n}\n\n[data-line][data-selected-line]:after {\n  background-color: var(--diffs-computed-diff-line-bg, var(--diffs-bg));\n  background-image: linear-gradient(var(--diffs-editor-line-highlight-bg),\n    var(--diffs-editor-line-highlight-bg));\n}\n\n[data-editor-overlay] {\n  display: contents;\n}\n\n[data-caret], [data-selection-range], [data-match-range], [data-marker-range] {\n  height: 1lh;\n  line-height: var(--diffs-line-height);\n  pointer-events: none;\n  position: absolute;\n  top: 0;\n  left: 0;\n}\n\n[data-caret] {\n  background-color: var(--diffs-bg-caret-override, var(--diffs-editor-cursor-fg, light-dark(color-mix(in lab, var(--diffs-fg) 50%, var(--diffs-bg)), color-mix(in lab, var(--diffs-fg) 75%, var(--diffs-bg)))));\n  visibility: hidden;\n  width: 2px;\n}\n\n@media (prefers-reduced-motion: no-preference) {\n  [data-caret] {\n    animation: 1.2s .8s infinite blinking;\n  }\n}\n\n[data-selection-range] {\n  z-index: -10;\n  background-color: var(--diffs-editor-selection-bg);\n}\n\n[data-selection-corner] {\n  background-color: var(--diffs-selection-corner-bg, var(--diffs-bg));\n  width: 100%;\n  height: 100%;\n}\n\n[data-match-range] {\n  z-index: -10;\n  background-color: var(--diffs-editor-match-bg, var(--diffs-editor-selection-bg));\n}\n\n[data-match-range]:not([data-focus]) {\n  background-color: var(--diffs-editor-match-highlight-bg, light-dark(#ff963288, #ff963266));\n}\n\n[data-rtl] {\n  border-top-left-radius: 3px;\n}\n\n[data-rtr] {\n  border-top-right-radius: 3px;\n}\n\n[data-rbl] {\n  border-bottom-left-radius: 3px;\n}\n\n[data-rbr] {\n  border-bottom-right-radius: 3px;\n}\n\n[data-marker-range] {\n  z-index: 1;\n  background-color: var(--diffs-marker-bg);\n  mask-image: url(\"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2IiBoZWlnaHQ9IjMiPjxwYXRoIGQ9Im0wIDIuNSBsMiAtMS41IGwxIDAgbDIgMS41IGwxIDAiIHN0cm9rZT0iI2ZmZiIgZmlsbD0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIi8+PC9zdmc+\");\n  mask-position: 0 100%;\n  mask-size: 6px 3px;\n  mask-repeat: repeat-x;\n}\n\n[data-marker-error] {\n  --diffs-marker-contrast: #fff;\n  --diffs-marker-bg: var(--diffs-editor-error-fg, var(--diffs-deletion-base));\n}\n\n[data-marker-warning] {\n  --diffs-marker-contrast: #000;\n  --diffs-marker-bg: var(--diffs-editor-warning-fg, light-dark(var(--diffs-warning-light), var(--diffs-warning-dark)));\n}\n\n[data-marker-info] {\n  --diffs-marker-contrast: #fff;\n  --diffs-marker-bg: var(--diffs-editor-info-fg, var(--diffs-modified-base));\n}\n\n[data-marker-hint] {\n  --diffs-marker-contrast: light-dark(#fff, #000);\n  --diffs-marker-bg: var(--diffs-editor-hint-fg, var(--diffs-fg-number));\n}\n\n@media (width >= 480px) {\n  [data-content] {\n    caret-color: #0000;\n  }\n\n  [data-content]:focus ~ [data-editor-overlay] [data-caret] {\n    visibility: visible;\n  }\n}\n\n[data-editor-widget] {\n  --diffs-widget-fg: var(--diffs-fg);\n  --diffs-widget-bg: color-mix(in lab, var(--diffs-fg) 4%, var(--diffs-bg));\n  --diffs-widget-border: color-mix(in lab, var(--diffs-fg) 20%, transparent);\n  --diffs-widget-shadow: inset 0 0 0 1px var(--diffs-bg), 0 4px 8px #00000013,\n    0 6px 18px #00000013;\n  z-index: 100;\n  width: fit-content;\n  max-width: calc(100% - 24px);\n  font: 14px/20px var(--diffs-header-font-fallback);\n  border: 1px solid var(--diffs-widget-border);\n  background-color: var(--diffs-widget-bg);\n  box-shadow: var(--diffs-widget-shadow);\n  background-clip: padding-box;\n  border-radius: 9px;\n  position: absolute;\n  top: 0;\n  left: 0;\n}\n\n[data-marker-popup], [data-selection-action-popover] {\n  --popover-min-left: calc(var(--gutter-width, 0px) + 8px);\n  --popover-available-width: calc(100cqw - var(--gutter-width, 0px) - 16px);\n  max-width: min(640px, var(--popover-available-width));\n  translate: clamp(var(--popover-min-left),\n      var(--popover-x, var(--popover-min-left)),\n      calc(100cqw - 8px - 100%))\n    var(--popover-y, 0);\n}\n\n[data-marker-popup] {\n  --diffs-widget-bg: var(--diffs-marker-bg);\n  --diffs-widget-shadow: 0 4px 8px #00000026, 0 6px 18px #00000026;\n  overflow-wrap: anywhere;\n  min-width: min(180px, 100cqw - 24px);\n  color: var(--diffs-marker-contrast, contrast-color(#fff, #000));\n  white-space: normal;\n  pointer-events: auto;\n  border: 0;\n  padding: 8px 12px;\n\n  & [data-marker-message] {\n    white-space: normal;\n    overflow-wrap: anywhere;\n\n    & code {\n      white-space: normal;\n      color: inherit;\n      background-color: #0000;\n      display: inline;\n    }\n  }\n}\n\n[data-selection-action-popover] {\n  pointer-events: auto;\n  flex-wrap: wrap;\n  align-items: center;\n  gap: 4px;\n  width: max-content;\n  padding: 4px;\n  display: flex;\n}\n\n[data-search-panel] {\n  z-index: 100;\n  flex-direction: column;\n  justify-content: right;\n  width: 100%;\n  height: 0;\n  display: flex;\n  position: sticky;\n  top: 16px;\n  right: 16px;\n  container: search-panel / inline-size;\n\n  & [data-editor-widget] {\n    z-index: 100;\n    flex-shrink: 0;\n    align-items: stretch;\n    gap: 8px;\n    min-width: 260px;\n    max-width: 100%;\n    margin-inline: auto 16px;\n    padding: 4px;\n    display: flex;\n    position: relative;\n  }\n\n  & svg {\n    fill: currentColor;\n    width: 12px;\n    height: 12px;\n    display: block;\n  }\n}\n\n[data-search-grid] {\n  grid-template-columns: auto auto auto;\n  grid-template-areas: \"find matches nav\"\n                       \"replace actions .\";\n  align-items: center;\n  gap: 4px 6px;\n  width: 100%;\n  display: grid;\n}\n\n[data-input-box][data-find] {\n  grid-area: find;\n}\n\n[data-search-nav] {\n  grid-area: nav;\n}\n\n[data-input-box][data-replace] {\n  grid-area: replace;\n}\n\n[data-replace-actions] {\n  grid-area: actions;\n}\n\n[data-search-grid][data-mode=\"find\"] {\n  grid-template-areas: \"find matches nav\";\n}\n\n[data-search-grid][data-mode=\"find\"] [data-replace-cell] {\n  display: none;\n}\n\n@container search-panel (width < 400px) {\n  [data-search-panel] [data-editor-widget] {\n    padding: 10px;\n  }\n\n  [data-search-grid][data-mode=\"replace\"] {\n    grid-template-columns: auto 1fr auto;\n    grid-template-areas: \"find find find\"\n                         \"replace replace replace\"\n                         \"nav matches actions\";\n  }\n\n  [data-search-grid][data-mode=\"find\"] {\n    grid-template-columns: auto 1fr auto;\n    grid-template-areas: \"find find find\"\n                         \"nav matches matches\";\n  }\n\n  [data-replace-actions] {\n    justify-self: end;\n  }\n\n  [data-search-grid] [data-input-box] {\n    width: auto;\n  }\n}\n\n[data-input-box] {\n  align-items: center;\n  width: 200px;\n  display: flex;\n  position: relative;\n\n  & input {\n    width: 100%;\n    min-width: 0;\n    color: var(--diffs-fg);\n    background-color: var(--diffs-bg);\n    border: 1px solid color-mix(in lab, var(--diffs-fg) 12%, var(--diffs-bg));\n    border-radius: 6px;\n    outline: none;\n    flex-grow: 1;\n    padding-inline: 6px;\n    font-size: 13px;\n    line-height: 24px;\n\n    &::selection {\n      background-color: color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg));\n    }\n\n    &:focus-visible {\n      outline: 1px solid var(--diffs-modified-base);\n    }\n  }\n\n  &[data-find] input {\n    padding-inline-end: 72px;\n  }\n\n  & [data-search-icon] {\n    --diffs-search-icon-size: 20px;\n  }\n}\n\n[data-search-toggles] {\n  align-items: center;\n  gap: 1px;\n  display: flex;\n  position: absolute;\n  top: 50%;\n  right: 4px;\n  transform: translateY(-50%);\n}\n\n[data-matches] {\n  white-space: nowrap;\n  min-width: 50px;\n  color: color-mix(in lab, var(--diffs-fg) 50%, var(--diffs-bg));\n  flex-shrink: 0;\n  grid-area: matches;\n  font-size: 12px;\n  font-weight: 500;\n  line-height: 20px;\n\n  &[data-no-matches] {\n    color: color-mix(in lab, var(--diffs-fg) 35%, var(--diffs-bg));\n  }\n}\n\n[data-replace-actions], [data-search-nav] {\n  align-items: center;\n  display: flex;\n}\n\n[data-search-icon] {\n  appearance: none;\n  width: var(--diffs-search-icon-size, 24px);\n  height: var(--diffs-search-icon-size, 24px);\n  color: color-mix(in lab, var(--diffs-fg) 65%, var(--diffs-bg));\n  border-radius: var(--diffs-search-icon-radius, 4px);\n  cursor: pointer;\n  background: none;\n  border: 0;\n  flex-shrink: 0;\n  justify-content: center;\n  align-items: center;\n  margin: 0;\n  padding: 0;\n  transition: background-color .1s ease-in-out, color .1s ease-in-out;\n  display: flex;\n\n  &:disabled {\n    opacity: .25;\n    cursor: default;\n  }\n\n  &:not(:disabled):hover {\n    color: var(--diffs-fg);\n  }\n\n  &:focus-visible {\n    outline: 1px solid var(--diffs-modified-base);\n  }\n\n  &[aria-pressed=\"true\"] {\n    color: var(--diffs-modified-base);\n  }\n}\n\n[data-search-close] {\n  --diffs-search-icon-size: 20px;\n  --diffs-search-icon-radius: 50%;\n  color: var(--diffs-widget-bg);\n  background-color: color-mix(in lab,\n    var(--diffs-widget-fg) 50%,\n    var(--diffs-bg));\n  position: absolute;\n  top: 0;\n  right: 0;\n  transform: translate(50%, -50%);\n\n  &:not(:disabled):hover {\n    opacity: 1;\n    color: var(--diffs-widget-bg);\n    background-color: var(--diffs-widget-fg);\n  }\n}\n";
 //#endregion
 export { editor_default as default };
+
 //# sourceMappingURL=editor2.js.map

package/dist/editor/editor2.js.map

@@ -1 +1 @@
-{"version":3,"file":"editor2.js","names":[],"sources":["../../src/editor/editor.css"],"sourcesContent":["::selection {\n  background-color: transparent;\n}\n\n@keyframes blinking {\n  0% {\n    opacity: 1;\n  }\n  50% {\n    opacity: 0;\n  }\n  100% {\n    opacity: 1;\n  }\n}\n\n:host, /* for scroll anchor */\n[data-code], /* for editor overlay */\n[data-content] /* for wrap line measurement */ {\n  position: relative;\n}\n[data-content] {\n  background-color: transparent;\n  caret-color: var(--diffs-bg-caret);\n  outline: none;\n}\n[data-gutter-buffer],\n[data-line]:not([data-selected-line]),\n[data-line]:not([data-selected-line]) span,\n[data-line-annotation] {\n  background-color: transparent;\n}\n[data-column-number] {\n  color: var(--diffs-editor-line-number-fg);\n}\n[data-column-number]:is([data-selected-line]) {\n  background-color: var(--diffs-editor-line-number-active-bg);\n  color: var(--diffs-editor-line-number-active-fg);\n}\n[data-column-number]:is([data-active]) {\n  color: var(--diffs-editor-line-number-active-fg);\n}\n[data-line] {\n  cursor: text;\n}\n[data-line]:is([data-selected-line]) {\n  background-color: var(--diffs-editor-line-highlight-bg);\n}\n[data-line]:is([data-line-type='change-deletion']) {\n  background-color: var(--diffs-line-bg);\n}\n\n/* Editor Overlay */\n[data-editor-overlay] {\n  display: contents;\n}\n[data-caret],\n[data-selection-range],\n[data-match-range],\n[data-marker-range] {\n  position: absolute;\n  top: 0;\n  left: 0;\n  height: 1lh;\n  line-height: var(--diffs-line-height);\n  pointer-events: none;\n}\n[data-caret] {\n  width: 2px;\n  background-color: var(\n    --diffs-bg-caret-override,\n    var(\n      --diffs-editor-cursor-fg,\n      light-dark(\n        color-mix(in lab, var(--diffs-fg) 50%, var(--diffs-bg)),\n        color-mix(in lab, var(--diffs-fg) 75%, var(--diffs-bg))\n      )\n    )\n  );\n  animation: blinking 1.2s infinite;\n  animation-delay: 0.8s;\n  visibility: hidden;\n}\n[data-selection-range] {\n  z-index: -10;\n  background-color: var(--diffs-editor-selection-bg);\n}\n[data-selection-corner] {\n  width: 100%;\n  height: 100%;\n  background-color: var(--diffs-bg);\n}\n[data-match-range] {\n  z-index: -10;\n  background-color: var(\n    --diffs-editor-match-bg,\n    var(--diffs-editor-selection-bg)\n  );\n}\n[data-match-range]:not([data-focus]) {\n  background-color: var(\n    --diffs-editor-match-highlight-bg,\n    light-dark(#ff963288, #ff963266)\n  );\n}\n[data-marker-range] {\n  z-index: 1;\n  /* White stroke: luminance masks treat black as transparent. */\n  -webkit-mask-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2IiBoZWlnaHQ9IjMiPjxwYXRoIGQ9Im0wIDIuNSBsMiAtMS41IGwxIDAgbDIgMS41IGwxIDAiIHN0cm9rZT0iI2ZmZiIgZmlsbD0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIi8+PC9zdmc+');\n  mask-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI2IiBoZWlnaHQ9IjMiPjxwYXRoIGQ9Im0wIDIuNSBsMiAtMS41IGwxIDAgbDIgMS41IGwxIDAiIHN0cm9rZT0iI2ZmZiIgZmlsbD0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIi8+PC9zdmc+');\n  -webkit-mask-position: left bottom;\n  mask-position: left bottom;\n  -webkit-mask-repeat: repeat-x;\n  mask-repeat: repeat-x;\n  -webkit-mask-size: 6px 3px;\n  mask-size: 6px 3px;\n}\n[data-marker-error] {\n  background-color: var(--diffs-editor-error-fg, red);\n}\n[data-marker-warning] {\n  background-color: var(--diffs-editor-warning-fg, #cca700);\n}\n[data-marker-info] {\n  background-color: var(--diffs-editor-info-fg, #3794ff);\n}\n[data-marker-hint] {\n  background-color: var(--diffs-editor-hint-fg, #6a6a6a);\n}\n[data-rtl] {\n  border-top-left-radius: 3px;\n}\n[data-rtr] {\n  border-top-right-radius: 3px;\n}\n[data-rbl] {\n  border-bottom-left-radius: 3px;\n}\n[data-rbr] {\n  border-bottom-right-radius: 3px;\n}\n\n@media (width >= 480px) {\n  [data-content] {\n    caret-color: transparent;\n  }\n  [data-selection-action] {\n    caret-color: currentColor;\n  }\n  [data-content]:focus ~ [data-editor-overlay] [data-caret] {\n    visibility: visible;\n  }\n}\n[data-editor-widget] {\n  --diffs-widget-bg: color-mix(in lab, var(--diffs-fg) 4%, var(--diffs-bg));\n  --diffs-widget-border: color-mix(in lab, var(--diffs-fg) 20%, transparent);\n  --diffs-widget-shadow:\n    inset 0 0 0 1px var(--diffs-bg), 0 4px 8px rgb(0 0 0 / 0.075),\n    0 6px 18px rgb(0 0 0 / 0.075);\n  position: absolute;\n  top: 0;\n  left: 0;\n  z-index: 100;\n  width: fit-content;\n  max-width: calc(100% - 24px);\n  border: 1px solid var(--diffs-widget-border);\n  border-radius: 9px;\n  background-color: var(--diffs-widget-bg);\n  background-clip: padding-box;\n  box-shadow: var(--diffs-widget-shadow);\n}\n[data-marker-popup] {\n  padding: 8px 12px;\n  min-width: 180px;\n  pointer-events: auto;\n  font-family: var(--diffs-header-font-fallback);\n  font-size: 14px;\n  line-height: 1.4;\n}\n[data-marker-popup] code {\n  display: inline;\n  background-color: transparent;\n}\n\n/* Selection Action Widget */\n[data-selection-action-icon] {\n  position: absolute;\n  top: 0;\n  left: -1lh;\n  z-index: 10;\n  width: 1lh;\n  height: 1lh;\n  border-radius: 4px;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  color: color-mix(in lab, var(--diffs-fg) 40%, var(--diffs-bg));\n  transition:\n    background-color 0.1s ease-in-out,\n    color 0.1s ease-in-out;\n  cursor: pointer;\n  visibility: hidden;\n}\n[data-selection-action-icon][data-visible='true'] {\n  visibility: visible;\n}\n[data-selection-action-icon]:hover {\n  background-color: color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg));\n  color: var(--diffs-fg);\n}\n[data-selection-action] {\n  padding-inline-end: 1ch;\n}\n\n/* Search Panel Widget */\n[data-search-panel] {\n  position: sticky;\n  top: 12px;\n  right: 12px;\n  z-index: 100;\n  display: flex;\n  justify-content: right;\n  flex-direction: column;\n  width: 100%;\n  height: fit-content;\n  margin-bottom: 4px;\n}\n[data-search-panel] [data-editor-widget] {\n  position: relative;\n  z-index: 100;\n  display: flex;\n  align-items: flex-start;\n  gap: 8px;\n  padding: 4px;\n  max-width: 100%;\n  margin-inline: auto 12px;\n  font-family: var(--diffs-header-font-fallback);\n  font-size: 14px;\n}\n/* The two input rows form a grid: column 1 holds the find/replace inputs,\n   column 2 holds the results text / replace actions, and column 3 holds the\n   find navigation buttons on the first row only. DOM order auto-places items. */\n[data-search-grid] {\n  display: grid;\n  grid-template-columns: auto auto auto;\n  align-items: center;\n  gap: 4px 6px;\n}\n[data-search-grid][data-mode='find'] [data-replace-cell] {\n  display: none;\n}\n[data-input-box] {\n  position: relative;\n  display: flex;\n  align-items: center;\n  width: 200px;\n}\n[data-input-box] input {\n  flex-grow: 1;\n  width: 100%;\n  min-width: 0;\n  font-size: 13px;\n  line-height: 24px;\n  padding-inline: 6px;\n  color: var(--diffs-fg);\n  background-color: var(--diffs-bg);\n  border: 1px solid color-mix(in lab, var(--diffs-fg) 12%, var(--diffs-bg));\n  border-radius: 6px;\n  outline: none;\n}\n/* Reserve room on the right of the find input for the overlaid toggles. */\n[data-input-box][data-find] input {\n  padding-inline-end: 72px;\n}\n[data-input-box] input::selection {\n  background-color: color-mix(in lab, var(--diffs-fg) 8%, var(--diffs-bg));\n}\n[data-search-toggles] {\n  position: absolute;\n  top: 50%;\n  right: 4px;\n  transform: translateY(-50%);\n  display: flex;\n  align-items: center;\n  gap: 1px;\n}\n[data-matches] {\n  flex-shrink: 0;\n  min-width: 50px;\n  font-size: 12px;\n  font-weight: 500;\n  line-height: 20px;\n  white-space: nowrap;\n  color: color-mix(in lab, var(--diffs-fg) 50%, var(--diffs-bg));\n}\n[data-matches][data-no-matches] {\n  color: color-mix(in lab, var(--diffs-fg) 35%, var(--diffs-bg));\n}\n[data-replace-actions],\n[data-search-nav] {\n  display: flex;\n  align-items: center;\n}\n[data-search-panel] svg {\n  display: block;\n  fill: currentColor;\n}\n[data-search-panel] [data-icon] {\n  flex-shrink: 0;\n  width: 24px;\n  height: 24px;\n  display: flex;\n  color: color-mix(in lab, var(--diffs-fg) 65%, var(--diffs-bg));\n  align-items: center;\n  justify-content: center;\n  border-radius: 4px;\n  cursor: pointer;\n  transition:\n    background-color 0.1s ease-in-out,\n    color 0.1s ease-in-out;\n}\n[data-search-panel] [data-icon][data-disabled='true'] {\n  opacity: 0.25;\n  pointer-events: none;\n}\n[data-search-panel] [data-icon]:hover {\n  color: var(--diffs-fg);\n}\n[data-search-panel] [data-icon][data-active='true'] {\n  color: light-dark(var(--diffs-modified-light), var(--diffs-modified-dark));\n}\n"],"mappings":";qBAAA"}
+{"version":3,"file":"editor2.js","names":[],"sources":[],"mappings":""}

package/dist/editor/index.js

@@ -1,4 +1,3 @@
 import { TextDocument } from "./textDocument.js";
 import { Editor } from "./editor.js";
-
-export { Editor, TextDocument };
+export { Editor, TextDocument };

package/dist/editor/lineAnnotations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lineAnnotations.d.ts","names":["DiffLineAnnotation","TextDocumentChange","applyDocumentChangeToLineAnnotations","T","renderLineAnnotations","LAnnotation","HTMLElement"],"sources":["../../src/editor/lineAnnotations.d.ts"],"sourcesContent":["import type { DiffLineAnnotation } from '../types';\nimport type { TextDocumentChange } from './textDocument';\nexport declare function applyDocumentChangeToLineAnnotations<T>(change: TextDocumentChange, lineAnnotations: DiffLineAnnotation<T>[]): DiffLineAnnotation<T>[] | undefined;\nexport declare function renderLineAnnotations<LAnnotation>(lineAnnotations: DiffLineAnnotation<LAnnotation>[], contentEl: HTMLElement, gutterEl?: HTMLElement): void;\n//# sourceMappingURL=lineAnnotations.d.ts.map"],"mappings":";;;;iBAEwBE,gDAAgDD,qCAAqCD,mBAAmBG,OAAOH,mBAAmBG;iBAClIC,oDAAoDJ,mBAAmBK,2BAA2BC,wBAAwBA"}
+{"version":3,"file":"lineAnnotations.d.ts","names":[],"sources":["../../src/editor/lineAnnotations.ts"],"mappings":";;;;iBAKgB,oCAAA,IACd,MAAA,EAAQ,kBAAA,EACR,eAAA,EAAiB,kBAAA,CAAmB,CAAA,MACnC,kBAAA,CAAmB,CAAA;AAAA,iBAsDN,qBAAA,cACd,eAAA,EAAiB,kBAAA,CAAmB,WAAA,KACpC,SAAA,EAAW,WAAA,EACX,QAAA,GAAW,WAAA"}

package/dist/editor/lineAnnotations.js

@@ -1,6 +1,5 @@
 import { getLineAnnotationName } from "../utils/getLineAnnotationName.js";
 import { getLineNumberAttr, h } from "./utils.js";
-
 //#region src/editor/lineAnnotations.ts
 function applyDocumentChangeToLineAnnotations(change, lineAnnotations) {
 	if (change.lineDelta === 0) return;
@@ -42,7 +41,7 @@ function renderLineAnnotations(lineAnnotations, contentEl, gutterEl) {
 		if (!deletionAnnotations.has(lineNumber)) deletionAnnotations.set(lineNumber, []);
 		(annotation.side === "deletions" ? deletionAnnotations : additionAnnotations).get(lineNumber).push(getLineAnnotationName(annotation));
 	}
-	let leftCodeElement = contentEl.parentElement?.previousElementSibling;
+	const leftCodeElement = contentEl.parentElement?.previousElementSibling;
 	let leftGutterElement;
 	let leftContentElement;
 	if (leftCodeElement != null && leftCodeElement instanceof HTMLElement && leftCodeElement.dataset.deletions !== void 0) for (const child of leftCodeElement.children) {
@@ -136,7 +135,7 @@ function applyLineAnnotationMinHeights(lineAnnotations, annotationElements, offs
 		if (annotations?.length === 0 && offsetHeight !== void 0) annotationElement.style.setProperty("--diffs-annotation-min-height", `${offsetHeight}px`);
 	}
 }
-
 //#endregion
 export { applyDocumentChangeToLineAnnotations, renderLineAnnotations };
+
 //# sourceMappingURL=lineAnnotations.js.map

package/dist/editor/lineAnnotations.js.map

@@ -1 +1 @@
-{"version":3,"file":"lineAnnotations.js","names":["nextLineAnnotations: DiffLineAnnotation<T>[]","leftGutterElement: HTMLElement | undefined","leftContentElement: HTMLElement | undefined","staleElements: HTMLElement[]"],"sources":["../../src/editor/lineAnnotations.ts"],"sourcesContent":["import type { DiffLineAnnotation } from '../types';\nimport { getLineAnnotationName } from '../utils/getLineAnnotationName';\nimport type { TextDocumentChange } from './textDocument';\nimport { getLineNumberAttr, h } from './utils';\n\nexport function applyDocumentChangeToLineAnnotations<T>(\n  change: TextDocumentChange,\n  lineAnnotations: DiffLineAnnotation<T>[]\n): DiffLineAnnotation<T>[] | undefined {\n  if (change.lineDelta === 0) {\n    return undefined;\n  }\n\n  const startCharacter = change.startCharacter;\n  const removedLineCount = Math.max(0, -change.lineDelta);\n  const deletedStartLine =\n    removedLineCount === 0\n      ? undefined\n      : change.startLine + (startCharacter === 0 ? 0 : 1);\n  const deletedEndLine =\n    deletedStartLine === undefined\n      ? undefined\n      : deletedStartLine + removedLineCount;\n  const shiftFromLine =\n    removedLineCount > 0\n      ? change.startLine + removedLineCount\n      : change.startLine + (startCharacter === 0 ? 0 : 1);\n  const nextLineAnnotations: DiffLineAnnotation<T>[] = [];\n\n  let changed = false;\n  for (const annotation of lineAnnotations) {\n    if (annotation.side === 'deletions') {\n      nextLineAnnotations.push(annotation);\n      continue;\n    }\n\n    const line = annotation.lineNumber - 1;\n    if (\n      deletedStartLine !== undefined &&\n      deletedEndLine !== undefined &&\n      line >= deletedStartLine &&\n      line < deletedEndLine\n    ) {\n      changed = true;\n      continue;\n    }\n\n    if (line >= shiftFromLine) {\n      nextLineAnnotations.push({\n        ...annotation,\n        lineNumber: line + change.lineDelta + 1,\n      });\n      changed = true;\n      continue;\n    }\n\n    nextLineAnnotations.push(annotation);\n  }\n\n  return changed ? nextLineAnnotations : undefined;\n}\n\nexport function renderLineAnnotations<LAnnotation>(\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[],\n  contentEl: HTMLElement,\n  gutterEl?: HTMLElement\n): void {\n  const additionAnnotations = new Map<number, string[]>();\n  const deletionAnnotations = new Map<number, string[]>();\n  for (const annotation of lineAnnotations) {\n    const lineNumber = annotation.lineNumber;\n    if (!additionAnnotations.has(lineNumber)) {\n      additionAnnotations.set(lineNumber, []);\n    }\n    if (!deletionAnnotations.has(lineNumber)) {\n      deletionAnnotations.set(lineNumber, []);\n    }\n    const map =\n      annotation.side === 'deletions'\n        ? deletionAnnotations\n        : additionAnnotations;\n    map.get(lineNumber)!.push(getLineAnnotationName(annotation));\n  }\n\n  let leftCodeElement = contentEl.parentElement?.previousElementSibling;\n  let leftGutterElement: HTMLElement | undefined;\n  let leftContentElement: HTMLElement | undefined;\n  if (\n    leftCodeElement != null &&\n    leftCodeElement instanceof HTMLElement &&\n    leftCodeElement.dataset.deletions !== undefined\n  ) {\n    for (const child of leftCodeElement.children) {\n      const el = child as HTMLElement;\n      const { gutter, content } = el.dataset;\n      if (gutter !== undefined) {\n        leftGutterElement = el;\n      } else if (content !== undefined) {\n        leftContentElement = el;\n      }\n    }\n  }\n\n  cleanLineAnnotationElements(contentEl, gutterEl);\n  if (leftContentElement !== undefined) {\n    cleanLineAnnotationElements(leftContentElement, leftGutterElement);\n  }\n\n  const additionsAnnotationElements = createLineAnnotationElements(\n    additionAnnotations,\n    contentEl,\n    gutterEl\n  );\n  if (leftContentElement === undefined) {\n    return;\n  }\n\n  const deletionsAnnotationElements = createLineAnnotationElements(\n    deletionAnnotations,\n    leftContentElement,\n    leftGutterElement\n  );\n\n  requestAnimationFrame(() => {\n    syncPairedLineAnnotationHeights(\n      additionAnnotations,\n      deletionAnnotations,\n      additionsAnnotationElements,\n      deletionsAnnotationElements\n    );\n  });\n}\n\nfunction cleanLineAnnotationElements(\n  contentEl: HTMLElement,\n  gutterEl?: HTMLElement\n): void {\n  const staleElements: HTMLElement[] = [];\n  for (let i = 1; i < contentEl.childElementCount; i++) {\n    const el = contentEl.children[i] as HTMLElement;\n    if (el.dataset.lineAnnotation !== undefined) {\n      staleElements.push(el);\n      if (gutterEl !== undefined) {\n        staleElements.push(gutterEl.children[i] as HTMLElement);\n      }\n    }\n  }\n  for (const el of staleElements) {\n    el.remove();\n  }\n}\n\nfunction createLineAnnotationElements(\n  lineAnnotations: Map<number, string[]>,\n  contentEl: HTMLElement,\n  gutterEl?: HTMLElement\n): Map<number, HTMLElement> {\n  const annotationElements = new Map<number, HTMLElement>();\n  for (const el of contentEl.children) {\n    const lineNumber = getLineNumberAttr(el as HTMLElement);\n    if (lineNumber !== undefined) {\n      const annotations = lineAnnotations.get(lineNumber);\n      if (annotations !== undefined) {\n        const lineIndex = lineNumber - 1;\n        const annotationElement = h('div', {\n          dataset: {\n            lineAnnotation: '0,' + lineIndex,\n          },\n          children: [\n            h('div', {\n              dataset: 'annotationContent',\n              children: annotations.map((name) => h('slot', { name })),\n            }),\n          ],\n        });\n        el.after(annotationElement);\n        annotationElements.set(lineNumber, annotationElement);\n      }\n    }\n  }\n\n  if (gutterEl !== undefined) {\n    for (const el of gutterEl.children) {\n      const lineNumber = getLineNumberAttr(el as HTMLElement, 'columnNumber');\n      if (lineNumber !== undefined && lineAnnotations.has(lineNumber)) {\n        const bufferEl = h('div', {\n          dataset: {\n            gutterBuffer: 'annotation',\n            bufferSize: '1',\n          },\n          style: {\n            gridRow: 'span 1',\n          },\n        });\n        el.after(bufferEl);\n      }\n    }\n  }\n\n  return annotationElements;\n}\n\nfunction syncPairedLineAnnotationHeights(\n  additionAnnotations: Map<number, string[]>,\n  deletionAnnotations: Map<number, string[]>,\n  additionAnnotationElements: Map<number, HTMLElement>,\n  deletionAnnotationElements: Map<number, HTMLElement>\n): void {\n  const offsetHeights = new Map<number, number>();\n  for (const [lineNumber, annotations] of additionAnnotations.entries()) {\n    const annotationElement = deletionAnnotationElements.get(lineNumber);\n    if (annotations.length === 0 && annotationElement !== undefined) {\n      const height = measureAnnotationContentHeight(annotationElement);\n      if (height > 0) {\n        offsetHeights.set(lineNumber, height);\n      }\n    }\n  }\n  for (const [lineNumber, annotations] of deletionAnnotations.entries()) {\n    const annotationElement = additionAnnotationElements.get(lineNumber);\n    if (annotations.length === 0 && annotationElement !== undefined) {\n      const height = measureAnnotationContentHeight(annotationElement);\n      if (height > 0) {\n        offsetHeights.set(lineNumber, height);\n      }\n    }\n  }\n  applyLineAnnotationMinHeights(\n    additionAnnotations,\n    additionAnnotationElements,\n    offsetHeights\n  );\n  applyLineAnnotationMinHeights(\n    deletionAnnotations,\n    deletionAnnotationElements,\n    offsetHeights\n  );\n}\n\nfunction measureAnnotationContentHeight(lineAnnotationEl: HTMLElement): number {\n  const content = lineAnnotationEl.firstElementChild;\n  if (!(content instanceof HTMLElement)) {\n    return 0;\n  }\n  return content.getBoundingClientRect().height;\n}\n\nfunction applyLineAnnotationMinHeights(\n  lineAnnotations: Map<number, string[]>,\n  annotationElements: Map<number, HTMLElement>,\n  offsetHeights: Map<number, number>\n): void {\n  for (const [lineNumber, annotationElement] of annotationElements.entries()) {\n    const annotations = lineAnnotations.get(lineNumber);\n    const offsetHeight = offsetHeights.get(lineNumber);\n    if (annotations?.length === 0 && offsetHeight !== undefined) {\n      annotationElement.style.setProperty(\n        '--diffs-annotation-min-height',\n        `${offsetHeight}px`\n      );\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"lineAnnotations.js","names":[],"sources":["../../src/editor/lineAnnotations.ts"],"sourcesContent":["import type { DiffLineAnnotation } from '../types';\nimport { getLineAnnotationName } from '../utils/getLineAnnotationName';\nimport type { TextDocumentChange } from './textDocument';\nimport { getLineNumberAttr, h } from './utils';\n\nexport function applyDocumentChangeToLineAnnotations<T>(\n  change: TextDocumentChange,\n  lineAnnotations: DiffLineAnnotation<T>[]\n): DiffLineAnnotation<T>[] | undefined {\n  if (change.lineDelta === 0) {\n    return undefined;\n  }\n\n  const startCharacter = change.startCharacter;\n  const removedLineCount = Math.max(0, -change.lineDelta);\n  const deletedStartLine =\n    removedLineCount === 0\n      ? undefined\n      : change.startLine + (startCharacter === 0 ? 0 : 1);\n  const deletedEndLine =\n    deletedStartLine === undefined\n      ? undefined\n      : deletedStartLine + removedLineCount;\n  const shiftFromLine =\n    removedLineCount > 0\n      ? change.startLine + removedLineCount\n      : change.startLine + (startCharacter === 0 ? 0 : 1);\n  const nextLineAnnotations: DiffLineAnnotation<T>[] = [];\n\n  let changed = false;\n  for (const annotation of lineAnnotations) {\n    if (annotation.side === 'deletions') {\n      nextLineAnnotations.push(annotation);\n      continue;\n    }\n\n    const line = annotation.lineNumber - 1;\n    if (\n      deletedStartLine !== undefined &&\n      deletedEndLine !== undefined &&\n      line >= deletedStartLine &&\n      line < deletedEndLine\n    ) {\n      changed = true;\n      continue;\n    }\n\n    if (line >= shiftFromLine) {\n      nextLineAnnotations.push({\n        ...annotation,\n        lineNumber: line + change.lineDelta + 1,\n      });\n      changed = true;\n      continue;\n    }\n\n    nextLineAnnotations.push(annotation);\n  }\n\n  return changed ? nextLineAnnotations : undefined;\n}\n\nexport function renderLineAnnotations<LAnnotation>(\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[],\n  contentEl: HTMLElement,\n  gutterEl?: HTMLElement\n): void {\n  const additionAnnotations = new Map<number, string[]>();\n  const deletionAnnotations = new Map<number, string[]>();\n  for (const annotation of lineAnnotations) {\n    const lineNumber = annotation.lineNumber;\n    if (!additionAnnotations.has(lineNumber)) {\n      additionAnnotations.set(lineNumber, []);\n    }\n    if (!deletionAnnotations.has(lineNumber)) {\n      deletionAnnotations.set(lineNumber, []);\n    }\n    const map =\n      annotation.side === 'deletions'\n        ? deletionAnnotations\n        : additionAnnotations;\n    map.get(lineNumber)!.push(getLineAnnotationName(annotation));\n  }\n\n  const leftCodeElement = contentEl.parentElement?.previousElementSibling;\n  let leftGutterElement: HTMLElement | undefined;\n  let leftContentElement: HTMLElement | undefined;\n  if (\n    leftCodeElement != null &&\n    leftCodeElement instanceof HTMLElement &&\n    leftCodeElement.dataset.deletions !== undefined\n  ) {\n    for (const child of leftCodeElement.children) {\n      const el = child as HTMLElement;\n      const { gutter, content } = el.dataset;\n      if (gutter !== undefined) {\n        leftGutterElement = el;\n      } else if (content !== undefined) {\n        leftContentElement = el;\n      }\n    }\n  }\n\n  cleanLineAnnotationElements(contentEl, gutterEl);\n  if (leftContentElement !== undefined) {\n    cleanLineAnnotationElements(leftContentElement, leftGutterElement);\n  }\n\n  const additionsAnnotationElements = createLineAnnotationElements(\n    additionAnnotations,\n    contentEl,\n    gutterEl\n  );\n  if (leftContentElement === undefined) {\n    return;\n  }\n\n  const deletionsAnnotationElements = createLineAnnotationElements(\n    deletionAnnotations,\n    leftContentElement,\n    leftGutterElement\n  );\n\n  requestAnimationFrame(() => {\n    syncPairedLineAnnotationHeights(\n      additionAnnotations,\n      deletionAnnotations,\n      additionsAnnotationElements,\n      deletionsAnnotationElements\n    );\n  });\n}\n\nfunction cleanLineAnnotationElements(\n  contentEl: HTMLElement,\n  gutterEl?: HTMLElement\n): void {\n  const staleElements: HTMLElement[] = [];\n  for (let i = 1; i < contentEl.childElementCount; i++) {\n    const el = contentEl.children[i] as HTMLElement;\n    if (el.dataset.lineAnnotation !== undefined) {\n      staleElements.push(el);\n      if (gutterEl !== undefined) {\n        staleElements.push(gutterEl.children[i] as HTMLElement);\n      }\n    }\n  }\n  for (const el of staleElements) {\n    el.remove();\n  }\n}\n\nfunction createLineAnnotationElements(\n  lineAnnotations: Map<number, string[]>,\n  contentEl: HTMLElement,\n  gutterEl?: HTMLElement\n): Map<number, HTMLElement> {\n  const annotationElements = new Map<number, HTMLElement>();\n  for (const el of contentEl.children) {\n    const lineNumber = getLineNumberAttr(el as HTMLElement);\n    if (lineNumber !== undefined) {\n      const annotations = lineAnnotations.get(lineNumber);\n      if (annotations !== undefined) {\n        const lineIndex = lineNumber - 1;\n        const annotationElement = h('div', {\n          dataset: {\n            lineAnnotation: '0,' + lineIndex,\n          },\n          children: [\n            h('div', {\n              dataset: 'annotationContent',\n              children: annotations.map((name) => h('slot', { name })),\n            }),\n          ],\n        });\n        el.after(annotationElement);\n        annotationElements.set(lineNumber, annotationElement);\n      }\n    }\n  }\n\n  if (gutterEl !== undefined) {\n    for (const el of gutterEl.children) {\n      const lineNumber = getLineNumberAttr(el as HTMLElement, 'columnNumber');\n      if (lineNumber !== undefined && lineAnnotations.has(lineNumber)) {\n        const bufferEl = h('div', {\n          dataset: {\n            gutterBuffer: 'annotation',\n            bufferSize: '1',\n          },\n          style: {\n            gridRow: 'span 1',\n          },\n        });\n        el.after(bufferEl);\n      }\n    }\n  }\n\n  return annotationElements;\n}\n\nfunction syncPairedLineAnnotationHeights(\n  additionAnnotations: Map<number, string[]>,\n  deletionAnnotations: Map<number, string[]>,\n  additionAnnotationElements: Map<number, HTMLElement>,\n  deletionAnnotationElements: Map<number, HTMLElement>\n): void {\n  const offsetHeights = new Map<number, number>();\n  for (const [lineNumber, annotations] of additionAnnotations.entries()) {\n    const annotationElement = deletionAnnotationElements.get(lineNumber);\n    if (annotations.length === 0 && annotationElement !== undefined) {\n      const height = measureAnnotationContentHeight(annotationElement);\n      if (height > 0) {\n        offsetHeights.set(lineNumber, height);\n      }\n    }\n  }\n  for (const [lineNumber, annotations] of deletionAnnotations.entries()) {\n    const annotationElement = additionAnnotationElements.get(lineNumber);\n    if (annotations.length === 0 && annotationElement !== undefined) {\n      const height = measureAnnotationContentHeight(annotationElement);\n      if (height > 0) {\n        offsetHeights.set(lineNumber, height);\n      }\n    }\n  }\n  applyLineAnnotationMinHeights(\n    additionAnnotations,\n    additionAnnotationElements,\n    offsetHeights\n  );\n  applyLineAnnotationMinHeights(\n    deletionAnnotations,\n    deletionAnnotationElements,\n    offsetHeights\n  );\n}\n\nfunction measureAnnotationContentHeight(lineAnnotationEl: HTMLElement): number {\n  const content = lineAnnotationEl.firstElementChild;\n  if (!(content instanceof HTMLElement)) {\n    return 0;\n  }\n  return content.getBoundingClientRect().height;\n}\n\nfunction applyLineAnnotationMinHeights(\n  lineAnnotations: Map<number, string[]>,\n  annotationElements: Map<number, HTMLElement>,\n  offsetHeights: Map<number, number>\n): void {\n  for (const [lineNumber, annotationElement] of annotationElements.entries()) {\n    const annotations = lineAnnotations.get(lineNumber);\n    const offsetHeight = offsetHeights.get(lineNumber);\n    if (annotations?.length === 0 && offsetHeight !== undefined) {\n      annotationElement.style.setProperty(\n        '--diffs-annotation-min-height',\n        `${offsetHeight}px`\n      );\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/editor/marker.d.ts

@@ -12,7 +12,8 @@ interface Marker extends Range {
 }
 interface EditorStub {
   getLineHeight: () => number;
-  getFileContainer: () => HTMLElement | undefined;
+  getOverlayElement: () => HTMLElement | undefined;
+  getGutterWidth: () => number;
   getCharX: (line: number, character: number) => [number, number];
   getLineY: (line: number) => number;
   isMouseDown: () => boolean;

package/dist/editor/marker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marker.d.ts","names":["Range","TextDocument","MarkerSeverity","Marker","HTMLElement","Record","EditorStub","MarkerRenderer","LAnnotation","markerSeverityDatasetKey"],"sources":["../../src/editor/marker.d.ts"],"sourcesContent":["import type { Range, TextDocument } from './textDocument';\nexport type MarkerSeverity = 'error' | 'warning' | 'info' | 'hint';\nexport interface Marker extends Range {\n    severity: MarkerSeverity;\n    message: string | {\n        html: string;\n    } | HTMLElement;\n    source?: string;\n    metadata?: Record<string, unknown>;\n}\nexport interface EditorStub {\n    getLineHeight: () => number;\n    getFileContainer: () => HTMLElement | undefined;\n    getCharX: (line: number, character: number) => [number, number];\n    getLineY: (line: number) => number;\n    isMouseDown: () => boolean;\n}\nexport declare class MarkerRenderer {\n    #private;\n    constructor(editor: EditorStub);\n    get markers(): readonly Marker[];\n    isPopupVisible(): boolean;\n    setMarkers<LAnnotation>(markers: Marker[], textDocument: TextDocument<LAnnotation>): void;\n    listenHover(contentEl: HTMLElement): void;\n    removePopup(): void;\n    cleanup(): void;\n}\nexport declare function markerSeverityDatasetKey(severity: MarkerSeverity): string;\n//# sourceMappingURL=marker.d.ts.map"],"mappings":";;;KACYE,cAAAA;UACKC,MAAAA,SAAeH;EADpBE,QAAAA,EAEEA,cAFY;EACTC,OAAAA,EAAM,MAAA,GAAA;IACTD,IAAAA,EAAAA,MAAAA;EAGNE,CAAAA,GAAAA,WAAAA;EAEOC,MAAAA,CAAAA,EAAAA,MAAAA;EANiBL,QAAAA,CAAAA,EAMjBK,MANiBL,CAAAA,MAAAA,EAAAA,OAAAA,CAAAA;;AAQfM,UAAAA,UAAAA,CAAU;EAONC,aAAAA,EAAAA,GAAc,GAAA,MAAAC;EAEXF,gBAAAA,EAAAA,GAAAA,GAPIF,WAOJE,GAAAA,SAAAA;EACIH,QAAAA,EAAAA,CAAAA,IAAAA,EAAAA,MAAAA,EAAAA,SAAAA,EAAAA,MAAAA,EAAAA,GAAAA,CAAAA,MAAAA,EAAAA,MAAAA,CAAAA;EAESA,QAAAA,EAAAA,CAAAA,IAAAA,EAAAA,MAAAA,EAAAA,GAAAA,MAAAA;EAAqCK,WAAAA,EAAAA,GAAAA,GAAAA,OAAAA;;AAC/CJ,cANNG,cAAAA,CAMMH;EAAW,CAAA,OAAA;EAIdK,WAAAA,CAAAA,MAAAA,EARAH,UAQwB;0BAPpBH;;mCAESA,wBAAwBF,aAAaO;yBAC/CJ;;;;iBAIHK,wBAAAA,WAAmCP"}
+{"version":3,"file":"marker.d.ts","names":[],"sources":["../../src/editor/marker.ts"],"mappings":";;;KAOY,cAAA;AAAA,UAEK,MAAA,SAAe,KAAA;EAC9B,QAAA,EAAU,cAAA;EACV,OAAA;IAAoB,IAAA;EAAA,IAAiB,WAAA;EACrC,MAAA;EACA,QAAA,GAAW,MAAA;AAAA;AAAA,UAGI,UAAA;EACf,aAAA;EACA,iBAAA,QAAyB,WAAW;EACpC,cAAA;EACA,QAAA,GAAW,IAAA,UAAc,SAAA;EACzB,QAAA,GAAW,IAAA;EACX,WAAA;AAAA;AAAA,cAGW,cAAA;EAAA;EAYX,WAAA,CAAY,MAAA,EAAQ,UAAA;EAAA,IAIhB,OAAA,aAAoB,MAAA;EAIxB,cAAA;EAIA,UAAA,cACE,OAAA,EAAS,MAAA,IACT,YAAA,EAAc,YAAA,CAAa,WAAA;EAU7B,WAAA,CAAY,SAAA,EAAW,WAAA;EAgCvB,WAAA;EAMA,OAAA;AAAA;AAAA,iBAsNc,wBAAA,CAAyB,QAAwB,EAAd,cAAc"}

package/dist/editor/marker.js

@@ -1,6 +1,5 @@
 import { addEventListener, getLineNumberAttr, h } from "./utils.js";
 import { selectionIntersects } from "./selection.js";
-
 //#region src/editor/marker.ts
 const MARKER_POPUP_SHOW_DELAY_MS = 300;
 const MARKER_POPUP_HIDE_DELAY_MS = 100;
@@ -123,6 +122,11 @@ var MarkerRenderer = class {
 			if (!this.#isMarkerPopupHovered) this.removePopup();
 		}, MARKER_POPUP_HIDE_DELAY_MS);
 	}
+	#setMarkerPopupPosition(popup, x, y) {
+		popup.style.setProperty("--gutter-width", this.#editor.getGutterWidth() + "px");
+		popup.style.setProperty("--popover-x", x + "px");
+		popup.style.setProperty("--popover-y", y + "px");
+	}
 	#dismissMarkerPopup() {
 		this.#markerPopupEventDisposes?.forEach((dispose) => dispose());
 		this.#markerPopupEventDisposes = void 0;
@@ -133,19 +137,18 @@ var MarkerRenderer = class {
 	}
 	#renderMarkerPopup(hoveredMarkerIndex) {
 		if (hoveredMarkerIndex === this.#hoveredMarkerIndex) return;
-		const preElement = this.#editor.getFileContainer()?.shadowRoot?.querySelector("pre");
-		const codeElement = preElement?.querySelector("[data-code]");
-		if (hoveredMarkerIndex >= this.#markers.length || preElement == null || codeElement == null) return;
-		const { start, message } = this.#markers[hoveredMarkerIndex];
+		const overlayElement = this.#editor.getOverlayElement();
+		if (hoveredMarkerIndex >= this.#markers.length || overlayElement == null) return;
+		const { start, message, severity } = this.#markers[hoveredMarkerIndex];
 		const { line, character } = start;
 		const { getCharX, getLineY, getLineHeight } = this.#editor;
 		const [left, wrapLine] = getCharX(line, character);
 		const lineHeight = getLineHeight();
 		const y = getLineY(line) + wrapLine * lineHeight + lineHeight;
-		const transform = `translateX(${codeElement.offsetLeft + left}px) translateY(${codeElement.offsetTop + y}px)`;
 		const popup = this.#markerPopupElement;
 		if (popup !== void 0) {
-			popup.style.transform = transform;
+			this.#setMarkerPopupPosition(popup, left, y);
+			setMarkerPopupSeverity(popup, severity);
 			const content = popup.firstElementChild;
 			if (content?.dataset.markerMessage !== void 0) if (typeof message === "string") content.textContent = message;
 			else if (message instanceof HTMLElement) content.replaceChildren(message);
@@ -154,13 +157,17 @@ var MarkerRenderer = class {
 			return;
 		}
 		this.#markerPopupElement = h("div", {
-			dataset: ["editorWidget", "markerPopup"],
-			style: { transform },
+			dataset: {
+				editorWidget: "",
+				markerPopup: "",
+				[markerSeverityDatasetKey(severity)]: ""
+			},
 			children: [h("div", {
 				dataset: "markerMessage",
 				...typeof message === "string" ? { textContent: message } : message instanceof HTMLElement ? { children: [message] } : { innerHTML: message.html }
 			})]
-		}, preElement);
+		}, overlayElement);
+		this.#setMarkerPopupPosition(this.#markerPopupElement, left, y);
 		this.#hoveredMarkerIndex = hoveredMarkerIndex;
 		this.#markerPopupEventDisposes = [addEventListener(this.#markerPopupElement, "mouseenter", () => {
 			this.#isMarkerPopupHovered = true;
@@ -171,6 +178,16 @@ var MarkerRenderer = class {
 		})];
 	}
 };
+const MARKER_SEVERITIES = [
+	"error",
+	"warning",
+	"info",
+	"hint"
+];
+function setMarkerPopupSeverity(popup, severity) {
+	for (const candidate of MARKER_SEVERITIES) delete popup.dataset[markerSeverityDatasetKey(candidate)];
+	popup.dataset[markerSeverityDatasetKey(severity)] = "";
+}
 function markerSeverityDatasetKey(severity) {
 	switch (severity) {
 		case "error": return "markerError";
@@ -179,7 +196,7 @@ function markerSeverityDatasetKey(severity) {
 		case "hint": return "markerHint";
 	}
 }
-
 //#endregion
 export { MarkerRenderer, markerSeverityDatasetKey };
+
 //# sourceMappingURL=marker.js.map

package/dist/editor/marker.js.map

@@ -1 +1 @@
-{"version":3,"file":"marker.js","names":["#editor","#markers","#hoveredMarkerIndex","#markerEventDisposes","#findHoveredMarkerIndex","#scheduleMarkerPopup","#cancelMarkerPopupShow","#scheduleMarkerPopupHide","#cancelMarkerPopupHide","#dismissMarkerPopup","character: number | undefined","position: Position","#markerPopupShowTimeout","#pendingMarkerPopupIndex","#markerPopupHideTimeout","#markerPopupElement","#renderMarkerPopup","#isMarkerPopupHovered","#markerPopupEventDisposes"],"sources":["../../src/editor/marker.ts"],"sourcesContent":["import { selectionIntersects } from './selection';\nimport type { Position, Range, TextDocument } from './textDocument';\nimport { addEventListener, getLineNumberAttr, h } from './utils';\n\nconst MARKER_POPUP_SHOW_DELAY_MS = 300;\nconst MARKER_POPUP_HIDE_DELAY_MS = 100;\n\nexport type MarkerSeverity = 'error' | 'warning' | 'info' | 'hint';\n\nexport interface Marker extends Range {\n  severity: MarkerSeverity;\n  message: string | { html: string } | HTMLElement;\n  source?: string;\n  metadata?: Record<string, unknown>;\n}\n\nexport interface EditorStub {\n  getLineHeight: () => number;\n  getFileContainer: () => HTMLElement | undefined;\n  getCharX: (line: number, character: number) => [number, number];\n  getLineY: (line: number) => number;\n  isMouseDown: () => boolean;\n}\n\nexport class MarkerRenderer {\n  #editor: EditorStub;\n  #markers: Marker[] = [];\n  #markerPopupElement?: HTMLElement;\n  #markerPopupEventDisposes?: (() => void)[];\n  #markerEventDisposes?: (() => void)[];\n  #markerPopupShowTimeout?: ReturnType<typeof setTimeout>;\n  #markerPopupHideTimeout?: ReturnType<typeof setTimeout>;\n  #pendingMarkerPopupIndex?: number;\n  #hoveredMarkerIndex?: number;\n  #isMarkerPopupHovered = false;\n\n  constructor(editor: EditorStub) {\n    this.#editor = editor;\n  }\n\n  get markers(): readonly Marker[] {\n    return this.#markers;\n  }\n\n  isPopupVisible(): boolean {\n    return this.#hoveredMarkerIndex !== undefined;\n  }\n\n  setMarkers<LAnnotation>(\n    markers: Marker[],\n    textDocument: TextDocument<LAnnotation>\n  ): void {\n    this.#markers = markers.map((marker) => ({\n      ...marker,\n      start: textDocument.normalizePosition(marker.start),\n      end: textDocument.normalizePosition(marker.end),\n    }));\n    this.removePopup();\n  }\n\n  listenHover(contentEl: HTMLElement): void {\n    this.#markerEventDisposes?.forEach((dispose) => dispose());\n    this.#markerEventDisposes = undefined;\n    if (this.#markers.length === 0) {\n      return;\n    }\n\n    this.#markerEventDisposes = [\n      addEventListener(contentEl, 'mouseover', (e) => {\n        if (this.#editor.isMouseDown()) {\n          return;\n        }\n        const target = e.composedPath()[0] as HTMLElement | undefined;\n        if (target === undefined) {\n          return;\n        }\n\n        const hoverMarkerIndex = this.#findHoveredMarkerIndex(target);\n        if (hoverMarkerIndex !== undefined) {\n          this.#scheduleMarkerPopup(hoverMarkerIndex);\n        } else {\n          this.#cancelMarkerPopupShow();\n          this.#scheduleMarkerPopupHide();\n        }\n      }),\n      addEventListener(contentEl, 'mouseleave', () => {\n        this.#cancelMarkerPopupShow();\n        this.#scheduleMarkerPopupHide();\n      }),\n    ];\n  }\n\n  removePopup(): void {\n    this.#cancelMarkerPopupShow();\n    this.#cancelMarkerPopupHide();\n    this.#dismissMarkerPopup();\n  }\n\n  cleanup(): void {\n    this.#markerEventDisposes?.forEach((dispose) => dispose());\n    this.#markerEventDisposes = undefined;\n    this.removePopup();\n    this.#markers = [];\n  }\n\n  #findHoveredMarkerIndex(target: HTMLElement): number | undefined {\n    const lineElement = target.closest('[data-line]');\n    if (lineElement == null) {\n      return;\n    }\n\n    const lineNumber = getLineNumberAttr(lineElement as HTMLElement);\n    if (lineNumber === undefined) {\n      return;\n    }\n\n    let character: number | undefined;\n    if (target.tagName === 'SPAN') {\n      const char = target.dataset.char;\n      if (char === undefined) {\n        return;\n      }\n      character = parseInt(char, 10);\n      if (Number.isNaN(character)) {\n        return;\n      }\n    } else if (target.tagName === 'BR') {\n      character = 0;\n    } else {\n      return;\n    }\n\n    const position: Position = { line: lineNumber - 1, character };\n    for (let i = this.#markers.length - 1; i >= 0; i--) {\n      if (\n        selectionIntersects(\n          { start: position, end: position },\n          this.#markers[i]\n        )\n      ) {\n        return i;\n      }\n    }\n    return undefined;\n  }\n\n  #cancelMarkerPopupShow(): void {\n    if (this.#markerPopupShowTimeout !== undefined) {\n      clearTimeout(this.#markerPopupShowTimeout);\n      this.#markerPopupShowTimeout = undefined;\n    }\n    this.#pendingMarkerPopupIndex = undefined;\n  }\n\n  #cancelMarkerPopupHide(): void {\n    if (this.#markerPopupHideTimeout !== undefined) {\n      clearTimeout(this.#markerPopupHideTimeout);\n      this.#markerPopupHideTimeout = undefined;\n    }\n  }\n\n  #scheduleMarkerPopup(markerIndex: number): void {\n    if (\n      markerIndex === this.#hoveredMarkerIndex ||\n      markerIndex === this.#pendingMarkerPopupIndex\n    ) {\n      this.#cancelMarkerPopupHide();\n      return;\n    }\n\n    this.#cancelMarkerPopupShow();\n    this.#cancelMarkerPopupHide();\n    if (this.#markerPopupElement !== undefined) {\n      this.#renderMarkerPopup(markerIndex);\n      return;\n    }\n\n    this.#pendingMarkerPopupIndex = markerIndex;\n    this.#markerPopupShowTimeout = setTimeout(() => {\n      this.#markerPopupShowTimeout = undefined;\n      this.#pendingMarkerPopupIndex = undefined;\n      this.#renderMarkerPopup(markerIndex);\n    }, MARKER_POPUP_SHOW_DELAY_MS);\n  }\n\n  #scheduleMarkerPopupHide(): void {\n    if (this.#isMarkerPopupHovered) {\n      return;\n    }\n\n    this.#cancelMarkerPopupHide();\n    this.#markerPopupHideTimeout = setTimeout(() => {\n      this.#markerPopupHideTimeout = undefined;\n      if (!this.#isMarkerPopupHovered) {\n        this.removePopup();\n      }\n    }, MARKER_POPUP_HIDE_DELAY_MS);\n  }\n\n  #dismissMarkerPopup(): void {\n    this.#markerPopupEventDisposes?.forEach((dispose) => dispose());\n    this.#markerPopupEventDisposes = undefined;\n    this.#markerPopupElement?.remove();\n    this.#markerPopupElement = undefined;\n    this.#hoveredMarkerIndex = undefined;\n    this.#isMarkerPopupHovered = false;\n  }\n\n  #renderMarkerPopup(hoveredMarkerIndex: number): void {\n    if (hoveredMarkerIndex === this.#hoveredMarkerIndex) {\n      return;\n    }\n\n    const fileContainer = this.#editor.getFileContainer();\n    const preElement =\n      fileContainer?.shadowRoot?.querySelector<HTMLElement>('pre');\n    const codeElement = preElement?.querySelector<HTMLElement>('[data-code]');\n    if (\n      hoveredMarkerIndex >= this.#markers.length ||\n      preElement == null ||\n      codeElement == null\n    ) {\n      return;\n    }\n\n    const { start, message } = this.#markers[hoveredMarkerIndex];\n    const { line, character } = start;\n    const { getCharX, getLineY, getLineHeight } = this.#editor;\n    const [left, wrapLine] = getCharX(line, character);\n    const lineHeight = getLineHeight();\n    const y = getLineY(line) + wrapLine * lineHeight + lineHeight;\n    const transform = `translateX(${codeElement.offsetLeft + left}px) translateY(${codeElement.offsetTop + y}px)`;\n    const popup = this.#markerPopupElement;\n\n    if (popup !== undefined) {\n      popup.style.transform = transform;\n      const content = popup.firstElementChild as HTMLElement | null;\n      if (content?.dataset.markerMessage !== undefined) {\n        if (typeof message === 'string') {\n          content.textContent = message;\n        } else if (message instanceof HTMLElement) {\n          content.replaceChildren(message);\n        } else {\n          content.innerHTML = message.html;\n        }\n      }\n      this.#hoveredMarkerIndex = hoveredMarkerIndex;\n      return;\n    }\n\n    this.#markerPopupElement = h(\n      'div',\n      {\n        dataset: ['editorWidget', 'markerPopup'],\n        style: { transform },\n        children: [\n          h('div', {\n            dataset: 'markerMessage',\n            ...(typeof message === 'string'\n              ? { textContent: message }\n              : message instanceof HTMLElement\n                ? { children: [message] }\n                : { innerHTML: message.html }),\n          }),\n        ],\n      },\n      preElement\n    );\n    this.#hoveredMarkerIndex = hoveredMarkerIndex;\n    this.#markerPopupEventDisposes = [\n      addEventListener(this.#markerPopupElement, 'mouseenter', () => {\n        this.#isMarkerPopupHovered = true;\n        this.#cancelMarkerPopupHide();\n      }),\n      addEventListener(this.#markerPopupElement, 'mouseleave', () => {\n        this.#isMarkerPopupHovered = false;\n        this.#scheduleMarkerPopupHide();\n      }),\n    ];\n  }\n}\n\nexport function markerSeverityDatasetKey(severity: MarkerSeverity): string {\n  switch (severity) {\n    case 'error':\n      return 'markerError';\n    case 'warning':\n      return 'markerWarning';\n    case 'info':\n      return 'markerInfo';\n    case 'hint':\n      return 'markerHint';\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"marker.js","names":["#editor","#markers","#hoveredMarkerIndex","#markerEventDisposes","#findHoveredMarkerIndex","#scheduleMarkerPopup","#cancelMarkerPopupShow","#scheduleMarkerPopupHide","#cancelMarkerPopupHide","#dismissMarkerPopup","#markerPopupShowTimeout","#pendingMarkerPopupIndex","#markerPopupHideTimeout","#markerPopupElement","#renderMarkerPopup","#isMarkerPopupHovered","#markerPopupEventDisposes","#setMarkerPopupPosition"],"sources":["../../src/editor/marker.ts"],"sourcesContent":["import { selectionIntersects } from './selection';\nimport type { Position, Range, TextDocument } from './textDocument';\nimport { addEventListener, getLineNumberAttr, h } from './utils';\n\nconst MARKER_POPUP_SHOW_DELAY_MS = 300;\nconst MARKER_POPUP_HIDE_DELAY_MS = 100;\n\nexport type MarkerSeverity = 'error' | 'warning' | 'info' | 'hint';\n\nexport interface Marker extends Range {\n  severity: MarkerSeverity;\n  message: string | { html: string } | HTMLElement;\n  source?: string;\n  metadata?: Record<string, unknown>;\n}\n\nexport interface EditorStub {\n  getLineHeight: () => number;\n  getOverlayElement: () => HTMLElement | undefined;\n  getGutterWidth: () => number;\n  getCharX: (line: number, character: number) => [number, number];\n  getLineY: (line: number) => number;\n  isMouseDown: () => boolean;\n}\n\nexport class MarkerRenderer {\n  #editor: EditorStub;\n  #markers: Marker[] = [];\n  #markerPopupElement?: HTMLElement;\n  #markerPopupEventDisposes?: (() => void)[];\n  #markerEventDisposes?: (() => void)[];\n  #markerPopupShowTimeout?: ReturnType<typeof setTimeout>;\n  #markerPopupHideTimeout?: ReturnType<typeof setTimeout>;\n  #pendingMarkerPopupIndex?: number;\n  #hoveredMarkerIndex?: number;\n  #isMarkerPopupHovered = false;\n\n  constructor(editor: EditorStub) {\n    this.#editor = editor;\n  }\n\n  get markers(): readonly Marker[] {\n    return this.#markers;\n  }\n\n  isPopupVisible(): boolean {\n    return this.#hoveredMarkerIndex !== undefined;\n  }\n\n  setMarkers<LAnnotation>(\n    markers: Marker[],\n    textDocument: TextDocument<LAnnotation>\n  ): void {\n    this.#markers = markers.map((marker) => ({\n      ...marker,\n      start: textDocument.normalizePosition(marker.start),\n      end: textDocument.normalizePosition(marker.end),\n    }));\n    this.removePopup();\n  }\n\n  listenHover(contentEl: HTMLElement): void {\n    this.#markerEventDisposes?.forEach((dispose) => dispose());\n    this.#markerEventDisposes = undefined;\n    if (this.#markers.length === 0) {\n      return;\n    }\n\n    this.#markerEventDisposes = [\n      addEventListener(contentEl, 'mouseover', (e) => {\n        if (this.#editor.isMouseDown()) {\n          return;\n        }\n        const target = e.composedPath()[0] as HTMLElement | undefined;\n        if (target === undefined) {\n          return;\n        }\n\n        const hoverMarkerIndex = this.#findHoveredMarkerIndex(target);\n        if (hoverMarkerIndex !== undefined) {\n          this.#scheduleMarkerPopup(hoverMarkerIndex);\n        } else {\n          this.#cancelMarkerPopupShow();\n          this.#scheduleMarkerPopupHide();\n        }\n      }),\n      addEventListener(contentEl, 'mouseleave', () => {\n        this.#cancelMarkerPopupShow();\n        this.#scheduleMarkerPopupHide();\n      }),\n    ];\n  }\n\n  removePopup(): void {\n    this.#cancelMarkerPopupShow();\n    this.#cancelMarkerPopupHide();\n    this.#dismissMarkerPopup();\n  }\n\n  cleanup(): void {\n    this.#markerEventDisposes?.forEach((dispose) => dispose());\n    this.#markerEventDisposes = undefined;\n    this.removePopup();\n    this.#markers = [];\n  }\n\n  #findHoveredMarkerIndex(target: HTMLElement): number | undefined {\n    const lineElement = target.closest('[data-line]');\n    if (lineElement == null) {\n      return;\n    }\n\n    const lineNumber = getLineNumberAttr(lineElement as HTMLElement);\n    if (lineNumber === undefined) {\n      return;\n    }\n\n    let character: number | undefined;\n    if (target.tagName === 'SPAN') {\n      const char = target.dataset.char;\n      if (char === undefined) {\n        return;\n      }\n      character = parseInt(char, 10);\n      if (Number.isNaN(character)) {\n        return;\n      }\n    } else if (target.tagName === 'BR') {\n      character = 0;\n    } else {\n      return;\n    }\n\n    const position: Position = { line: lineNumber - 1, character };\n    for (let i = this.#markers.length - 1; i >= 0; i--) {\n      if (\n        selectionIntersects(\n          { start: position, end: position },\n          this.#markers[i]\n        )\n      ) {\n        return i;\n      }\n    }\n    return undefined;\n  }\n\n  #cancelMarkerPopupShow(): void {\n    if (this.#markerPopupShowTimeout !== undefined) {\n      clearTimeout(this.#markerPopupShowTimeout);\n      this.#markerPopupShowTimeout = undefined;\n    }\n    this.#pendingMarkerPopupIndex = undefined;\n  }\n\n  #cancelMarkerPopupHide(): void {\n    if (this.#markerPopupHideTimeout !== undefined) {\n      clearTimeout(this.#markerPopupHideTimeout);\n      this.#markerPopupHideTimeout = undefined;\n    }\n  }\n\n  #scheduleMarkerPopup(markerIndex: number): void {\n    if (\n      markerIndex === this.#hoveredMarkerIndex ||\n      markerIndex === this.#pendingMarkerPopupIndex\n    ) {\n      this.#cancelMarkerPopupHide();\n      return;\n    }\n\n    this.#cancelMarkerPopupShow();\n    this.#cancelMarkerPopupHide();\n    if (this.#markerPopupElement !== undefined) {\n      this.#renderMarkerPopup(markerIndex);\n      return;\n    }\n\n    this.#pendingMarkerPopupIndex = markerIndex;\n    this.#markerPopupShowTimeout = setTimeout(() => {\n      this.#markerPopupShowTimeout = undefined;\n      this.#pendingMarkerPopupIndex = undefined;\n      this.#renderMarkerPopup(markerIndex);\n    }, MARKER_POPUP_SHOW_DELAY_MS);\n  }\n\n  #scheduleMarkerPopupHide(): void {\n    if (this.#isMarkerPopupHovered) {\n      return;\n    }\n\n    this.#cancelMarkerPopupHide();\n    this.#markerPopupHideTimeout = setTimeout(() => {\n      this.#markerPopupHideTimeout = undefined;\n      if (!this.#isMarkerPopupHovered) {\n        this.removePopup();\n      }\n    }, MARKER_POPUP_HIDE_DELAY_MS);\n  }\n\n  // Positions the popup in overlay coordinate space and feeds the current gutter\n  // width to CSS so the shared popover rule can keep the popup clear of the\n  // line-number gutter (see [data-marker-popup] in editor.css).\n  #setMarkerPopupPosition(popup: HTMLElement, x: number, y: number): void {\n    popup.style.setProperty(\n      '--gutter-width',\n      this.#editor.getGutterWidth() + 'px'\n    );\n    popup.style.setProperty('--popover-x', x + 'px');\n    popup.style.setProperty('--popover-y', y + 'px');\n  }\n\n  #dismissMarkerPopup(): void {\n    this.#markerPopupEventDisposes?.forEach((dispose) => dispose());\n    this.#markerPopupEventDisposes = undefined;\n    this.#markerPopupElement?.remove();\n    this.#markerPopupElement = undefined;\n    this.#hoveredMarkerIndex = undefined;\n    this.#isMarkerPopupHovered = false;\n  }\n\n  #renderMarkerPopup(hoveredMarkerIndex: number): void {\n    if (hoveredMarkerIndex === this.#hoveredMarkerIndex) {\n      return;\n    }\n\n    const overlayElement = this.#editor.getOverlayElement();\n    if (hoveredMarkerIndex >= this.#markers.length || overlayElement == null) {\n      return;\n    }\n\n    const { start, message, severity } = this.#markers[hoveredMarkerIndex];\n    const { line, character } = start;\n    const { getCharX, getLineY, getLineHeight } = this.#editor;\n    const [left, wrapLine] = getCharX(line, character);\n    const lineHeight = getLineHeight();\n    const y = getLineY(line) + wrapLine * lineHeight + lineHeight;\n    const popup = this.#markerPopupElement;\n\n    if (popup !== undefined) {\n      this.#setMarkerPopupPosition(popup, left, y);\n      setMarkerPopupSeverity(popup, severity);\n      const content = popup.firstElementChild as HTMLElement | null;\n      if (content?.dataset.markerMessage !== undefined) {\n        if (typeof message === 'string') {\n          content.textContent = message;\n        } else if (message instanceof HTMLElement) {\n          content.replaceChildren(message);\n        } else {\n          content.innerHTML = message.html;\n        }\n      }\n      this.#hoveredMarkerIndex = hoveredMarkerIndex;\n      return;\n    }\n\n    this.#markerPopupElement = h(\n      'div',\n      {\n        dataset: {\n          editorWidget: '',\n          markerPopup: '',\n          [markerSeverityDatasetKey(severity)]: '',\n        },\n        children: [\n          h('div', {\n            dataset: 'markerMessage',\n            ...(typeof message === 'string'\n              ? { textContent: message }\n              : message instanceof HTMLElement\n                ? { children: [message] }\n                : { innerHTML: message.html }),\n          }),\n        ],\n      },\n      overlayElement\n    );\n    this.#setMarkerPopupPosition(this.#markerPopupElement, left, y);\n    this.#hoveredMarkerIndex = hoveredMarkerIndex;\n    this.#markerPopupEventDisposes = [\n      addEventListener(this.#markerPopupElement, 'mouseenter', () => {\n        this.#isMarkerPopupHovered = true;\n        this.#cancelMarkerPopupHide();\n      }),\n      addEventListener(this.#markerPopupElement, 'mouseleave', () => {\n        this.#isMarkerPopupHovered = false;\n        this.#scheduleMarkerPopupHide();\n      }),\n    ];\n  }\n}\n\nconst MARKER_SEVERITIES: readonly MarkerSeverity[] = [\n  'error',\n  'warning',\n  'info',\n  'hint',\n];\n\n// Marks the popup with data-marker-<severity> (the same boolean attribute the\n// squiggle range element uses) so the CSS severity palette can target both with\n// a single selector. The popup element is reused across hovers, so any\n// previously applied severity attribute is cleared first.\nfunction setMarkerPopupSeverity(\n  popup: HTMLElement,\n  severity: MarkerSeverity\n): void {\n  for (const candidate of MARKER_SEVERITIES) {\n    delete popup.dataset[markerSeverityDatasetKey(candidate)];\n  }\n  popup.dataset[markerSeverityDatasetKey(severity)] = '';\n}\n\nexport function markerSeverityDatasetKey(severity: MarkerSeverity): string {\n  switch (severity) {\n    case 'error':\n      return 'markerError';\n    case 'warning':\n      return 'markerWarning';\n    case 'info':\n      return 'markerInfo';\n    case 'hint':\n      return 'markerHint';\n  }\n}\n"],"mappings":"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"}

package/dist/editor/pieceTable.d.ts

@@ -2,11 +2,13 @@ import { SearchParams } from "./searchPanel.js";
 import { Position, Range, ResolvedTextEdit } from "./textDocument.js";
 
 //#region src/editor/pieceTable.d.ts
-
 /**
  * A piece table is a data structure that allows for efficient insertion and deletion of text.
  * It is a tree of pieces, where each piece is a segment of text that is either original or added.
- * The tree is rebuilt as a balanced tree after edits to keep lookups efficient.
+ * The tree is a treap (a binary search tree that also keeps each node's random priority in heap
+ * order, which keeps the tree balanced without an explicit rebalancing pass). Each edit reshapes
+ * only the nodes along one root-to-leaf path via split and merge in O(log P), instead of
+ * rebuilding all P pieces.
  * Inspired by https://code.visualstudio.com/blogs/2018/03/23/text-buffer-reimplementation
  */
 declare class PieceTable {

package/dist/editor/pieceTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pieceTable.d.ts","names":["SearchParams","Position","Range","ResolvedTextEdit","PieceTable","buildSearchReplacementText"],"sources":["../../src/editor/pieceTable.d.ts"],"sourcesContent":["import type { SearchParams } from './searchPanel';\nimport type { Position, Range, ResolvedTextEdit } from './textDocument';\n/**\n * A piece table is a data structure that allows for efficient insertion and deletion of text.\n * It is a tree of pieces, where each piece is a segment of text that is either original or added.\n * The tree is rebuilt as a balanced tree after edits to keep lookups efficient.\n * Inspired by https://code.visualstudio.com/blogs/2018/03/23/text-buffer-reimplementation\n */\nexport declare class PieceTable {\n    #private;\n    constructor(originalText: string);\n    get lineCount(): number;\n    getText(range?: Range): string;\n    getLineText(line: number, includeLineBreak?: boolean): string;\n    getLineLength(line: number, includeLineBreak?: boolean): number;\n    getTextSlice(start: number, end: number, trimEOF?: boolean): string;\n    charAt(offset: number): string;\n    includes(needle: string): boolean;\n    findNextNonOverlappingSubstring(needle: string, occupied: readonly [start: number, end: number][]): number | undefined;\n    search(searchParams: SearchParams): [start: number, end: number][];\n    insert(text: string, offset: number): void;\n    delete(offset: number, length: number): void;\n    applyEdits(edits: readonly ResolvedTextEdit[]): void;\n    positionAt(offset: number): Position;\n    positionsAt(offsets: readonly number[]): Position[];\n    offsetAt(position: Position): number;\n}\n/**\n * Builds the text to insert for one search match, including regex capture\n * substitution when regex mode is enabled.\n */\nexport declare function buildSearchReplacementText(positionAt: (offset: number) => Position, offsetAt: (position: Position) => number, getLineText: (line: number) => string, searchParams: SearchParams, matchStart: number, matchEnd: number): string;\n//# sourceMappingURL=pieceTable.d.ts.map"],"mappings":";;;;;;;AAQA;;;;AAegCC,cAfXG,UAAAA,CAeWH;EACaA,CAAAA,OAAAA;EACtBA,WAAAA,CAAAA,YAAAA,EAAAA,MAAAA;EAAQ,IAAA,SAAA,CAAA,CAAA,EAAA,MAAA;EAMPI,OAAAA,CAAAA,KAAAA,CAAAA,EAnBJH,KAmBIG,CAAAA,EAAAA,MAA0B;EAAiCJ,WAAAA,CAAAA,IAAAA,EAAAA,MAAAA,EAAAA,gBAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,MAAAA;EAA+BA,aAAAA,CAAAA,IAAAA,EAAAA,MAAAA,EAAAA,gBAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,MAAAA;EAA0ED,YAAAA,CAAAA,KAAAA,EAAAA,MAAAA,EAAAA,GAAAA,EAAAA,MAAAA,EAAAA,OAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,MAAAA;EAAY,MAAA,CAAA,MAAA,EAAA,MAAA,CAAA,EAAA,MAAA;;;uBAZ/KA;;;6BAGMG;8BACCF;2CACaA;qBACtBA;;;;;;iBAMCI,0BAAAA,iCAA2DJ,+BAA+BA,0EAA0ED"}
+{"version":3,"file":"pieceTable.d.ts","names":[],"sources":["../../src/editor/pieceTable.ts"],"mappings":";;;;;;AAmFA;;;;;;;cAAa,UAAA;EAAA;EAcX,WAAA,CAAY,YAAA;EAAA,IAQR,SAAA;EAIJ,OAAA,CAAQ,KAAA,GAAQ,KAAA;EAShB,WAAA,CAAY,IAAA,UAAc,gBAAA;EAkB1B,aAAA,CAAc,IAAA,UAAc,gBAAA;EAqC5B,YAAA,CAAa,KAAA,UAAe,GAAA,UAAa,OAAA;EAsCzC,MAAA,CAAO,MAAA;EAWP,QAAA,CAAS,MAAA;EA2BT,+BAAA,CACE,MAAA,UACA,QAAA,YAAoB,KAAA,UAAe,GAAA;EA0CrC,MAAA,CAAO,YAAA,EAAc,YAAA,IAAgB,KAAA,UAAe,GAAA;EA4EpD,MAAA,CAAO,IAAA,UAAc,MAAA;EAQrB,MAAA,CAAO,MAAA,UAAgB,MAAA;EAYvB,UAAA,CAAW,KAAA,WAAgB,gBAAA;EAgB3B,UAAA,CAAW,MAAA,WAAiB,QAAA;EAa5B,WAAA,CAAY,OAAA,sBAA6B,QAAA;EAgBzC,QAAA,CAAS,QAAA,EAAU,QAAA;AAAA;;;;;iBAikBL,0BAAA,CACd,UAAA,GAAa,MAAA,aAAmB,QAAA,EAChC,QAAA,GAAW,QAAA,EAAU,QAAA,aACrB,WAAA,GAAc,IAAA,qBACd,YAAA,EAAc,YAAA,EACd,UAAA,UACA,QAAA"}