monaco-editor 0.58.0-dev-20261103 → 0.58.0-dev-20261105

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Monaco Editor Changelog
 
+## [0.57.1]
+
+### Breaking Changes
+
+- Markdown rendered by the editor (hovers, suggestion details, parameter hints, inline completion warnings, editor messages) no longer loads remote images by default. `data:` images are still shown. Use the new `markdownImages.allowedOrigins` editor option to allow images from specific origins (for example `['https://img.shields.io']`), or set it to `true` to allow all remote images as before.
+
+### Updates
+
+- Updates the editor core to VS Code commit `3bc96745d6414f97cd0c09e753ecf698b7829101`, validated in `0.58.0-dev-20261103`.
+- Updates bundled DOMPurify from 3.4.15 to 3.4.17.
+
 ## [0.57.0]
 
 ### New Features and APIs

package/dev/vs/assets/{css.worker-BXibjW7G.js → css.worker-C3Fca00n.js}

@@ -600,6 +600,7 @@
   let _locale = void 0;
   let _language = LANGUAGE_DEFAULT;
   let _platformLocale = LANGUAGE_DEFAULT;
+  let _regionalLocale = LANGUAGE_DEFAULT;
   let _translationsConfigFile = void 0;
   let _userAgent = void 0;
   const $globalThis = globalThis;
@@ -626,6 +627,7 @@
         const nlsConfig = JSON.parse(rawNlsConfig);
         _locale = nlsConfig.userLocale;
         _platformLocale = nlsConfig.osLocale;
+        _regionalLocale = nlsConfig.regionalLocale ?? nlsConfig.osLocale;
         _language = nlsConfig.resolvedLanguage || LANGUAGE_DEFAULT;
         _translationsConfigFile = nlsConfig.languagePack?.translationsConfigFile;
       } catch (e) {
@@ -644,6 +646,7 @@
     _language = getNLSLanguage() || LANGUAGE_DEFAULT;
     _locale = navigator.language.toLowerCase();
     _platformLocale = _locale;
+    _regionalLocale = _locale;
   } else {
     console.error("Unable to resolve platform.");
   }
@@ -12153,14 +12156,17 @@
       this.myersDiffingAlgorithm = new MyersDiffAlgorithm();
     }
     computeDiff(originalLines, modifiedLines, options) {
+      return this._computeDiff(originalLines, modifiedLines, options);
+    }
+    _computeDiff(originalLines, modifiedLines, options, rawChanges) {
       if (originalLines.length <= 1 && equals(originalLines, modifiedLines, (a2, b) => a2 === b)) {
         return new LinesDiff([], [], false);
       }
       if (originalLines.length === 1 && originalLines[0].length === 0 || modifiedLines.length === 1 && modifiedLines[0].length === 0) {
+        const rangeMapping = new RangeMapping(new Range$1(1, 1, originalLines.length, originalLines[originalLines.length - 1].length + 1), new Range$1(1, 1, modifiedLines.length, modifiedLines[modifiedLines.length - 1].length + 1));
+        rawChanges?.push(rangeMapping);
         return new LinesDiff([
-          new DetailedLineRangeMapping(new LineRange(1, originalLines.length + 1), new LineRange(1, modifiedLines.length + 1), [
-            new RangeMapping(new Range$1(1, 1, originalLines.length, originalLines[originalLines.length - 1].length + 1), new Range$1(1, 1, modifiedLines.length, modifiedLines[modifiedLines.length - 1].length + 1))
-          ])
+          new DetailedLineRangeMapping(new LineRange(1, originalLines.length + 1), new LineRange(1, modifiedLines.length + 1), [rangeMapping])
         ], [], false);
       }
       const timeout = options.maxComputationTimeMs === 0 ? InfiniteTimeout.instance : new DateTimeout(options.maxComputationTimeMs);
@@ -12197,7 +12203,7 @@
           const seq1Offset = seq1LastStart + i;
           const seq2Offset = seq2LastStart + i;
           if (originalLines[seq1Offset] !== modifiedLines[seq2Offset]) {
-            const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(new OffsetRange(seq1Offset, seq1Offset + 1), new OffsetRange(seq2Offset, seq2Offset + 1)), timeout, considerWhitespaceChanges, options);
+            const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(new OffsetRange(seq1Offset, seq1Offset + 1), new OffsetRange(seq2Offset, seq2Offset + 1)), timeout, considerWhitespaceChanges, options, rawChanges);
             for (const a2 of characterDiffs.mappings) {
               alignments.push(a2);
             }
@@ -12215,7 +12221,7 @@
         scanForWhitespaceChanges(equalLinesCount);
         seq1LastStart = diff.seq1Range.endExclusive;
         seq2LastStart = diff.seq2Range.endExclusive;
-        const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options);
+        const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options, rawChanges);
         if (characterDiffs.hitTimeout) {
           hitTimeout = true;
         }
@@ -12278,12 +12284,21 @@
       });
       return movesWithDiffs;
     }
-    refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options) {
+    refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options, rawChanges) {
       const lineRangeMapping = toLineRangeMapping(diff);
       const rangeMapping = lineRangeMapping.toRangeMapping2(originalLines, modifiedLines);
       const slice1 = new LinesSliceCharSequence(originalLines, rangeMapping.originalRange, considerWhitespaceChanges);
       const slice2 = new LinesSliceCharSequence(modifiedLines, rangeMapping.modifiedRange, considerWhitespaceChanges);
-      const diffResult = slice1.length + slice2.length < 500 ? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout) : this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
+      const useDynamicProgramming = slice1.length + slice2.length < 500;
+      const diffResult = useDynamicProgramming ? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout) : this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
+      let hitTimeout = diffResult.hitTimeout;
+      if (rawChanges) {
+        const rawResult = useDynamicProgramming && !hitTimeout ? this.myersDiffingAlgorithm.compute(slice1, slice2, timeout) : diffResult;
+        hitTimeout ||= rawResult.hitTimeout;
+        for (const change of rawResult.diffs) {
+          rawChanges.push(new RangeMapping(slice1.translateRange(change.seq1Range), slice2.translateRange(change.seq2Range)));
+        }
+      }
       let diffs = diffResult.diffs;
       diffs = optimizeSequenceDiffs(slice1, slice2, diffs);
       diffs = extendDiffsToEntireWordIfAppropriate(slice1, slice2, diffs, (seq, idx) => seq.findWordContaining(idx));
@@ -12295,7 +12310,7 @@
       const result = diffs.map((d) => new RangeMapping(slice1.translateRange(d.seq1Range), slice2.translateRange(d.seq2Range)));
       return {
         mappings: result,
-        hitTimeout: diffResult.hitTimeout
+        hitTimeout
       };
     }
   }
@@ -12862,8 +12877,7 @@
       const originalText = new StringText(originalLines.join("\n"));
       const modifiedText = new StringText(modifiedLines.join("\n"));
       const result = this._computer.computeDiff(originalText.value, modifiedText.value, {
-        ignoreTrimWhitespace: false,
-        // TODO: forward `maxComputationTimeMs` after updating @vscode/diff. The wasm build of the pinned version panics when measuring time.
+        maxComputationTimeMs: options.maxComputationTimeMs,
         computeMoves: options.computeMoves,
         extendToSubwords: options.extendToSubwords
       });
@@ -12875,7 +12889,7 @@
         const originalRange = new OffsetRange(r.range.start, r.range.endExclusive);
         const modifiedRange = new OffsetRange(r.range.start + delta, r.range.start + delta + r.newText.length);
         delta += r.newText.length - originalRange.length;
-        if (options.ignoreTrimWhitespace && isInTrimWhitespace(originalText.value, originalRange) && isInTrimWhitespace(modifiedText.value, modifiedRange)) {
+        if (options.ignoreTrimWhitespace && r.data.isTrimWhitespaceChange) {
           continue;
         }
         rangeMappings.push(new RangeMapping(originalTransformer.getRange(originalRange), modifiedTransformer.getRange(modifiedRange)));
@@ -12896,16 +12910,6 @@
       return new LinesDiff(changes, moves, result.hitTimeout);
     }
   }
-  const whitespaceWithoutLineBreak = /^[^\S\n]*$/;
-  function isInTrimWhitespace(text, range) {
-    if (!whitespaceWithoutLineBreak.test(range.substring(text))) {
-      return false;
-    }
-    const lineStart = range.start === 0 ? 0 : text.lastIndexOf("\n", range.start - 1) + 1;
-    const nextLineBreak = text.indexOf("\n", range.endExclusive);
-    const lineEnd = nextLineBreak === -1 ? text.length : nextLineBreak;
-    return whitespaceWithoutLineBreak.test(text.substring(lineStart, range.start)) || whitespaceWithoutLineBreak.test(text.substring(range.endExclusive, lineEnd));
-  }
   const linesDiffComputers = {
     getLegacy: () => new LegacyLinesDiffComputer(),
     getDefault: () => new DefaultLinesDiffComputer(),

package/dev/vs/assets/{editor.worker-rm-mUaEO.js → editor.worker-CMQdN7Gz.js}

@@ -601,6 +601,7 @@
   let _locale = void 0;
   let _language = LANGUAGE_DEFAULT;
   let _platformLocale = LANGUAGE_DEFAULT;
+  let _regionalLocale = LANGUAGE_DEFAULT;
   let _translationsConfigFile = void 0;
   let _userAgent = void 0;
   const $globalThis = globalThis;
@@ -627,6 +628,7 @@
         const nlsConfig = JSON.parse(rawNlsConfig);
         _locale = nlsConfig.userLocale;
         _platformLocale = nlsConfig.osLocale;
+        _regionalLocale = nlsConfig.regionalLocale ?? nlsConfig.osLocale;
         _language = nlsConfig.resolvedLanguage || LANGUAGE_DEFAULT;
         _translationsConfigFile = nlsConfig.languagePack?.translationsConfigFile;
       } catch (e) {
@@ -645,6 +647,7 @@
     _language = getNLSLanguage() || LANGUAGE_DEFAULT;
     _locale = navigator.language.toLowerCase();
     _platformLocale = _locale;
+    _regionalLocale = _locale;
   } else {
     console.error("Unable to resolve platform.");
   }
@@ -12158,14 +12161,17 @@
       this.myersDiffingAlgorithm = new MyersDiffAlgorithm();
     }
     computeDiff(originalLines, modifiedLines, options) {
+      return this._computeDiff(originalLines, modifiedLines, options);
+    }
+    _computeDiff(originalLines, modifiedLines, options, rawChanges) {
       if (originalLines.length <= 1 && equals(originalLines, modifiedLines, (a, b) => a === b)) {
         return new LinesDiff([], [], false);
       }
       if (originalLines.length === 1 && originalLines[0].length === 0 || modifiedLines.length === 1 && modifiedLines[0].length === 0) {
+        const rangeMapping = new RangeMapping(new Range(1, 1, originalLines.length, originalLines[originalLines.length - 1].length + 1), new Range(1, 1, modifiedLines.length, modifiedLines[modifiedLines.length - 1].length + 1));
+        rawChanges?.push(rangeMapping);
         return new LinesDiff([
-          new DetailedLineRangeMapping(new LineRange(1, originalLines.length + 1), new LineRange(1, modifiedLines.length + 1), [
-            new RangeMapping(new Range(1, 1, originalLines.length, originalLines[originalLines.length - 1].length + 1), new Range(1, 1, modifiedLines.length, modifiedLines[modifiedLines.length - 1].length + 1))
-          ])
+          new DetailedLineRangeMapping(new LineRange(1, originalLines.length + 1), new LineRange(1, modifiedLines.length + 1), [rangeMapping])
         ], [], false);
       }
       const timeout = options.maxComputationTimeMs === 0 ? InfiniteTimeout.instance : new DateTimeout(options.maxComputationTimeMs);
@@ -12202,7 +12208,7 @@
           const seq1Offset = seq1LastStart + i;
           const seq2Offset = seq2LastStart + i;
           if (originalLines[seq1Offset] !== modifiedLines[seq2Offset]) {
-            const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(new OffsetRange(seq1Offset, seq1Offset + 1), new OffsetRange(seq2Offset, seq2Offset + 1)), timeout, considerWhitespaceChanges, options);
+            const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(new OffsetRange(seq1Offset, seq1Offset + 1), new OffsetRange(seq2Offset, seq2Offset + 1)), timeout, considerWhitespaceChanges, options, rawChanges);
             for (const a of characterDiffs.mappings) {
               alignments.push(a);
             }
@@ -12220,7 +12226,7 @@
         scanForWhitespaceChanges(equalLinesCount);
         seq1LastStart = diff.seq1Range.endExclusive;
         seq2LastStart = diff.seq2Range.endExclusive;
-        const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options);
+        const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options, rawChanges);
         if (characterDiffs.hitTimeout) {
           hitTimeout = true;
         }
@@ -12283,12 +12289,21 @@
       });
       return movesWithDiffs;
     }
-    refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options) {
+    refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options, rawChanges) {
       const lineRangeMapping = toLineRangeMapping(diff);
       const rangeMapping = lineRangeMapping.toRangeMapping2(originalLines, modifiedLines);
       const slice1 = new LinesSliceCharSequence(originalLines, rangeMapping.originalRange, considerWhitespaceChanges);
       const slice2 = new LinesSliceCharSequence(modifiedLines, rangeMapping.modifiedRange, considerWhitespaceChanges);
-      const diffResult = slice1.length + slice2.length < 500 ? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout) : this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
+      const useDynamicProgramming = slice1.length + slice2.length < 500;
+      const diffResult = useDynamicProgramming ? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout) : this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
+      let hitTimeout = diffResult.hitTimeout;
+      if (rawChanges) {
+        const rawResult = useDynamicProgramming && !hitTimeout ? this.myersDiffingAlgorithm.compute(slice1, slice2, timeout) : diffResult;
+        hitTimeout ||= rawResult.hitTimeout;
+        for (const change of rawResult.diffs) {
+          rawChanges.push(new RangeMapping(slice1.translateRange(change.seq1Range), slice2.translateRange(change.seq2Range)));
+        }
+      }
       let diffs = diffResult.diffs;
       diffs = optimizeSequenceDiffs(slice1, slice2, diffs);
       diffs = extendDiffsToEntireWordIfAppropriate(slice1, slice2, diffs, (seq, idx) => seq.findWordContaining(idx));
@@ -12300,7 +12315,7 @@
       const result = diffs.map((d) => new RangeMapping(slice1.translateRange(d.seq1Range), slice2.translateRange(d.seq2Range)));
       return {
         mappings: result,
-        hitTimeout: diffResult.hitTimeout
+        hitTimeout
       };
     }
   }
@@ -12867,8 +12882,7 @@
       const originalText = new StringText(originalLines.join("\n"));
       const modifiedText = new StringText(modifiedLines.join("\n"));
       const result = this._computer.computeDiff(originalText.value, modifiedText.value, {
-        ignoreTrimWhitespace: false,
-        // TODO: forward `maxComputationTimeMs` after updating @vscode/diff. The wasm build of the pinned version panics when measuring time.
+        maxComputationTimeMs: options.maxComputationTimeMs,
         computeMoves: options.computeMoves,
         extendToSubwords: options.extendToSubwords
       });
@@ -12880,7 +12894,7 @@
         const originalRange = new OffsetRange(r.range.start, r.range.endExclusive);
         const modifiedRange = new OffsetRange(r.range.start + delta, r.range.start + delta + r.newText.length);
         delta += r.newText.length - originalRange.length;
-        if (options.ignoreTrimWhitespace && isInTrimWhitespace(originalText.value, originalRange) && isInTrimWhitespace(modifiedText.value, modifiedRange)) {
+        if (options.ignoreTrimWhitespace && r.data.isTrimWhitespaceChange) {
           continue;
         }
         rangeMappings.push(new RangeMapping(originalTransformer.getRange(originalRange), modifiedTransformer.getRange(modifiedRange)));
@@ -12901,16 +12915,6 @@
       return new LinesDiff(changes, moves, result.hitTimeout);
     }
   }
-  const whitespaceWithoutLineBreak = /^[^\S\n]*$/;
-  function isInTrimWhitespace(text, range) {
-    if (!whitespaceWithoutLineBreak.test(range.substring(text))) {
-      return false;
-    }
-    const lineStart = range.start === 0 ? 0 : text.lastIndexOf("\n", range.start - 1) + 1;
-    const nextLineBreak = text.indexOf("\n", range.endExclusive);
-    const lineEnd = nextLineBreak === -1 ? text.length : nextLineBreak;
-    return whitespaceWithoutLineBreak.test(text.substring(lineStart, range.start)) || whitespaceWithoutLineBreak.test(text.substring(range.endExclusive, lineEnd));
-  }
   const linesDiffComputers = {
     getLegacy: () => new LegacyLinesDiffComputer(),
     getDefault: () => new DefaultLinesDiffComputer(),

package/dev/vs/assets/{editorWebWorkerMain-BYRxwar0.js → editorWebWorkerMain-CZFKV3Sq.js}

@@ -601,6 +601,7 @@
   let _locale = void 0;
   let _language = LANGUAGE_DEFAULT;
   let _platformLocale = LANGUAGE_DEFAULT;
+  let _regionalLocale = LANGUAGE_DEFAULT;
   let _translationsConfigFile = void 0;
   let _userAgent = void 0;
   const $globalThis = globalThis;
@@ -627,6 +628,7 @@
         const nlsConfig = JSON.parse(rawNlsConfig);
         _locale = nlsConfig.userLocale;
         _platformLocale = nlsConfig.osLocale;
+        _regionalLocale = nlsConfig.regionalLocale ?? nlsConfig.osLocale;
         _language = nlsConfig.resolvedLanguage || LANGUAGE_DEFAULT;
         _translationsConfigFile = nlsConfig.languagePack?.translationsConfigFile;
       } catch (e) {
@@ -645,6 +647,7 @@
     _language = getNLSLanguage() || LANGUAGE_DEFAULT;
     _locale = navigator.language.toLowerCase();
     _platformLocale = _locale;
+    _regionalLocale = _locale;
   } else {
     console.error("Unable to resolve platform.");
   }
@@ -12165,14 +12168,17 @@
       this.myersDiffingAlgorithm = new MyersDiffAlgorithm();
     }
     computeDiff(originalLines, modifiedLines, options) {
+      return this._computeDiff(originalLines, modifiedLines, options);
+    }
+    _computeDiff(originalLines, modifiedLines, options, rawChanges) {
       if (originalLines.length <= 1 && equals(originalLines, modifiedLines, (a, b) => a === b)) {
         return new LinesDiff([], [], false);
       }
       if (originalLines.length === 1 && originalLines[0].length === 0 || modifiedLines.length === 1 && modifiedLines[0].length === 0) {
+        const rangeMapping = new RangeMapping(new Range(1, 1, originalLines.length, originalLines[originalLines.length - 1].length + 1), new Range(1, 1, modifiedLines.length, modifiedLines[modifiedLines.length - 1].length + 1));
+        rawChanges?.push(rangeMapping);
         return new LinesDiff([
-          new DetailedLineRangeMapping(new LineRange(1, originalLines.length + 1), new LineRange(1, modifiedLines.length + 1), [
-            new RangeMapping(new Range(1, 1, originalLines.length, originalLines[originalLines.length - 1].length + 1), new Range(1, 1, modifiedLines.length, modifiedLines[modifiedLines.length - 1].length + 1))
-          ])
+          new DetailedLineRangeMapping(new LineRange(1, originalLines.length + 1), new LineRange(1, modifiedLines.length + 1), [rangeMapping])
         ], [], false);
       }
       const timeout = options.maxComputationTimeMs === 0 ? InfiniteTimeout.instance : new DateTimeout(options.maxComputationTimeMs);
@@ -12209,7 +12215,7 @@
           const seq1Offset = seq1LastStart + i;
           const seq2Offset = seq2LastStart + i;
           if (originalLines[seq1Offset] !== modifiedLines[seq2Offset]) {
-            const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(new OffsetRange(seq1Offset, seq1Offset + 1), new OffsetRange(seq2Offset, seq2Offset + 1)), timeout, considerWhitespaceChanges, options);
+            const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(new OffsetRange(seq1Offset, seq1Offset + 1), new OffsetRange(seq2Offset, seq2Offset + 1)), timeout, considerWhitespaceChanges, options, rawChanges);
             for (const a of characterDiffs.mappings) {
               alignments.push(a);
             }
@@ -12227,7 +12233,7 @@
         scanForWhitespaceChanges(equalLinesCount);
         seq1LastStart = diff.seq1Range.endExclusive;
         seq2LastStart = diff.seq2Range.endExclusive;
-        const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options);
+        const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options, rawChanges);
         if (characterDiffs.hitTimeout) {
           hitTimeout = true;
         }
@@ -12290,12 +12296,21 @@
       });
       return movesWithDiffs;
     }
-    refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options) {
+    refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options, rawChanges) {
       const lineRangeMapping = toLineRangeMapping(diff);
       const rangeMapping = lineRangeMapping.toRangeMapping2(originalLines, modifiedLines);
       const slice1 = new LinesSliceCharSequence(originalLines, rangeMapping.originalRange, considerWhitespaceChanges);
       const slice2 = new LinesSliceCharSequence(modifiedLines, rangeMapping.modifiedRange, considerWhitespaceChanges);
-      const diffResult = slice1.length + slice2.length < 500 ? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout) : this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
+      const useDynamicProgramming = slice1.length + slice2.length < 500;
+      const diffResult = useDynamicProgramming ? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout) : this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
+      let hitTimeout = diffResult.hitTimeout;
+      if (rawChanges) {
+        const rawResult = useDynamicProgramming && !hitTimeout ? this.myersDiffingAlgorithm.compute(slice1, slice2, timeout) : diffResult;
+        hitTimeout ||= rawResult.hitTimeout;
+        for (const change of rawResult.diffs) {
+          rawChanges.push(new RangeMapping(slice1.translateRange(change.seq1Range), slice2.translateRange(change.seq2Range)));
+        }
+      }
       let diffs = diffResult.diffs;
       diffs = optimizeSequenceDiffs(slice1, slice2, diffs);
       diffs = extendDiffsToEntireWordIfAppropriate(slice1, slice2, diffs, (seq, idx) => seq.findWordContaining(idx));
@@ -12307,7 +12322,7 @@
       const result = diffs.map((d) => new RangeMapping(slice1.translateRange(d.seq1Range), slice2.translateRange(d.seq2Range)));
       return {
         mappings: result,
-        hitTimeout: diffResult.hitTimeout
+        hitTimeout
       };
     }
   }
@@ -12874,8 +12889,7 @@
       const originalText = new StringText(originalLines.join("\n"));
       const modifiedText = new StringText(modifiedLines.join("\n"));
       const result = this._computer.computeDiff(originalText.value, modifiedText.value, {
-        ignoreTrimWhitespace: false,
-        // TODO: forward `maxComputationTimeMs` after updating @vscode/diff. The wasm build of the pinned version panics when measuring time.
+        maxComputationTimeMs: options.maxComputationTimeMs,
         computeMoves: options.computeMoves,
         extendToSubwords: options.extendToSubwords
       });
@@ -12887,7 +12901,7 @@
         const originalRange = new OffsetRange(r.range.start, r.range.endExclusive);
         const modifiedRange = new OffsetRange(r.range.start + delta, r.range.start + delta + r.newText.length);
         delta += r.newText.length - originalRange.length;
-        if (options.ignoreTrimWhitespace && isInTrimWhitespace(originalText.value, originalRange) && isInTrimWhitespace(modifiedText.value, modifiedRange)) {
+        if (options.ignoreTrimWhitespace && r.data.isTrimWhitespaceChange) {
           continue;
         }
         rangeMappings.push(new RangeMapping(originalTransformer.getRange(originalRange), modifiedTransformer.getRange(modifiedRange)));
@@ -12908,16 +12922,6 @@
       return new LinesDiff(changes, moves, result.hitTimeout);
     }
   }
-  const whitespaceWithoutLineBreak = /^[^\S\n]*$/;
-  function isInTrimWhitespace(text, range) {
-    if (!whitespaceWithoutLineBreak.test(range.substring(text))) {
-      return false;
-    }
-    const lineStart = range.start === 0 ? 0 : text.lastIndexOf("\n", range.start - 1) + 1;
-    const nextLineBreak = text.indexOf("\n", range.endExclusive);
-    const lineEnd = nextLineBreak === -1 ? text.length : nextLineBreak;
-    return whitespaceWithoutLineBreak.test(text.substring(lineStart, range.start)) || whitespaceWithoutLineBreak.test(text.substring(range.endExclusive, lineEnd));
-  }
   const linesDiffComputers = {
     getLegacy: () => new LegacyLinesDiffComputer(),
     getDefault: () => new DefaultLinesDiffComputer(),

package/dev/vs/assets/{html.worker-CrmruGcV.js → html.worker-D6JwdtKY.js}

@@ -600,6 +600,7 @@
   let _locale = void 0;
   let _language = LANGUAGE_DEFAULT;
   let _platformLocale = LANGUAGE_DEFAULT;
+  let _regionalLocale = LANGUAGE_DEFAULT;
   let _translationsConfigFile = void 0;
   let _userAgent = void 0;
   const $globalThis = globalThis;
@@ -626,6 +627,7 @@
         const nlsConfig = JSON.parse(rawNlsConfig);
         _locale = nlsConfig.userLocale;
         _platformLocale = nlsConfig.osLocale;
+        _regionalLocale = nlsConfig.regionalLocale ?? nlsConfig.osLocale;
         _language = nlsConfig.resolvedLanguage || LANGUAGE_DEFAULT;
         _translationsConfigFile = nlsConfig.languagePack?.translationsConfigFile;
       } catch (e) {
@@ -644,6 +646,7 @@
     _language = getNLSLanguage() || LANGUAGE_DEFAULT;
     _locale = navigator.language.toLowerCase();
     _platformLocale = _locale;
+    _regionalLocale = _locale;
   } else {
     console.error("Unable to resolve platform.");
   }
@@ -12153,14 +12156,17 @@
       this.myersDiffingAlgorithm = new MyersDiffAlgorithm();
     }
     computeDiff(originalLines, modifiedLines, options) {
+      return this._computeDiff(originalLines, modifiedLines, options);
+    }
+    _computeDiff(originalLines, modifiedLines, options, rawChanges) {
       if (originalLines.length <= 1 && equals(originalLines, modifiedLines, (a, b) => a === b)) {
         return new LinesDiff([], [], false);
       }
       if (originalLines.length === 1 && originalLines[0].length === 0 || modifiedLines.length === 1 && modifiedLines[0].length === 0) {
+        const rangeMapping = new RangeMapping(new Range$1(1, 1, originalLines.length, originalLines[originalLines.length - 1].length + 1), new Range$1(1, 1, modifiedLines.length, modifiedLines[modifiedLines.length - 1].length + 1));
+        rawChanges?.push(rangeMapping);
         return new LinesDiff([
-          new DetailedLineRangeMapping(new LineRange(1, originalLines.length + 1), new LineRange(1, modifiedLines.length + 1), [
-            new RangeMapping(new Range$1(1, 1, originalLines.length, originalLines[originalLines.length - 1].length + 1), new Range$1(1, 1, modifiedLines.length, modifiedLines[modifiedLines.length - 1].length + 1))
-          ])
+          new DetailedLineRangeMapping(new LineRange(1, originalLines.length + 1), new LineRange(1, modifiedLines.length + 1), [rangeMapping])
         ], [], false);
       }
       const timeout = options.maxComputationTimeMs === 0 ? InfiniteTimeout.instance : new DateTimeout(options.maxComputationTimeMs);
@@ -12197,7 +12203,7 @@
           const seq1Offset = seq1LastStart + i;
           const seq2Offset = seq2LastStart + i;
           if (originalLines[seq1Offset] !== modifiedLines[seq2Offset]) {
-            const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(new OffsetRange(seq1Offset, seq1Offset + 1), new OffsetRange(seq2Offset, seq2Offset + 1)), timeout, considerWhitespaceChanges, options);
+            const characterDiffs = this.refineDiff(originalLines, modifiedLines, new SequenceDiff(new OffsetRange(seq1Offset, seq1Offset + 1), new OffsetRange(seq2Offset, seq2Offset + 1)), timeout, considerWhitespaceChanges, options, rawChanges);
             for (const a of characterDiffs.mappings) {
               alignments.push(a);
             }
@@ -12215,7 +12221,7 @@
         scanForWhitespaceChanges(equalLinesCount);
         seq1LastStart = diff.seq1Range.endExclusive;
         seq2LastStart = diff.seq2Range.endExclusive;
-        const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options);
+        const characterDiffs = this.refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options, rawChanges);
         if (characterDiffs.hitTimeout) {
           hitTimeout = true;
         }
@@ -12278,12 +12284,21 @@
       });
       return movesWithDiffs;
     }
-    refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options) {
+    refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges, options, rawChanges) {
       const lineRangeMapping = toLineRangeMapping(diff);
       const rangeMapping = lineRangeMapping.toRangeMapping2(originalLines, modifiedLines);
       const slice1 = new LinesSliceCharSequence(originalLines, rangeMapping.originalRange, considerWhitespaceChanges);
       const slice2 = new LinesSliceCharSequence(modifiedLines, rangeMapping.modifiedRange, considerWhitespaceChanges);
-      const diffResult = slice1.length + slice2.length < 500 ? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout) : this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
+      const useDynamicProgramming = slice1.length + slice2.length < 500;
+      const diffResult = useDynamicProgramming ? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout) : this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
+      let hitTimeout = diffResult.hitTimeout;
+      if (rawChanges) {
+        const rawResult = useDynamicProgramming && !hitTimeout ? this.myersDiffingAlgorithm.compute(slice1, slice2, timeout) : diffResult;
+        hitTimeout ||= rawResult.hitTimeout;
+        for (const change of rawResult.diffs) {
+          rawChanges.push(new RangeMapping(slice1.translateRange(change.seq1Range), slice2.translateRange(change.seq2Range)));
+        }
+      }
       let diffs = diffResult.diffs;
       diffs = optimizeSequenceDiffs(slice1, slice2, diffs);
       diffs = extendDiffsToEntireWordIfAppropriate(slice1, slice2, diffs, (seq, idx) => seq.findWordContaining(idx));
@@ -12295,7 +12310,7 @@
       const result = diffs.map((d) => new RangeMapping(slice1.translateRange(d.seq1Range), slice2.translateRange(d.seq2Range)));
       return {
         mappings: result,
-        hitTimeout: diffResult.hitTimeout
+        hitTimeout
       };
     }
   }
@@ -12862,8 +12877,7 @@
       const originalText = new StringText(originalLines.join("\n"));
       const modifiedText = new StringText(modifiedLines.join("\n"));
       const result = this._computer.computeDiff(originalText.value, modifiedText.value, {
-        ignoreTrimWhitespace: false,
-        // TODO: forward `maxComputationTimeMs` after updating @vscode/diff. The wasm build of the pinned version panics when measuring time.
+        maxComputationTimeMs: options.maxComputationTimeMs,
         computeMoves: options.computeMoves,
         extendToSubwords: options.extendToSubwords
       });
@@ -12875,7 +12889,7 @@
         const originalRange = new OffsetRange(r.range.start, r.range.endExclusive);
         const modifiedRange = new OffsetRange(r.range.start + delta, r.range.start + delta + r.newText.length);
         delta += r.newText.length - originalRange.length;
-        if (options.ignoreTrimWhitespace && isInTrimWhitespace(originalText.value, originalRange) && isInTrimWhitespace(modifiedText.value, modifiedRange)) {
+        if (options.ignoreTrimWhitespace && r.data.isTrimWhitespaceChange) {
           continue;
         }
         rangeMappings.push(new RangeMapping(originalTransformer.getRange(originalRange), modifiedTransformer.getRange(modifiedRange)));
@@ -12896,16 +12910,6 @@
       return new LinesDiff(changes, moves, result.hitTimeout);
     }
   }
-  const whitespaceWithoutLineBreak = /^[^\S\n]*$/;
-  function isInTrimWhitespace(text, range) {
-    if (!whitespaceWithoutLineBreak.test(range.substring(text))) {
-      return false;
-    }
-    const lineStart = range.start === 0 ? 0 : text.lastIndexOf("\n", range.start - 1) + 1;
-    const nextLineBreak = text.indexOf("\n", range.endExclusive);
-    const lineEnd = nextLineBreak === -1 ? text.length : nextLineBreak;
-    return whitespaceWithoutLineBreak.test(text.substring(lineStart, range.start)) || whitespaceWithoutLineBreak.test(text.substring(range.endExclusive, lineEnd));
-  }
   const linesDiffComputers = {
     getLegacy: () => new LegacyLinesDiffComputer(),
     getDefault: () => new DefaultLinesDiffComputer(),