@ai-ecoverse/slicc-spectrum 1.94.0 → 1.94.1

package/dist/slicc-ui.js

@@ -16214,11 +16214,11 @@ function getVisibleRowContext(state2, index) {
     subtreeEndIndex: getVisibleRowSubtreeEndIndex(state2, selected.cursor, selected.index, totalVisibleCount)
   };
 }
-function getVisibleSlice(state2, start, end) {
+function getVisibleSlice(state2, start2, end) {
   const instrumentation = state2.instrumentation;
   const totalVisibleCount = getVisibleCount(state2);
-  if (totalVisibleCount <= 0 || end < start) return [];
-  const normalizedStart = Math.max(0, Math.min(start, totalVisibleCount - 1));
+  if (totalVisibleCount <= 0 || end < start2) return [];
+  const normalizedStart = Math.max(0, Math.min(start2, totalVisibleCount - 1));
   const normalizedEnd = Math.max(normalizedStart, Math.min(end, totalVisibleCount - 1));
   if (instrumentation == null) {
     if (normalizedStart === 0) return collectVisibleRowsDFS(state2, normalizedEnd + 1);
@@ -16837,8 +16837,8 @@ var PathStore = class PathStore2 {
   getVisibleCount() {
     return withBenchmarkPhase(this.#state.instrumentation, "store.getVisibleCount", () => getVisibleCount(this.#state));
   }
-  getVisibleSlice(start, end) {
-    return withBenchmarkPhase(this.#state.instrumentation, "store.getVisibleSlice", () => getVisibleSlice(this.#state, start, end));
+  getVisibleSlice(start2, end) {
+    return withBenchmarkPhase(this.#state.instrumentation, "store.getVisibleSlice", () => getVisibleSlice(this.#state, start2, end));
   }
   getVisibleRowContext(index) {
     return withBenchmarkPhase(this.#state.instrumentation, "store.getVisibleRowContext", () => getVisibleRowContext(this.#state, index));
@@ -17901,9 +17901,9 @@ var FileTreeController = class FileTreeController2 {
   getVisibleCount() {
     return this.#visibleCount;
   }
-  getVisibleRows(start, end) {
-    if (end < start || this.#visibleCount === 0) return [];
-    const boundedStart = Math.max(0, start);
+  getVisibleRows(start2, end) {
+    if (end < start2 || this.#visibleCount === 0) return [];
+    const boundedStart = Math.max(0, start2);
     const boundedEnd = Math.min(this.#visibleCount - 1, end);
     if (boundedEnd < boundedStart) return [];
     const boundedLength = boundedEnd - boundedStart + 1;
@@ -22208,8 +22208,8 @@ var FileTree = class {
   getVisibleCount() {
     return this.#controller.getVisibleCount();
   }
-  getVisibleRows(start, end) {
-    return this.#controller.getVisibleRows(start, end);
+  getVisibleRows(start2, end) {
+    return this.#controller.getVisibleRows(start2, end);
   }
   getSelectedPaths() {
     return this.#controller.getSelectedPaths();
@@ -22534,14 +22534,14 @@ function inline2(text2) {
 function cells(line) {
   return line.trim().replace(/^\||\|$/g, "").split("|").map((cell) => cell.trim());
 }
-function fence(lines, start) {
-  const lang = lines[start].slice(3).trim();
-  let end = start + 1;
+function fence(lines, start2) {
+  const lang = lines[start2].slice(3).trim();
+  let end = start2 + 1;
   while (end < lines.length && !lines[end].startsWith("```")) end++;
-  return [{ type: "code", lang, text: lines.slice(start + 1, end).join("\n") }, end + 1];
+  return [{ type: "code", lang, text: lines.slice(start2 + 1, end).join("\n") }, end + 1];
 }
-function run(lines, start, test) {
-  let end = start;
+function run(lines, start2, test) {
+  let end = start2;
   while (end < lines.length && test(lines[end])) end++;
   return end;
 }
@@ -36623,9 +36623,9 @@ function scan2(words, cwds, whole) {
 }
 function reach2(command3, cwd) {
   if (command3.length > 4096) return `${command3.slice(0, 40)}\u2026`;
-  const start = absolute("/", cwd ?? "/");
-  if (protects(start, false)) return start;
-  const cwds = /* @__PURE__ */ new Set([start]);
+  const start2 = absolute("/", cwd ?? "/");
+  if (protects(start2, false)) return start2;
+  const cwds = /* @__PURE__ */ new Set([start2]);
   const text2 = unglob(ansi(command3.replace(/\\\n/g, "")));
   const plain = text2.split(separators).map((segment2) => commas(segment2.split(/[\s<>=]+/).map((word) => word.replace(/['"\\]/g, ""))));
   const aware = shield(text2).split(separators).map((segment2) => commas(quoted(unshield(segment2))));
@@ -36636,7 +36636,7 @@ function reach2(command3, cwd) {
     if (hit) return hit;
   }
   const named2 = segments.flat().find((word) => !word.startsWith("/") && /fnox|secrets-policy/.test(word));
-  if (named2) return absolute([...cwds].pop() ?? start, named2);
+  if (named2) return absolute([...cwds].pop() ?? start2, named2);
   const home2 = segments.flat().find((word) => /^~(?:[+-](?:\/|$)|.*\/\.\.(?:\/|$))/.test(word));
   if (home2) return home2;
   return segments.flat().some((word) => word.includes("$")) || text2.includes("`") ? text2.match(expansion)[0] : null;
@@ -39818,20 +39818,18 @@ var fieldStyles = i`
     font-size: var(--swc-font-size-75);
     color: var(--swc-neutral-subdued-content-color-default);
   }
-  .field input:not([type='checkbox']),
-  .field select {
+  .field input:not([type='checkbox']) {
     box-sizing: border-box;
     inline-size: 100%;
     font: inherit;
     min-height: var(--swc-component-height-100);
     padding: 0 var(--swc-spacing-100);
-    border: var(--swc-border-width-100) solid var(--swc-gray-400);
+    border: var(--swc-border-width-100) solid var(--swc-neutral-visual-color);
     border-radius: var(--swc-corner-radius-small-default);
     background: var(--swc-background-layer-2-color);
     color: inherit;
   }
-  .field input[aria-invalid='true'],
-  .field select[aria-invalid='true'] {
+  .field input[aria-invalid='true'] {
     border-color: var(--swc-negative-border-color-default);
   }
   .field input[type='file'] {
@@ -39848,7 +39846,6 @@ var fieldStyles = i`
     color: inherit;
   }
   .field input:focus-visible,
-  .field select:focus-visible,
   input[type='checkbox']:focus-visible {
     outline: var(--swc-focus-indicator-thickness) solid var(--swc-focus-indicator-color);
     outline-offset: var(--swc-focus-ring-gap);
@@ -41854,9 +41851,9 @@ function revealed(name, entries, now = Date.now(), more = false) {
   );
   if (!reveals.length) return null;
   const [last] = reveals;
-  const start = startOfDay(now);
-  const today = reveals.filter((entry) => entry.at >= start).length;
-  const partial = more && (entries[entries.length - 1]?.at ?? 0) >= start;
+  const start2 = startOfDay(now);
+  const today = reveals.filter((entry) => entry.at >= start2).length;
+  const partial = more && (entries[entries.length - 1]?.at ?? 0) >= start2;
   const when2 = today ? `${partial ? "at least " : ""}${today} ${today === 1 ? "time" : "times"} today` : since(last.at, now);
   return b`Revealed to programs ${when2}, last by ${who(last)} with <code>${last.argv}</code>`;
 }
@@ -43024,6 +43021,8 @@ function matchProviders(options, query) {
   });
 }
 var popup = (account) => account.group === "mcp" && account.auth === "oauth";
+var start = (options, value) => options.some((option2) => option2.value === value) ? value : options[0]?.value ?? "";
+var nothingToChoose = "Nothing to choose from yet. You can connect without it.";
 var secretNames = { "api-key": "API key", token: "token" };
 var rejectedNames = { "api-key": "API key rejected", token: "Token rejected" };
 var keptNames = { "api-key": "Key kept in the vault", token: "Token kept in the vault" };
@@ -43155,6 +43154,22 @@ var SliccSettings = class extends ThemedElement {
         gap: var(--swc-spacing-200);
         max-width: 420px;
       }
+      .key.stacked sp-textfield,
+      .field sp-picker {
+        width: 100%;
+      }
+      .field sp-field-label {
+        margin: 0;
+        padding-block: 0;
+      }
+      .sr {
+        position: absolute;
+        inline-size: 1px;
+        block-size: 1px;
+        overflow: hidden;
+        clip-path: inset(50%);
+        white-space: nowrap;
+      }
       .buttons,
       .locked {
         display: flex;
@@ -43545,7 +43560,11 @@ var SliccSettings = class extends ThemedElement {
       const value = input.value.trim();
       if (value) values[field.name] = value;
       else if (field.required && field.options?.length !== 0) {
-        this.#refuse(account.id, field.name, `${field.label} can\u2019t be empty`);
+        this.#refuse(
+          account.id,
+          field.name,
+          field.options ? `Select a ${field.label.toLowerCase()}.` : `${field.label} can\u2019t be empty`
+        );
         return null;
       }
     }
@@ -43608,11 +43627,11 @@ var SliccSettings = class extends ThemedElement {
     this.failure = null;
     this.problem = null;
   }
-  #problem(account, field) {
+  #problem(account, field, icon = true) {
     const problem = this.problem;
     if (problem?.id !== account.id || problem.field !== field) return A;
     return b`<div class="problem" id="key-problem" role="alert">
-      <swc-icon-alert-triangle size="s" aria-hidden="true"></swc-icon-alert-triangle>
+      ${icon ? b`<swc-icon-alert-triangle size="s" aria-hidden="true"></swc-icon-alert-triangle>` : A}
       <span>${problem.message}</span>
     </div>`;
   }
@@ -43624,11 +43643,16 @@ var SliccSettings = class extends ThemedElement {
   }
   #extra(account) {
     return (account.fields ?? []).map(
-      (field) => b`<label class="field">
-          <span>${field.label}</span>${this.#control(account, field)}
-        </label>
-        ${field.help ? b`<p class="hint" id=${`help-${field.name}`}>${field.help}</p>` : A}
-        ${this.#problem(account, field.name)}`
+      (field) => field.options ? b`<div class="field">
+              <sp-field-label for=${`field-${field.name}`} size="m">${field.label}</sp-field-label>${this.#control(account, field)}
+              ${field.options.length ? A : b`<p class="hint" data-empty=${field.name}>${nothingToChoose}</p>`}
+              ${field.help ? b`<p class="hint" id=${`help-${field.name}`}>${field.help}</p>` : A}
+              ${this.#problem(account, field.name, false)}
+            </div>` : b`<label class="field">
+              <span>${field.label}</span>${this.#control(account, field)}
+            </label>
+            ${field.help ? b`<p class="hint" id=${`help-${field.name}`}>${field.help}</p>` : A}
+            ${this.#problem(account, field.name)}`
     );
   }
   #describedBy(account, field) {
@@ -43638,16 +43662,21 @@ var SliccSettings = class extends ThemedElement {
   }
   #control(account, field) {
     if (field.options) {
-      const chosen = field.value ?? field.options[0]?.value;
-      return b`<select
+      const empty3 = !field.options.length;
+      const described = this.problem?.id === account.id && this.problem.field === field.name;
+      return b`<sp-picker
+          size="m"
           data-account-field=${field.name}
-          ?disabled=${!field.options.length}
+          label=${empty3 ? "None available" : field.label}
+          id=${`field-${field.name}`}
+          value=${start(field.options, field.value)}
+          ?disabled=${empty3}
+          ?invalid=${described}
           aria-required=${field.required ? "true" : A}
-          aria-invalid=${this.#invalid(account, field.name)}
-          aria-describedby=${this.#describedBy(account, field)}
         >
-          ${field.options.map((option2) => b`<option value=${option2.value} ?selected=${option2.value === chosen}>${option2.label}</option>`)}
-        </select>`;
+          ${field.options.map((option2) => b`<sp-menu-item value=${option2.value}>${option2.label}</sp-menu-item>`)}
+          ${described || empty3 || field.help ? b`<span slot="description" class="sr">${described ? this.problem?.message : empty3 ? nothingToChoose : field.help}</span>` : A}
+        </sp-picker>`;
     }
     return b`<input
           type="text"
@@ -43674,7 +43703,7 @@ var SliccSettings = class extends ThemedElement {
   }
   #ready(account) {
     if (!this.#offered()) return true;
-    const required = (account.fields ?? []).filter((field) => field.required);
+    const required = (account.fields ?? []).filter((field) => field.required && !field.options);
     return ["value", ...required.map((field) => field.name)].every((name) => this.filled.has(name));
   }
   #fill(event2) {
@@ -43728,18 +43757,25 @@ var SliccSettings = class extends ThemedElement {
     const busy = this.pending.has(account.id);
     const extra = account.fields?.length || account.keyUrl;
     return b`<form class=${extra ? "key stacked" : "key"} data-id=${account.id} @submit=${(event2) => this.#submit(event2, account)} @keydown=${(event2) => this.#submitOnEnter(event2)} @input=${(event2) => this.#fill(event2)}>
-        <sp-textfield
+        ${extra ? b`<div class="field"><sp-field-label for="key-secret" size="m">${this.#secretLabel(account)}</sp-field-label>${this.#secret(account)}</div>` : this.#secret(account)}
+        ${this.#getKey(account)}
+        ${extra ? this.#extra(account) : A}
+        ${extra ? b`<div class="buttons">${this.#buttons(account, busy)}</div>` : this.#buttons(account, busy)}
+      </form>`;
+  }
+  #secretLabel(account) {
+    return `${account.provider} ${secretNames[account.secret ?? "api-key"]}`;
+  }
+  #secret(account) {
+    return b`<sp-textfield
           size="m"
           type="password"
           autocomplete="off"
-          label=${`${account.provider} ${secretNames[account.secret ?? "api-key"]}`}
+          id="key-secret"
+          label=${this.#secretLabel(account)}
           placeholder=${`Paste the ${secretNames[account.secret ?? "api-key"]}`}
           @keydown=${(event2) => this.#enterKey(event2)}
-        ></sp-textfield>
-        ${this.#getKey(account)}
-        ${extra ? this.#extra(account) : A}
-        ${extra ? b`<div class="buttons">${this.#buttons(account, busy)}</div>` : this.#buttons(account, busy)}
-      </form>`;
+        ></sp-textfield>`;
   }
   #buttons(account, busy) {
     return b`<swc-button size="m" variant="accent" data-action="save" ?pending=${busy} ?disabled=${!busy && !this.#ready(account)} @click=${(event2) => this.#send(event2)}>${this.#saveLabel(account)}</swc-button>
@@ -44204,11 +44240,11 @@ function closure(found, source) {
   }
   return used;
 }
-function args(value, start) {
+function args(value, start2) {
   const parts2 = [];
   let depth = 0;
-  let from = start;
-  let at = start;
+  let from = start2;
+  let at = start2;
   for (; at < value.length; at++) {
     const char = value[at];
     if (char === "(") depth++;
@@ -53592,14 +53628,14 @@ function splitToken(token2, offsets) {
   return tokens;
 }
 function findFirstBreakpointAfter(breakpoints, offset3) {
-  let start = 0;
+  let start2 = 0;
   let end = breakpoints.length;
-  while (start < end) {
-    const middle = start + (end - start >> 1);
-    if (breakpoints[middle] <= offset3) start = middle + 1;
+  while (start2 < end) {
+    const middle = start2 + (end - start2 >> 1);
+    if (breakpoints[middle] <= offset3) start2 = middle + 1;
     else end = middle;
   }
-  return start;
+  return start2;
 }
 function splitTokens(tokens, breakpoints) {
   const sorted = [...breakpoints instanceof Set ? breakpoints : new Set(breakpoints)].sort((a23, b13) => a23 - b13);
@@ -53607,11 +53643,11 @@ function splitTokens(tokens, breakpoints) {
   return tokens.map((line) => {
     return line.flatMap((token2) => {
       const tokenEnd = token2.offset + token2.content.length;
-      const start = findFirstBreakpointAfter(sorted, token2.offset);
-      let end = start;
+      const start2 = findFirstBreakpointAfter(sorted, token2.offset);
+      let end = start2;
       while (end < sorted.length && sorted[end] < tokenEnd) end++;
-      if (start === end) return token2;
-      const breakpointsInToken = sorted.slice(start, end);
+      if (start2 === end) return token2;
+      const breakpointsInToken = sorted.slice(start2, end);
       for (let index = 0; index < breakpointsInToken.length; index++) breakpointsInToken[index] -= token2.offset;
       return splitToken(token2, breakpointsInToken);
     });
@@ -53717,17 +53753,17 @@ function transformerDecorations() {
       const ctx = getContext(this);
       const lines = [...codeEl.children].filter((i26) => i26.type === "element" && i26.tagName === "span");
       if (lines.length !== ctx.converter.lines.length) throw new ShikiError2(`Number of lines in code element (${lines.length}) does not match the number of lines in the source (${ctx.converter.lines.length}). Failed to apply decorations.`);
-      function applyLineSection(line, start, end, decoration) {
+      function applyLineSection(line, start2, end, decoration) {
         const lineEl = lines[line];
         let text2 = "";
         let startIndex = -1;
         let endIndex = -1;
-        if (start === 0) startIndex = 0;
+        if (start2 === 0) startIndex = 0;
         if (end === 0) endIndex = 0;
         if (end === Number.POSITIVE_INFINITY) endIndex = lineEl.children.length;
         if (startIndex === -1 || endIndex === -1) for (let i26 = 0; i26 < lineEl.children.length; i26++) {
           text2 += stringify3(lineEl.children[i26]);
-          if (startIndex === -1 && text2.length === start) startIndex = i26 + 1;
+          if (startIndex === -1 && text2.length === start2) startIndex = i26 + 1;
           if (endIndex === -1 && text2.length === end) endIndex = i26 + 1;
         }
         if (startIndex === -1) throw new ShikiError2(`Failed to find start index for decoration ${JSON.stringify(decoration.start)}`);
@@ -53765,11 +53801,11 @@ function transformerDecorations() {
       const lineApplies = [];
       const sorted = ctx.decorations.sort((a23, b13) => b13.start.offset - a23.start.offset || a23.end.offset - b13.end.offset);
       for (const decoration of sorted) {
-        const { start, end } = decoration;
-        if (start.line === end.line) applyLineSection(start.line, start.character, end.character, decoration);
-        else if (start.line < end.line) {
-          applyLineSection(start.line, start.character, Number.POSITIVE_INFINITY, decoration);
-          for (let i26 = start.line + 1; i26 < end.line; i26++) lineApplies.unshift(() => applyLine(i26, decoration));
+        const { start: start2, end } = decoration;
+        if (start2.line === end.line) applyLineSection(start2.line, start2.character, end.character, decoration);
+        else if (start2.line < end.line) {
+          applyLineSection(start2.line, start2.character, Number.POSITIVE_INFINITY, decoration);
+          for (let i26 = start2.line + 1; i26 < end.line; i26++) lineApplies.unshift(() => applyLine(i26, decoration));
           applyLineSection(end.line, 0, end.character, decoration);
         }
       }
@@ -56255,9 +56291,9 @@ var PosixClassMap = /* @__PURE__ */ new Map([
   ["word", r39`[\p{Alpha}\p{M}\p{Nd}\p{Pc}]`],
   ["xdigit", r39`\p{AHex}`]
 ]);
-function range(start, end) {
+function range(start2, end) {
   const range22 = [];
-  for (let i26 = start; i26 <= end; i26++) {
+  for (let i26 = start2; i26 <= end; i26++) {
     range22.push(i26);
   }
   return range22;
@@ -56266,8 +56302,8 @@ function titleEntry(codePoint) {
   const char = cp(codePoint);
   return [char.toLowerCase(), char];
 }
-function titleRange(start, end) {
-  return range(start, end).map((codePoint) => titleEntry(codePoint));
+function titleRange(start2, end) {
+  return range(start2, end).map((codePoint) => titleEntry(codePoint));
 }
 var UnicodePropertiesWithSpecificCase = /* @__PURE__ */ new Set([
   "Lower",
@@ -57497,15 +57533,15 @@ function getCharEscape(codePoint, { escDigit, inCharClass, useFlagV }) {
 function getCodePointRangesFromChars(chars) {
   const codePoints = chars.map((char) => char.codePointAt(0)).sort((a23, b13) => a23 - b13);
   const values = [];
-  let start = null;
+  let start2 = null;
   for (let i26 = 0; i26 < codePoints.length; i26++) {
     if (codePoints[i26 + 1] === codePoints[i26] + 1) {
-      start ??= codePoints[i26];
-    } else if (start === null) {
+      start2 ??= codePoints[i26];
+    } else if (start2 === null) {
       values.push(codePoints[i26]);
     } else {
-      values.push([start, codePoints[i26]]);
-      start = null;
+      values.push([start2, codePoints[i26]]);
+      start2 = null;
     }
   }
   return values;
@@ -59149,7 +59185,7 @@ var InteractionManager = class {
     return range3 == null ? void 0 : this.selectionEnds(range3);
   }
   selectionEnds(range3) {
-    const start = {
+    const start2 = {
       lineNumber: range3.start,
       side: range3.side
     };
@@ -59157,14 +59193,14 @@ var InteractionManager = class {
       lineNumber: range3.end,
       side: range3.endSide ?? range3.side
     };
-    const startIndex = this.selectionPointRowIndex(start);
+    const startIndex = this.selectionPointRowIndex(start2);
     const endIndex = this.selectionPointRowIndex(end);
     if (startIndex == null || endIndex == null) return;
     return startIndex > endIndex ? {
       top: end,
-      bottom: start
+      bottom: start2
     } : {
-      top: start,
+      top: start2,
       bottom: end
     };
   }
@@ -59482,9 +59518,9 @@ var InteractionManager = class {
   buildSelectedLineRange(anchor, current) {
     return this.buildSelectionRange(anchor.lineNumber, current.lineNumber, anchor.side, current.side);
   }
-  buildSelectionRange(start, end, side, endSide) {
+  buildSelectionRange(start2, end, side, endSide) {
     return {
-      start,
+      start: start2,
       end,
       ...side != null ? { side } : {},
       ...side !== endSide && endSide != null ? { endSide } : {}
@@ -61069,9 +61105,9 @@ function computeLineOffsets(contents) {
 function linesFromFileContents(contents) {
   const offsets = computeLineOffsets(contents);
   return Array.from({ length: offsets.length }, (_9, i26) => {
-    const start = offsets[i26];
+    const start2 = offsets[i26];
     const end = offsets[i26 + 1] ?? contents.length;
-    return contents.slice(start, end);
+    return contents.slice(start2, end);
   });
 }
 
@@ -63360,11 +63396,11 @@ function cloneFileDiffMetadata(fileDiff) {
 }
 
 // node_modules/@pierre/diffs/dist/utils/getHunkSideBoundaries.js
-function getHunkSideStartBoundary(start, count2) {
-  return start - (count2 === 0 ? 0 : 1);
+function getHunkSideStartBoundary(start2, count2) {
+  return start2 - (count2 === 0 ? 0 : 1);
 }
-function getHunkSideEndBoundary(start, count2) {
-  return getHunkSideStartBoundary(start, count2) + count2;
+function getHunkSideEndBoundary(start2, count2) {
+  return getHunkSideStartBoundary(start2, count2) + count2;
 }
 
 // node_modules/@pierre/diffs/dist/utils/composeCacheKey.js
@@ -65283,12 +65319,12 @@ function getNearestRenderableAdditionLine({ fileDiff, lineNumber, direction, exp
   }
   if (lineNumber >= modeledEnd) return lineNumber;
   if (direction === "down") {
-    for (const [start, end] of ranges) if (end > lineNumber) return Math.max(start, lineNumber);
+    for (const [start2, end] of ranges) if (end > lineNumber) return Math.max(start2, lineNumber);
     return;
   }
   for (let index = ranges.length - 1; index >= 0; index--) {
-    const [start, end] = ranges[index];
-    if (start <= lineNumber) return Math.min(end - 1, lineNumber);
+    const [start2, end] = ranges[index];
+    if (start2 <= lineNumber) return Math.min(end - 1, lineNumber);
   }
 }
 
@@ -65651,21 +65687,21 @@ function getContextLineIterationBounds(state2, count2, diffStyle) {
   if (!state2.isWindowedHighlight || count2 <= 0) return [0, count2];
   const ranges = [];
   function pushRange(currentCount) {
-    const start2 = Math.max(0, state2.viewportStart - currentCount);
+    const start3 = Math.max(0, state2.viewportStart - currentCount);
     const end2 = Math.min(count2, state2.viewportEnd - currentCount);
-    if (end2 > start2) ranges.push([start2, end2]);
+    if (end2 > start3) ranges.push([start3, end2]);
   }
   if (diffStyle !== "split") pushRange(state2.unifiedCount);
   if (diffStyle !== "unified") pushRange(state2.splitCount);
   if (ranges.length === 0) return [0, 0];
-  let start = ranges[0][0];
+  let start2 = ranges[0][0];
   let end = ranges[0][1];
   for (let index = 1; index < ranges.length; index++) {
     const range3 = ranges[index];
-    start = Math.min(start, range3[0]);
+    start2 = Math.min(start2, range3[0]);
     end = Math.max(end, range3[1]);
   }
-  return [start, end];
+  return [start2, end];
 }
 function walkContextLines(state2, count2, diffStyle, callback, onSkippedStart, shouldBreak) {
   const [startIndex, endIndex] = getContextLineIterationBounds(state2, count2, diffStyle);
@@ -65693,10 +65729,10 @@ function getChangeIterationRanges(state2, content, diffStyle) {
   const useSplit = diffStyle !== "unified";
   const iterationSpace = diffStyle === "unified" ? "unified" : "split";
   const iterationRanges = [];
-  function getVisibleRange(start, count2) {
-    if (start + count2 <= state2.viewportStart || start >= state2.viewportEnd) return;
-    const visibleStart = Math.max(0, state2.viewportStart - start);
-    const visibleEnd = Math.min(count2, state2.viewportEnd - start);
+  function getVisibleRange(start2, count2) {
+    if (start2 + count2 <= state2.viewportStart || start2 >= state2.viewportEnd) return;
+    const visibleStart = Math.max(0, state2.viewportStart - start2);
+    const visibleEnd = Math.min(count2, state2.viewportEnd - start2);
     return visibleEnd > visibleStart ? [visibleStart, visibleEnd] : void 0;
   }
   function mapRangeToIteration(range3, kind) {
@@ -65705,8 +65741,8 @@ function getChangeIterationRanges(state2, content, diffStyle) {
   }
   function pushRange(range3, kind) {
     if (range3 == null) return;
-    const [start, end] = mapRangeToIteration(range3, kind);
-    if (end > start) iterationRanges.push([start, end]);
+    const [start2, end] = mapRangeToIteration(range3, kind);
+    if (end > start2) iterationRanges.push([start2, end]);
   }
   if (useUnified) {
     pushRange(getVisibleRange(state2.unifiedCount, content.deletions), "deletions");
@@ -65719,10 +65755,10 @@ function getChangeIterationRanges(state2, content, diffStyle) {
   if (iterationRanges.length === 0) return iterationRanges;
   iterationRanges.sort((a23, b13) => a23[0] - b13[0]);
   const merged2 = [iterationRanges[0]];
-  for (const [start, end] of iterationRanges.slice(1)) {
+  for (const [start2, end] of iterationRanges.slice(1)) {
     const last = merged2[merged2.length - 1];
-    if (start <= last[1]) last[1] = Math.max(last[1], end);
-    else merged2.push([start, end]);
+    if (start2 <= last[1]) last[1] = Math.max(last[1], end);
+    else merged2.push([start2, end]);
   }
   return merged2;
 }
@@ -66306,17 +66342,17 @@ function normalizeEditorLines(lines) {
 }
 function findDivergenceCore(deletionLines, additionLines) {
   const maxStart = Math.min(deletionLines.length, additionLines.length);
-  let start = 0;
-  while (start < maxStart && deletionLines[start] === additionLines[start]) start++;
+  let start2 = 0;
+  while (start2 < maxStart && deletionLines[start2] === additionLines[start2]) start2++;
   let deletionEnd = deletionLines.length;
   let additionEnd = additionLines.length;
-  while (deletionEnd > start && additionEnd > start && deletionLines[deletionEnd - 1] === additionLines[additionEnd - 1]) {
+  while (deletionEnd > start2 && additionEnd > start2 && deletionLines[deletionEnd - 1] === additionLines[additionEnd - 1]) {
     deletionEnd--;
     additionEnd--;
   }
-  if (start === deletionEnd && start === additionEnd) return;
+  if (start2 === deletionEnd && start2 === additionEnd) return;
   return {
-    start,
+    start: start2,
     deletionEnd,
     additionEnd
   };
@@ -66354,8 +66390,8 @@ function applySessionChangedLines(diff, changedAdditionLineIndexes, parseDiffOpt
       hunkIndex++;
     }
     const hunk = hunks[hunkIndex];
-    const start = hunk == null ? void 0 : getHunkAdditionStart(hunk);
-    if (start == null || line < start || regionIndex != null && regionIndex !== hunkIndex) return rebuildSessionHunks(diff, parseDiffOptions, getPreviousAdditionLine);
+    const start2 = hunk == null ? void 0 : getHunkAdditionStart(hunk);
+    if (start2 == null || line < start2 || regionIndex != null && regionIndex !== hunkIndex) return rebuildSessionHunks(diff, parseDiffOptions, getPreviousAdditionLine);
     regionIndex = hunkIndex;
   }
   if (regionIndex == null) return;
@@ -66451,10 +66487,10 @@ function rebuildExpansionFromAnchors(diff, anchors) {
     if (gapEnd <= gapStart) return;
     let fromStart = 0;
     let fromEnd = 0;
-    for (const [start, end] of anchors) {
-      if (end <= gapStart || start >= gapEnd) continue;
-      if (start <= gapStart) fromStart = Math.max(fromStart, Math.min(end, gapEnd) - gapStart);
-      if (end >= gapEnd) fromEnd = Math.max(fromEnd, gapEnd - Math.max(start, gapStart));
+    for (const [start2, end] of anchors) {
+      if (end <= gapStart || start2 >= gapEnd) continue;
+      if (start2 <= gapStart) fromStart = Math.max(fromStart, Math.min(end, gapEnd) - gapStart);
+      if (end >= gapEnd) fromEnd = Math.max(fromEnd, gapEnd - Math.max(start2, gapStart));
     }
     if (fromStart > 0 || fromEnd > 0) rebuilt.set(key2, {
       fromStart,
@@ -71425,7 +71461,7 @@ var Splitview = class {
         for (const item2 of this.viewItems) item2.enabled = false;
         const doc = (_sash$ownerDocument = sash.ownerDocument) !== null && _sash$ownerDocument !== void 0 ? _sash$ownerDocument : document;
         const iframes = disableIframePointEvents(doc);
-        const start = this._orientation === "HORIZONTAL" ? event2.clientX : event2.clientY;
+        const start2 = this._orientation === "HORIZONTAL" ? event2.clientX : event2.clientY;
         const sashIndex = firstIndex(this.sashes, (s19) => s19.container === sash);
         const sizes = this.viewItems.map((x7) => x7.size);
         let snapBefore;
@@ -71459,7 +71495,7 @@ var Splitview = class {
           };
         }
         const onPointerMove = (event3) => {
-          const delta = (this._orientation === "HORIZONTAL" ? event3.clientX : event3.clientY) - start;
+          const delta = (this._orientation === "HORIZONTAL" ? event3.clientX : event3.clientY) - start2;
           this.resize(sashIndex, delta, sizes, void 0, void 0, minDelta, maxDelta, snapBefore, snapAfter);
           this.distributeEmptySpace();
           this.layoutViews();
@@ -76057,11 +76093,11 @@ var BaseTabGroupIndicator = class {
   */
   trackUnderlines() {
     if (this._rafId !== null) cancelAnimationFrame(this._rafId);
-    const start = performance.now();
+    const start2 = performance.now();
     const duration = 250;
     const tick = () => {
       this._positionUnderlinesSync();
-      if (performance.now() - start < duration) this._rafId = requestAnimationFrame(tick);
+      if (performance.now() - start2 < duration) this._rafId = requestAnimationFrame(tick);
       else this._rafId = null;
     };
     this._rafId = requestAnimationFrame(tick);
@@ -78326,12 +78362,12 @@ var Tabs = class extends CompositeDisposable {
   _scrollTabIntoView(element2, isVertical) {
     const parentElement = element2.parentElement;
     if (!parentElement) return;
-    const start = isVertical ? element2.offsetTop : element2.offsetLeft;
+    const start2 = isVertical ? element2.offsetTop : element2.offsetLeft;
     const size4 = isVertical ? element2.offsetHeight : element2.offsetWidth;
     const scrollStart = isVertical ? parentElement.scrollTop : parentElement.scrollLeft;
     const clientSize = isVertical ? parentElement.clientHeight : parentElement.clientWidth;
-    if (start < scrollStart || start + size4 > scrollStart + clientSize) if (isVertical) parentElement.scrollTop = start;
-    else parentElement.scrollLeft = start;
+    if (start2 < scrollStart || start2 + size4 > scrollStart + clientSize) if (isVertical) parentElement.scrollTop = start2;
+    else parentElement.scrollLeft = start2;
   }
   /**
   * Activate a tab in response to a plain (non-shift) left pointerdown.