monaco-editor 0.55.0-dev-20251019 → 0.55.0-dev-20251021

package/dev/vs/basic-languages/monaco.contribution.js

@@ -1,4 +1,4 @@
-define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802iF3VW"], (function(require, editor_api) {
+define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-DtdJriTE"], (function(require, editor_api) {
   "use strict";
   const languageDefinitions = {};
   const lazyLanguageLoaders = {};
@@ -174,49 +174,49 @@ define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802i
     extensions: [".ftl", ".ftlh", ".ftlx"],
     aliases: ["FreeMarker2", "Apache FreeMarker2"],
     loader: () => {
-      return new Promise((resolve, reject) => require(["../freemarker2-DBz8kSoY"], resolve, reject)).then((m) => m.TagAutoInterpolationDollar);
+      return new Promise((resolve, reject) => require(["../freemarker2-vzq7IT1V"], resolve, reject)).then((m) => m.TagAutoInterpolationDollar);
     }
   });
   registerLanguage({
     id: "freemarker2.tag-angle.interpolation-dollar",
     aliases: ["FreeMarker2 (Angle/Dollar)", "Apache FreeMarker2 (Angle/Dollar)"],
     loader: () => {
-      return new Promise((resolve, reject) => require(["../freemarker2-DBz8kSoY"], resolve, reject)).then((m) => m.TagAngleInterpolationDollar);
+      return new Promise((resolve, reject) => require(["../freemarker2-vzq7IT1V"], resolve, reject)).then((m) => m.TagAngleInterpolationDollar);
     }
   });
   registerLanguage({
     id: "freemarker2.tag-bracket.interpolation-dollar",
     aliases: ["FreeMarker2 (Bracket/Dollar)", "Apache FreeMarker2 (Bracket/Dollar)"],
     loader: () => {
-      return new Promise((resolve, reject) => require(["../freemarker2-DBz8kSoY"], resolve, reject)).then((m) => m.TagBracketInterpolationDollar);
+      return new Promise((resolve, reject) => require(["../freemarker2-vzq7IT1V"], resolve, reject)).then((m) => m.TagBracketInterpolationDollar);
     }
   });
   registerLanguage({
     id: "freemarker2.tag-angle.interpolation-bracket",
     aliases: ["FreeMarker2 (Angle/Bracket)", "Apache FreeMarker2 (Angle/Bracket)"],
     loader: () => {
-      return new Promise((resolve, reject) => require(["../freemarker2-DBz8kSoY"], resolve, reject)).then((m) => m.TagAngleInterpolationBracket);
+      return new Promise((resolve, reject) => require(["../freemarker2-vzq7IT1V"], resolve, reject)).then((m) => m.TagAngleInterpolationBracket);
     }
   });
   registerLanguage({
     id: "freemarker2.tag-bracket.interpolation-bracket",
     aliases: ["FreeMarker2 (Bracket/Bracket)", "Apache FreeMarker2 (Bracket/Bracket)"],
     loader: () => {
-      return new Promise((resolve, reject) => require(["../freemarker2-DBz8kSoY"], resolve, reject)).then((m) => m.TagBracketInterpolationBracket);
+      return new Promise((resolve, reject) => require(["../freemarker2-vzq7IT1V"], resolve, reject)).then((m) => m.TagBracketInterpolationBracket);
     }
   });
   registerLanguage({
     id: "freemarker2.tag-auto.interpolation-dollar",
     aliases: ["FreeMarker2 (Auto/Dollar)", "Apache FreeMarker2 (Auto/Dollar)"],
     loader: () => {
-      return new Promise((resolve, reject) => require(["../freemarker2-DBz8kSoY"], resolve, reject)).then((m) => m.TagAutoInterpolationDollar);
+      return new Promise((resolve, reject) => require(["../freemarker2-vzq7IT1V"], resolve, reject)).then((m) => m.TagAutoInterpolationDollar);
     }
   });
   registerLanguage({
     id: "freemarker2.tag-auto.interpolation-bracket",
     aliases: ["FreeMarker2 (Auto/Bracket)", "Apache FreeMarker2 (Auto/Bracket)"],
     loader: () => {
-      return new Promise((resolve, reject) => require(["../freemarker2-DBz8kSoY"], resolve, reject)).then((m) => m.TagAutoInterpolationBracket);
+      return new Promise((resolve, reject) => require(["../freemarker2-vzq7IT1V"], resolve, reject)).then((m) => m.TagAutoInterpolationBracket);
     }
   });
   registerLanguage({
@@ -237,7 +237,7 @@ define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802i
     extensions: [".handlebars", ".hbs"],
     aliases: ["Handlebars", "handlebars", "hbs"],
     mimetypes: ["text/x-handlebars-template"],
-    loader: () => new Promise((resolve, reject) => require(["../handlebars-Dn6mhN_R"], resolve, reject))
+    loader: () => new Promise((resolve, reject) => require(["../handlebars-voSBoDYq"], resolve, reject))
   });
   registerLanguage({
     id: "hcl",
@@ -250,7 +250,7 @@ define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802i
     extensions: [".html", ".htm", ".shtml", ".xhtml", ".mdoc", ".jsp", ".asp", ".aspx", ".jshtm"],
     aliases: ["HTML", "htm", "html", "xhtml"],
     mimetypes: ["text/html", "text/x-jshtm", "text/template", "text/ng-template"],
-    loader: () => new Promise((resolve, reject) => require(["../html-D431O42K"], resolve, reject))
+    loader: () => new Promise((resolve, reject) => require(["../html-DgBvMxaw"], resolve, reject))
   });
   registerLanguage({
     id: "ini",
@@ -273,7 +273,7 @@ define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802i
     filenames: ["jakefile"],
     aliases: ["JavaScript", "javascript", "js"],
     mimetypes: ["text/javascript"],
-    loader: () => new Promise((resolve, reject) => require(["../javascript-CXLQs4Fj"], resolve, reject))
+    loader: () => new Promise((resolve, reject) => require(["../javascript-B456O1TJ"], resolve, reject))
   });
   registerLanguage({
     id: "julia",
@@ -312,7 +312,7 @@ define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802i
     extensions: [".liquid", ".html.liquid"],
     aliases: ["Liquid", "liquid"],
     mimetypes: ["application/liquid"],
-    loader: () => new Promise((resolve, reject) => require(["../liquid-BeJl_4KB"], resolve, reject))
+    loader: () => new Promise((resolve, reject) => require(["../liquid-DtsObjyU"], resolve, reject))
   });
   registerLanguage({
     id: "m3",
@@ -330,7 +330,7 @@ define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802i
     id: "mdx",
     extensions: [".mdx"],
     aliases: ["MDX", "mdx"],
-    loader: () => new Promise((resolve, reject) => require(["../mdx-DcGH0HYw"], resolve, reject))
+    loader: () => new Promise((resolve, reject) => require(["../mdx-CpdAOlbp"], resolve, reject))
   });
   registerLanguage({
     id: "mips",
@@ -429,7 +429,7 @@ define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802i
     extensions: [".py", ".rpy", ".pyw", ".cpy", ".gyp", ".gypi"],
     aliases: ["Python", "py"],
     firstLine: "^#!/.*\\bpython[0-9.-]*\\b",
-    loader: () => new Promise((resolve, reject) => require(["../python-PUDP_Uaz"], resolve, reject))
+    loader: () => new Promise((resolve, reject) => require(["../python-Bdcmm8So"], resolve, reject))
   });
   registerLanguage({
     id: "qsharp",
@@ -448,7 +448,7 @@ define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802i
     extensions: [".cshtml"],
     aliases: ["Razor", "razor"],
     mimetypes: ["text/x-cshtml"],
-    loader: () => new Promise((resolve, reject) => require(["../razor-DPnf-zqt"], resolve, reject))
+    loader: () => new Promise((resolve, reject) => require(["../razor-C2m7Vs0-"], resolve, reject))
   });
   registerLanguage({
     id: "redis",
@@ -581,7 +581,7 @@ define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802i
     aliases: ["TypeScript", "ts", "typescript"],
     mimetypes: ["text/typescript"],
     loader: () => {
-      return new Promise((resolve, reject) => require(["../typescript-A2hDCSxV"], resolve, reject));
+      return new Promise((resolve, reject) => require(["../typescript-BoBnM-0b"], resolve, reject));
     }
   });
   registerLanguage({
@@ -626,13 +626,13 @@ define("vs/basic-languages/monaco.contribution", ["require", "../editor.api-802i
     firstLine: "(\\<\\?xml.*)|(\\<svg)|(\\<\\!doctype\\s+svg)",
     aliases: ["XML", "xml"],
     mimetypes: ["text/xml", "application/xml", "application/xaml+xml", "application/xml-dtd"],
-    loader: () => new Promise((resolve, reject) => require(["../xml-DZuYLO-A"], resolve, reject))
+    loader: () => new Promise((resolve, reject) => require(["../xml-DmpITxBR"], resolve, reject))
   });
   registerLanguage({
     id: "yaml",
     extensions: [".yaml", ".yml"],
     aliases: ["YAML", "yaml", "YML", "yml"],
     mimetypes: ["application/x-yaml", "text/x-yaml"],
-    loader: () => new Promise((resolve, reject) => require(["../yaml-CTCtYDFA"], resolve, reject))
+    loader: () => new Promise((resolve, reject) => require(["../yaml-Pd4qqIOC"], resolve, reject))
   });
 }));

package/dev/vs/{cssMode-Q1Lf-3sI.js → cssMode-Bwd5iTwO.js}

@@ -1,4 +1,4 @@
-define("vs/cssMode-Q1Lf-3sI", ["module", "exports", "./workers-BTQeXau-", "./lspLanguageFeatures-7D3Okm4p", "./editor.api-802iF3VW"], (function(module, exports, workers, lspLanguageFeatures, editor_api) {
+define("vs/cssMode-Bwd5iTwO", ["module", "exports", "./workers-B1DA8fIt", "./lspLanguageFeatures-BOGx43ac", "./editor.api-DtdJriTE"], (function(module, exports, workers, lspLanguageFeatures, editor_api) {
   "use strict";
   const STOP_WHEN_IDLE_FOR = 2 * 60 * 1e3;
   class WorkerManager {

package/dev/vs/editor/editor.main.js

@@ -1,4 +1,4 @@
-define("vs/editor/editor.main", ["exports", "require", "vs/nls.messages-loader!", "../monaco.contribution-9FgKzO6Y", "../monaco.contribution-Cn9EpORE", "../monaco.contribution-D2sTuDLD", "../monaco.contribution-Jg8nMxDq", "../basic-languages/monaco.contribution", "../editor.api-802iF3VW", "../workers-BTQeXau-"], (function(exports, require, nls_messagesLoader_, language_css_monaco_contribution, language_html_monaco_contribution, language_json_monaco_contribution, language_typescript_monaco_contribution, basicLanguages_monaco_contribution, editor_api, workers) {
+define("vs/editor/editor.main", ["exports", "require", "vs/nls.messages-loader!", "../monaco.contribution-96LxvCLa", "../monaco.contribution-BNV_Bhhz", "../monaco.contribution-DgD6w475", "../monaco.contribution-CLECD6oi", "../basic-languages/monaco.contribution", "../editor.api-DtdJriTE", "../workers-B1DA8fIt"], (function(exports, require, nls_messagesLoader_, language_css_monaco_contribution, language_html_monaco_contribution, language_json_monaco_contribution, language_typescript_monaco_contribution, basicLanguages_monaco_contribution, editor_api, workers) {
   "use strict";
   function _interopNamespaceDefault(e) {
     const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dev/vs/{editor.api-802iF3VW.js → editor.api-DtdJriTE.js}

@@ -1,4 +1,4 @@
-define("vs/editor.api-802iF3VW", ["exports"], (function(exports) {
+define("vs/editor.api-DtdJriTE", ["exports"], (function(exports) {
   "use strict";
   var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$2, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja, _ka, _la, _ma, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da, _Ea, _Fa, _Ga, _Ha, _Ia, _Ja, _Ka, _La, _Ma, _Na, _Oa, _Pa, _Qa, _Ra, _Sa;
   function getNLSMessages() {
@@ -2802,13 +2802,13 @@ define("vs/editor.api-802iF3VW", ["exports"], (function(exports) {
   }
   let Throttler$1 = class Throttler {
     constructor() {
-      this.isDisposed = false;
       this.activePromise = null;
       this.queuedPromise = null;
       this.queuedPromiseFactory = null;
+      this.cancellationTokenSource = new CancellationTokenSource$1();
     }
     queue(promiseFactory) {
-      if (this.isDisposed) {
+      if (this.cancellationTokenSource.token.isCancellationRequested) {
         return Promise.reject(new Error("Throttler is disposed"));
       }
       if (this.activePromise) {
@@ -2816,7 +2816,7 @@ define("vs/editor.api-802iF3VW", ["exports"], (function(exports) {
         if (!this.queuedPromise) {
           const onComplete = () => {
             this.queuedPromise = null;
-            if (this.isDisposed) {
+            if (this.cancellationTokenSource.token.isCancellationRequested) {
               return;
             }
             const result = this.queue(this.queuedPromiseFactory);
@@ -2831,7 +2831,7 @@ define("vs/editor.api-802iF3VW", ["exports"], (function(exports) {
           this.queuedPromise.then(resolve2, reject);
         });
       }
-      this.activePromise = promiseFactory();
+      this.activePromise = promiseFactory(this.cancellationTokenSource.token);
       return new Promise((resolve2, reject) => {
         this.activePromise.then((result) => {
           this.activePromise = null;
@@ -2843,7 +2843,7 @@ define("vs/editor.api-802iF3VW", ["exports"], (function(exports) {
       });
     }
     dispose() {
-      this.isDisposed = true;
+      this.cancellationTokenSource.cancel();
     }
   };
   const timeoutDeferred = (timeout2, fn) => {
@@ -53786,6 +53786,7 @@ struct VSOutput {
       this._targetWindowId = -1;
       this._scrollTop = 0;
       this._scrollLeft = 0;
+      this._linesVisibleRanges = null;
       this.domNode = new FastDomNode(document.createElement("div"));
       this.domNode.setClassName(`native-edit-context`);
       this._imeTextArea = new FastDomNode(document.createElement("textarea"));
@@ -53927,7 +53928,10 @@ struct VSOutput {
     }
     prepareRender(ctx) {
       this._screenReaderSupport.prepareRender(ctx);
-      this._updateSelectionAndControlBounds(ctx);
+      this._updateSelectionAndControlBoundsData(ctx);
+    }
+    onDidRender() {
+      this._updateSelectionAndControlBoundsAfterRender();
     }
     render(ctx) {
       this._screenReaderSupport.render(ctx);
@@ -54139,27 +54143,32 @@ struct VSOutput {
       });
       this._decorations = this._context.viewModel.model.deltaDecorations(this._decorations, decorations);
     }
-    _updateSelectionAndControlBounds(ctx) {
-      if (!this._parent) {
-        return;
+    _updateSelectionAndControlBoundsData(ctx) {
+      const viewSelection = this._context.viewModel.coordinatesConverter.convertModelRangeToViewRange(this._primarySelection);
+      if (this._primarySelection.isEmpty()) {
+        const linesVisibleRanges = ctx.visibleRangeForPosition(viewSelection.getStartPosition());
+        this._linesVisibleRanges = linesVisibleRanges;
+      } else {
+        this._linesVisibleRanges = null;
       }
+    }
+    _updateSelectionAndControlBoundsAfterRender() {
       const options = this._context.configuration.options;
       const contentLeft = options.get(
         165
         /* EditorOption.layoutInfo */
       ).contentLeft;
-      const parentBounds = this._parent.getBoundingClientRect();
       const viewSelection = this._context.viewModel.coordinatesConverter.convertModelRangeToViewRange(this._primarySelection);
       const verticalOffsetStart = this._context.viewLayout.getVerticalOffsetForLineNumber(viewSelection.startLineNumber);
-      const top = parentBounds.top + verticalOffsetStart - this._scrollTop;
       const verticalOffsetEnd = this._context.viewLayout.getVerticalOffsetAfterLineNumber(viewSelection.endLineNumber);
+      const parentBounds = this._parent.getBoundingClientRect();
+      const top = parentBounds.top + verticalOffsetStart - this._scrollTop;
       const height = verticalOffsetEnd - verticalOffsetStart;
       let left = parentBounds.left + contentLeft - this._scrollLeft;
       let width2;
       if (this._primarySelection.isEmpty()) {
-        const linesVisibleRanges = ctx.visibleRangeForPosition(viewSelection.getStartPosition());
-        if (linesVisibleRanges) {
-          left += linesVisibleRanges.left;
+        if (this._linesVisibleRanges) {
+          left += this._linesVisibleRanges.left;
         }
         width2 = 0;
       } else {
@@ -54170,9 +54179,6 @@ struct VSOutput {
       this._editContext.updateControlBounds(selectionBounds);
     }
     _updateCharacterBounds(e) {
-      if (!this._parent) {
-        return;
-      }
       const options = this._context.configuration.options;
       const typicalHalfWidthCharacterWidth = options.get(
         59
@@ -96221,12 +96227,14 @@ ${escape$2(text2)}
       if (!model || !model.isDiffUpToDate.get()) {
         return;
       }
+      this._editors.modified.pushUndoStop();
       this._editors.modified.executeEdits("diffEditor", [
         {
           range: diff.modified.toExclusiveRange(),
           text: model.model.original.getValueInRange(diff.original.toExclusiveRange())
         }
       ]);
+      this._editors.modified.pushUndoStop();
     }
     revertRangeMappings(diffs) {
       const model = this._diffModel.get();
@@ -96237,7 +96245,9 @@ ${escape$2(text2)}
         range: c.modifiedRange,
         text: model.model.original.getValueInRange(c.originalRange)
       }));
+      this._editors.modified.pushUndoStop();
       this._editors.modified.executeEdits("diffEditor", changes);
+      this._editors.modified.pushUndoStop();
     }
     revertFocusedRangeMappings() {
       const model = this._diffModel.get();
@@ -96258,10 +96268,12 @@ ${escape$2(text2)}
       const diffsToRevert = diffs.filter((d) => {
         return d.lineRangeMapping.modified.intersect(selectedRange);
       });
+      modifiedEditor.pushUndoStop();
       modifiedEditor.executeEdits("diffEditor", diffsToRevert.map((d) => ({
         range: d.lineRangeMapping.modified.toExclusiveRange(),
         text: model.model.original.getValueInRange(d.lineRangeMapping.original.toExclusiveRange())
       })));
+      modifiedEditor.pushUndoStop();
     }
     _goTo(diff) {
       this._editors.modified.setPosition(new Position$1(diff.lineRangeMapping.modified.startLineNumber, 1));
@@ -110166,6 +110178,7 @@ ${escape$2(text2)}
       this._onChange = this._register(new Emitter$1());
       this._onKeyDown = this._register(new Emitter$1());
       this._opts = opts;
+      this._title = this._opts.title;
       this._checked = this._opts.isChecked;
       const classes = ["monaco-custom-toggle"];
       if (this._opts.icon) {
@@ -110179,14 +110192,17 @@ ${escape$2(text2)}
         classes.push("checked");
       }
       this.domNode = document.createElement("div");
-      this._hover = this._register(getBaseLayerHoverDelegate().setupManagedHover(opts.hoverDelegate ?? getDefaultHoverDelegate("mouse"), this.domNode, this._opts.title));
+      this._register(getBaseLayerHoverDelegate().setupDelayedHover(this.domNode, () => ({
+        content: this._title,
+        style: 1
+      }), this._opts.hoverLifecycleOptions));
       this.domNode.classList.add(...classes);
       if (!this._opts.notFocusable) {
         this.domNode.tabIndex = 0;
       }
       this.domNode.setAttribute("role", "checkbox");
       this.domNode.setAttribute("aria-checked", String(this._checked));
-      this.domNode.setAttribute("aria-label", this._opts.title);
+      this.setTitle(this._opts.title);
       this.applyStyles();
       this.onclick(this.domNode, (ev) => {
         if (this.enabled) {
@@ -110253,7 +110269,7 @@ ${escape$2(text2)}
       this.domNode.classList.add("disabled");
     }
     setTitle(newTitle) {
-      this._hover.update(newTitle);
+      this._title = newTitle;
       this.domNode.setAttribute("aria-label", newTitle);
     }
     set visible(visible) {
@@ -110300,7 +110316,7 @@ ${escape$2(text2)}
   let BaseCheckbox = _BaseCheckbox;
   class Checkbox extends BaseCheckbox {
     constructor(title, isChecked, styles) {
-      const toggle = new Toggle({ title, isChecked, icon: Codicon.check, actionClassName: BaseCheckbox.CLASS_NAME, hoverDelegate: styles.hoverDelegate, ...unthemedToggleStyles });
+      const toggle = new Toggle({ title, isChecked, icon: Codicon.check, actionClassName: BaseCheckbox.CLASS_NAME, hoverLifecycleOptions: styles.hoverLifecycleOptions, ...unthemedToggleStyles });
       super(toggle, toggle.domNode, styles);
       this._register(toggle);
       this._register(this.checkbox.onChange((keyboard) => {
@@ -110343,7 +110359,7 @@ ${escape$2(text2)}
         isChecked: _state === true,
         icon,
         actionClassName: Checkbox.CLASS_NAME,
-        hoverDelegate: styles.hoverDelegate,
+        hoverLifecycleOptions: styles.hoverLifecycleOptions,
         ...unthemedToggleStyles
       });
       super(checkbox, checkbox.domNode, styles);
@@ -110389,7 +110405,7 @@ ${escape$2(text2)}
         icon: Codicon.caseSensitive,
         title: NLS_CASE_SENSITIVE_TOGGLE_LABEL + opts.appendTitle,
         isChecked: opts.isChecked,
-        hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate("element"),
+        hoverLifecycleOptions: opts.hoverLifecycleOptions,
         inputActiveOptionBorder: opts.inputActiveOptionBorder,
         inputActiveOptionForeground: opts.inputActiveOptionForeground,
         inputActiveOptionBackground: opts.inputActiveOptionBackground
@@ -110402,7 +110418,7 @@ ${escape$2(text2)}
         icon: Codicon.wholeWord,
         title: NLS_WHOLE_WORD_TOGGLE_LABEL + opts.appendTitle,
         isChecked: opts.isChecked,
-        hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate("element"),
+        hoverLifecycleOptions: opts.hoverLifecycleOptions,
         inputActiveOptionBorder: opts.inputActiveOptionBorder,
         inputActiveOptionForeground: opts.inputActiveOptionForeground,
         inputActiveOptionBackground: opts.inputActiveOptionBackground
@@ -110415,7 +110431,7 @@ ${escape$2(text2)}
         icon: Codicon.regex,
         title: NLS_REGEX_TOGGLE_LABEL + opts.appendTitle,
         isChecked: opts.isChecked,
-        hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate("element"),
+        hoverLifecycleOptions: opts.hoverLifecycleOptions,
         inputActiveOptionBorder: opts.inputActiveOptionBorder,
         inputActiveOptionForeground: opts.inputActiveOptionForeground,
         inputActiveOptionBackground: opts.inputActiveOptionBackground
@@ -111205,12 +111221,12 @@ ${escape$2(text2)}
         inputBoxStyles: options.inputBoxStyles,
         history: options.history
       }));
-      const hoverDelegate = this._register(createInstantHoverDelegate());
       if (this.showCommonFindToggles) {
+        const hoverLifecycleOptions = options?.hoverLifecycleOptions || { groupId: "find-input" };
         this.regex = this._register(new RegexToggle({
           appendTitle: appendRegexLabel,
           isChecked: false,
-          hoverDelegate,
+          hoverLifecycleOptions,
           ...options.toggleStyles
         }));
         this._register(this.regex.onChange((viaKeyboard) => {
@@ -111226,7 +111242,7 @@ ${escape$2(text2)}
         this.wholeWords = this._register(new WholeWordsToggle({
           appendTitle: appendWholeWordsLabel,
           isChecked: false,
-          hoverDelegate,
+          hoverLifecycleOptions,
           ...options.toggleStyles
         }));
         this._register(this.wholeWords.onChange((viaKeyboard) => {
@@ -111239,7 +111255,7 @@ ${escape$2(text2)}
         this.caseSensitive = this._register(new CaseSensitiveToggle({
           appendTitle: appendCaseSensitiveLabel,
           isChecked: false,
-          hoverDelegate,
+          hoverLifecycleOptions,
           ...options.toggleStyles
         }));
         this._register(this.caseSensitive.onChange((viaKeyboard) => {
@@ -124840,11 +124856,11 @@ ${escape$2(text2)}
         inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
         inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
       };
-      const hoverDelegate = this._register(createInstantHoverDelegate());
+      const hoverLifecycleOptions = { groupId: "find-options-widget" };
       this.caseSensitive = this._register(new CaseSensitiveToggle({
         appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleCaseSensitiveCommand),
         isChecked: this._state.matchCase,
-        hoverDelegate,
+        hoverLifecycleOptions,
         ...toggleStyles
       }));
       this._domNode.appendChild(this.caseSensitive.domNode);
@@ -124856,7 +124872,7 @@ ${escape$2(text2)}
       this.wholeWords = this._register(new WholeWordsToggle({
         appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleWholeWordCommand),
         isChecked: this._state.wholeWord,
-        hoverDelegate,
+        hoverLifecycleOptions,
         ...toggleStyles
       }));
       this._domNode.appendChild(this.wholeWords.domNode);
@@ -124868,7 +124884,7 @@ ${escape$2(text2)}
       this.regex = this._register(new RegexToggle({
         appendTitle: this._keybindingLabelFor(FIND_IDS.ToggleRegexCommand),
         isChecked: this._state.isRegex,
-        hoverDelegate,
+        hoverLifecycleOptions,
         ...toggleStyles
       }));
       this._domNode.appendChild(this.regex.domNode);
@@ -125225,7 +125241,7 @@ ${escape$2(text2)}
         icon: Codicon.preserveCase,
         title: NLS_PRESERVE_CASE_LABEL + opts.appendTitle,
         isChecked: opts.isChecked,
-        hoverDelegate: opts.hoverDelegate ?? getDefaultHoverDelegate("element"),
+        hoverLifecycleOptions: opts.hoverLifecycleOptions,
         inputActiveOptionBorder: opts.inputActiveOptionBorder,
         inputActiveOptionForeground: opts.inputActiveOptionForeground,
         inputActiveOptionBackground: opts.inputActiveOptionBackground
@@ -125280,6 +125296,7 @@ ${escape$2(text2)}
       this.preserveCase = this._register(new PreserveCaseToggle({
         appendTitle: appendPreserveCaseLabel,
         isChecked: false,
+        hoverLifecycleOptions: options.hoverLifecycleOptions,
         ...options.toggleStyles
       }));
       this._register(this.preserveCase.onChange((viaKeyboard) => {
@@ -126342,11 +126359,11 @@ ${escape$2(text2)}
       this._matchesCount = document.createElement("div");
       this._matchesCount.className = "matchesCount";
       this._updateMatchesCount();
-      const hoverDelegate = this._register(createInstantHoverDelegate());
+      const hoverLifecycleOptions = { groupId: "find-widget" };
       this._prevBtn = this._register(new SimpleButton({
         label: NLS_PREVIOUS_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.PreviousMatchFindAction),
         icon: findPreviousMatchIcon,
-        hoverDelegate,
+        hoverLifecycleOptions,
         onTrigger: () => {
           assertReturnsDefined(this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction)).run().then(void 0, onUnexpectedError);
         }
@@ -126354,7 +126371,7 @@ ${escape$2(text2)}
       this._nextBtn = this._register(new SimpleButton({
         label: NLS_NEXT_MATCH_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.NextMatchFindAction),
         icon: findNextMatchIcon,
-        hoverDelegate,
+        hoverLifecycleOptions,
         onTrigger: () => {
           assertReturnsDefined(this._codeEditor.getAction(FIND_IDS.NextMatchFindAction)).run().then(void 0, onUnexpectedError);
         }
@@ -126372,7 +126389,7 @@ ${escape$2(text2)}
         icon: findSelectionIcon,
         title: NLS_TOGGLE_SELECTION_FIND_TITLE + this._keybindingLabelFor(FIND_IDS.ToggleSearchScopeCommand),
         isChecked: false,
-        hoverDelegate,
+        hoverLifecycleOptions,
         inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground),
         inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
         inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground)
@@ -126402,7 +126419,7 @@ ${escape$2(text2)}
       this._closeBtn = this._register(new SimpleButton({
         label: NLS_CLOSE_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.CloseFindWidgetCommand),
         icon: widgetClose,
-        hoverDelegate,
+        hoverLifecycleOptions,
         onTrigger: () => {
           this._state.change({ isRevealed: false, searchScope: null }, false);
         },
@@ -126432,7 +126449,8 @@ ${escape$2(text2)}
         flexibleMaxHeight: 118,
         showHistoryHint: () => showHistoryKeybindingHint(this._keybindingService),
         inputBoxStyles: defaultInputBoxStyles,
-        toggleStyles: defaultToggleStyles
+        toggleStyles: defaultToggleStyles,
+        hoverLifecycleOptions
       }, this._contextKeyService, true));
       this._replaceInput.setPreserveCase(!!this._state.preserveCase);
       this._register(this._replaceInput.onKeyDown((e) => this._onReplaceInputKeyDown(e)));
@@ -126466,11 +126484,10 @@ ${escape$2(text2)}
           e.preventDefault();
         }
       }));
-      const replaceHoverDelegate = this._register(createInstantHoverDelegate());
       this._replaceBtn = this._register(new SimpleButton({
         label: NLS_REPLACE_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.ReplaceOneAction),
         icon: findReplaceIcon,
-        hoverDelegate: replaceHoverDelegate,
+        hoverLifecycleOptions,
         onTrigger: () => {
           this._controller.replace();
         },
@@ -126487,7 +126504,7 @@ ${escape$2(text2)}
       this._replaceAllBtn = this._register(new SimpleButton({
         label: NLS_REPLACE_ALL_BTN_LABEL + this._keybindingLabelFor(FIND_IDS.ReplaceAllAction),
         icon: findReplaceAllIcon,
-        hoverDelegate: replaceHoverDelegate,
+        hoverLifecycleOptions,
         onTrigger: () => {
           this._controller.replaceAll();
         }
@@ -126611,7 +126628,10 @@ ${escape$2(text2)}
       this._domNode.className = className2;
       this._domNode.setAttribute("role", "button");
       this._domNode.setAttribute("aria-label", this._opts.label);
-      this._register(hoverService.setupManagedHover(opts.hoverDelegate ?? getDefaultHoverDelegate("element"), this._domNode, this._opts.label));
+      this._register(hoverService.setupDelayedHover(this._domNode, {
+        content: this._opts.label,
+        style: 1
+      }, opts.hoverLifecycleOptions));
       this.onclick(this._domNode, (e) => {
         this._opts.onTrigger();
         e.preventDefault();
@@ -136753,7 +136773,6 @@ ${escape$2(text2)}
         return;
       }
       const emptyEndOfLifeEvent = {
-        id: requestResponseInfo.requestUuid,
         opportunityId: requestResponseInfo.requestUuid,
         noSuggestionReason: requestResponseInfo.noSuggestionReason ?? "unknown",
         extensionId: "vscode-core",
@@ -151048,6 +151067,7 @@ ${json}
     constructor(editor2, _markdownRendererService) {
       super();
       this._markdownRendererService = _markdownRendererService;
+      this.allowEditorOverflow = true;
       this._renderDisposeables = this._register(new DisposableStore());
       this._editor = editor2;
       this._isVisible = false;
@@ -151165,8 +151185,26 @@ ${json}
       const nodeHeight = this._hover.containerDomNode.clientHeight;
       const top = topForLineNumber - editorScrollTop - (nodeHeight - lineHeight) / 2;
       const left = editorLayout.glyphMarginLeft + editorLayout.glyphMarginWidth + (laneOrLine === "lineNo" ? editorLayout.lineNumbersWidth : 0);
-      this._hover.containerDomNode.style.left = `${left}px`;
-      this._hover.containerDomNode.style.top = `${Math.max(Math.round(top), 0)}px`;
+      const editorHeight = editorLayout.height;
+      const maxTop = editorHeight - nodeHeight;
+      const constrainedTop = Math.max(0, Math.min(Math.round(top), maxTop));
+      const fixedOverflowWidgets = this._editor.getOption(
+        51
+        /* EditorOption.fixedOverflowWidgets */
+      );
+      if (fixedOverflowWidgets) {
+        const editorDomNode = this._editor.getDomNode();
+        if (editorDomNode) {
+          const editorRect = getDomNodePagePosition(editorDomNode);
+          this._hover.containerDomNode.style.position = "fixed";
+          this._hover.containerDomNode.style.left = `${editorRect.left + left}px`;
+          this._hover.containerDomNode.style.top = `${editorRect.top + constrainedTop}px`;
+        }
+      } else {
+        this._hover.containerDomNode.style.position = "absolute";
+        this._hover.containerDomNode.style.left = `${left}px`;
+        this._hover.containerDomNode.style.top = `${constrainedTop}px`;
+      }
       this._hover.containerDomNode.style.zIndex = "11";
     }
     _onMouseLeave(e) {
@@ -155763,10 +155801,7 @@ ${json}
         this._buttonHoverContent = this._buttonGenHoverText;
         this._disposables.add(getBaseLayerHoverDelegate().setupDelayedHover(this._buttonNode, () => ({
           content: this._buttonHoverContent,
-          appearance: {
-            showPointer: true,
-            compact: true
-          }
+          style: 1
         })));
         this._domNode.appendChild(this._buttonNode);
         this._disposables.add(addDisposableListener(this.input, EventType$1.INPUT, () => this._onDidInputChange.fire()));
@@ -170161,6 +170196,21 @@ ${this._themeCSS}`;
       this._onRequestLayout = this._register(new Emitter$1());
       this._linkHandler = options.linkHandler;
       this._target = "targetElements" in options.target ? options.target : new ElementHoverTarget(options.target);
+      if (options.style) {
+        switch (options.style) {
+          case 1: {
+            options.appearance ??= {};
+            options.appearance.compact ??= true;
+            options.appearance.showPointer ??= true;
+            break;
+          }
+          case 2: {
+            options.appearance ??= {};
+            options.appearance.compact ??= true;
+            break;
+          }
+        }
+      }
       this._hoverPointer = options.appearance?.showPointer ? $$5("div.workbench-hover-pointer") : void 0;
       this._hover = this._register(new HoverWidget$1(!options.appearance?.skipFadeInAnimation));
       this._hover.containerDomNode.classList.add("workbench-hover");
@@ -182570,7 +182620,8 @@ ${graph.toString()}`;
         ])
       ]);
       this.editor = this._register(this._instantiationService.createInstance(DiffEditorWidget, this._elements.editor, {
-        overflowWidgetsDomNode: this._overflowWidgetsDomNode
+        overflowWidgetsDomNode: this._overflowWidgetsDomNode,
+        fixedOverflowWidgets: true
       }, {}));
       this.isModifedFocused = observableCodeEditor(this.editor.getModifiedEditor()).isFocused;
       this.isOriginalFocused = observableCodeEditor(this.editor.getOriginalEditor()).isFocused;

package/dev/vs/{freemarker2-DBz8kSoY.js → freemarker2-vzq7IT1V.js}

@@ -1,4 +1,4 @@
-define("vs/freemarker2-DBz8kSoY", ["exports", "./editor.api-802iF3VW"], (function(exports, editor_api) {
+define("vs/freemarker2-vzq7IT1V", ["exports", "./editor.api-DtdJriTE"], (function(exports, editor_api) {
   "use strict";
   const EMPTY_ELEMENTS = [
     "assign",