monaco-editor-core 0.54.0-dev-20250922 → 0.54.0-dev-20250924

package/esm/vs/editor/contrib/floatingMenu/browser/floatingMenu.js

@@ -14,13 +14,15 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 import { h } from '../../../../base/browser/dom.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { autorun, constObservable, observableFromEvent } from '../../../../base/common/observable.js';
+import { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
-import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { observableCodeEditor } from '../../../browser/observableCodeEditor.js';
 let FloatingEditorToolbar = class FloatingEditorToolbar extends Disposable {
     static { this.ID = 'editor.contrib.floatingToolbar'; }
-    constructor(editor, instantiationService, menuService) {
+    constructor(editor, instantiationService, keybindingService, menuService) {
         super();
         const editorObs = this._register(observableCodeEditor(editor));
         const menu = this._register(menuService.createMenu(MenuId.EditorContent, editor.contextKeyService));
@@ -35,10 +37,25 @@ let FloatingEditorToolbar = class FloatingEditorToolbar extends Disposable {
             // is rendered in the lower right corner at the correct position.
             container.root.style.height = '28px';
             // Toolbar
-            reader.store.add(instantiationService.createInstance(MenuWorkbenchToolBar, container.root, MenuId.EditorContent, {
+            const toolbar = instantiationService.createInstance(MenuWorkbenchToolBar, container.root, MenuId.EditorContent, {
+                actionViewItemProvider: (action, options) => {
+                    if (!(action instanceof MenuItemAction)) {
+                        return undefined;
+                    }
+                    const keybinding = keybindingService.lookupKeybinding(action.id);
+                    if (!keybinding) {
+                        return undefined;
+                    }
+                    return instantiationService.createInstance(class extends MenuEntryActionViewItem {
+                        updateLabel() {
+                            if (this.options.label && this.label) {
+                                this.label.textContent = `${this._commandAction.label} (${keybinding.getLabel()})`;
+                            }
+                        }
+                    }, action, { ...options, keybindingNotRenderedWithLabel: true });
+                },
                 hiddenItemStrategy: 0 /* HiddenItemStrategy.Ignore */,
                 menuOptions: {
-                    arg: editor.getModel()?.uri,
                     shouldForwardArgs: true
                 },
                 telemetrySource: 'editor.overlayToolbar',
@@ -46,6 +63,11 @@ let FloatingEditorToolbar = class FloatingEditorToolbar extends Disposable {
                     primaryGroup: () => true,
                     useSeparatorsInPrimaryActions: true
                 },
+            });
+            reader.store.add(toolbar);
+            reader.store.add(autorun(reader => {
+                const model = editorObs.model.read(reader);
+                toolbar.context = model?.uri;
             }));
             // Overlay widget
             reader.store.add(editorObs.createOverlayWidget({
@@ -61,7 +83,8 @@ let FloatingEditorToolbar = class FloatingEditorToolbar extends Disposable {
 };
 FloatingEditorToolbar = __decorate([
     __param(1, IInstantiationService),
-    __param(2, IMenuService)
+    __param(2, IKeybindingService),
+    __param(3, IMenuService)
 ], FloatingEditorToolbar);
 export { FloatingEditorToolbar };
 //# sourceMappingURL=floatingMenu.js.map

package/esm/vs/editor/contrib/floatingMenu/browser/floatingMenu.js.map

@@ -1 +1 @@
-{"version":3,"sources":["file:///mnt/vss/_work/1/s/dependencies/vscode/out-editor-src/vs/editor/contrib/floatingMenu/browser/floatingMenu.ts","vs/editor/contrib/floatingMenu/browser/floatingMenu.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;AAEhG,OAAO,EAAE,CAAC,EAAE,MAAM,iCAAiC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACtG,OAAO,EAAsB,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAC3G,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4DAA4D,CAAC;AAEnG,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAGzE,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,UAAU;aACpC,OAAE,GAAG,gCAAH,AAAmC,CAAC;IAEtD,YACC,MAAmB,EACI,oBAA2C,EACpD,WAAyB;QAEvC,KAAK,EAAE,CAAC;QAER,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;QAE/D,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACpG,MAAM,cAAc,GAAG,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;QAEzG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAChD,IAAI,WAAW,EAAE,CAAC;gBACjB,OAAO;YACR,CAAC;YAED,MAAM,SAAS,GAAG,CAAC,CAAC,kCAAkC,CAAC,CAAC;YAExD,iEAAiE;YACjE,iEAAiE;YACjE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YAErC,UAAU;YACV,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,cAAc,CAAC,oBAAoB,EAAE,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,aAAa,EAAE;gBAChH,kBAAkB,mCAA2B;gBAC7C,WAAW,EAAE;oBACZ,GAAG,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,GAAG;oBAC3B,iBAAiB,EAAE,IAAI;iBACvB;gBACD,eAAe,EAAE,uBAAuB;gBACxC,cAAc,EAAE;oBACf,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI;oBACxB,6BAA6B,EAAE,IAAI;iBACnC;aACD,CAAC,CAAC,CAAC;YAEJ,iBAAiB;YACjB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,mBAAmB,CAAC;gBAC9C,mBAAmB,EAAE,KAAK;gBAC1B,OAAO,EAAE,SAAS,CAAC,IAAI;gBACvB,mBAAmB,EAAE,eAAe,CAAC,CAAC,CAAC;gBACvC,QAAQ,EAAE,eAAe,CAAC;oBACzB,UAAU,6DAAqD;iBAC/D,CAAC;aACF,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC,CAAC;IACL,CAAC;;AAnDW,qBAAqB;IAK/B,WAAA,qBAAqB,CAAA;IACrB,WAAA,YAAY,CAAA;GANF,qBAAqB,CAoDjC","file":"floatingMenu.js","sourceRoot":"file:///mnt/vss/_work/1/s/dependencies/vscode/out-editor-src","sourcesContent":["/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { h } from '../../../../base/browser/dom.js';\nimport { Disposable } from '../../../../base/common/lifecycle.js';\nimport { autorun, constObservable, observableFromEvent } from '../../../../base/common/observable.js';\nimport { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';\nimport { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';\nimport { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';\nimport { ICodeEditor, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';\nimport { observableCodeEditor } from '../../../browser/observableCodeEditor.js';\nimport { IEditorContribution } from '../../../common/editorCommon.js';\n\nexport class FloatingEditorToolbar extends Disposable implements IEditorContribution {\n\tstatic readonly ID = 'editor.contrib.floatingToolbar';\n\n\tconstructor(\n\t\teditor: ICodeEditor,\n\t\t@IInstantiationService instantiationService: IInstantiationService,\n\t\t@IMenuService menuService: IMenuService\n\t) {\n\t\tsuper();\n\n\t\tconst editorObs = this._register(observableCodeEditor(editor));\n\n\t\tconst menu = this._register(menuService.createMenu(MenuId.EditorContent, editor.contextKeyService));\n\t\tconst menuIsEmptyObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions().length === 0);\n\n\t\tthis._register(autorun(reader => {\n\t\t\tconst menuIsEmpty = menuIsEmptyObs.read(reader);\n\t\t\tif (menuIsEmpty) {\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tconst container = h('div.floating-menu-overlay-widget');\n\n\t\t\t// Set height explicitly to ensure that the floating menu element\n\t\t\t// is rendered in the lower right corner at the correct position.\n\t\t\tcontainer.root.style.height = '28px';\n\n\t\t\t// Toolbar\n\t\t\treader.store.add(instantiationService.createInstance(MenuWorkbenchToolBar, container.root, MenuId.EditorContent, {\n\t\t\t\thiddenItemStrategy: HiddenItemStrategy.Ignore,\n\t\t\t\tmenuOptions: {\n\t\t\t\t\targ: editor.getModel()?.uri,\n\t\t\t\t\tshouldForwardArgs: true\n\t\t\t\t},\n\t\t\t\ttelemetrySource: 'editor.overlayToolbar',\n\t\t\t\ttoolbarOptions: {\n\t\t\t\t\tprimaryGroup: () => true,\n\t\t\t\t\tuseSeparatorsInPrimaryActions: true\n\t\t\t\t},\n\t\t\t}));\n\n\t\t\t// Overlay widget\n\t\t\treader.store.add(editorObs.createOverlayWidget({\n\t\t\t\tallowEditorOverflow: false,\n\t\t\t\tdomNode: container.root,\n\t\t\t\tminContentWidthInPx: constObservable(0),\n\t\t\t\tposition: constObservable({\n\t\t\t\t\tpreference: OverlayWidgetPositionPreference.BOTTOM_RIGHT_CORNER\n\t\t\t\t})\n\t\t\t}));\n\t\t}));\n\t}\n}\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { h } from '../../../../base/browser/dom.js';\nimport { Disposable } from '../../../../base/common/lifecycle.js';\nimport { autorun, constObservable, observableFromEvent } from '../../../../base/common/observable.js';\nimport { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';\nimport { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';\nimport { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';\nimport { ICodeEditor, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';\nimport { observableCodeEditor } from '../../../browser/observableCodeEditor.js';\nimport { IEditorContribution } from '../../../common/editorCommon.js';\n\nexport class FloatingEditorToolbar extends Disposable implements IEditorContribution {\n\tstatic readonly ID = 'editor.contrib.floatingToolbar';\n\n\tconstructor(\n\t\teditor: ICodeEditor,\n\t\t@IInstantiationService instantiationService: IInstantiationService,\n\t\t@IMenuService menuService: IMenuService\n\t) {\n\t\tsuper();\n\n\t\tconst editorObs = this._register(observableCodeEditor(editor));\n\n\t\tconst menu = this._register(menuService.createMenu(MenuId.EditorContent, editor.contextKeyService));\n\t\tconst menuIsEmptyObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions().length === 0);\n\n\t\tthis._register(autorun(reader => {\n\t\t\tconst menuIsEmpty = menuIsEmptyObs.read(reader);\n\t\t\tif (menuIsEmpty) {\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tconst container = h('div.floating-menu-overlay-widget');\n\n\t\t\t// Set height explicitly to ensure that the floating menu element\n\t\t\t// is rendered in the lower right corner at the correct position.\n\t\t\tcontainer.root.style.height = '28px';\n\n\t\t\t// Toolbar\n\t\t\treader.store.add(instantiationService.createInstance(MenuWorkbenchToolBar, container.root, MenuId.EditorContent, {\n\t\t\t\thiddenItemStrategy: HiddenItemStrategy.Ignore,\n\t\t\t\tmenuOptions: {\n\t\t\t\t\targ: editor.getModel()?.uri,\n\t\t\t\t\tshouldForwardArgs: true\n\t\t\t\t},\n\t\t\t\ttelemetrySource: 'editor.overlayToolbar',\n\t\t\t\ttoolbarOptions: {\n\t\t\t\t\tprimaryGroup: () => true,\n\t\t\t\t\tuseSeparatorsInPrimaryActions: true\n\t\t\t\t},\n\t\t\t}));\n\n\t\t\t// Overlay widget\n\t\t\treader.store.add(editorObs.createOverlayWidget({\n\t\t\t\tallowEditorOverflow: false,\n\t\t\t\tdomNode: container.root,\n\t\t\t\tminContentWidthInPx: constObservable(0),\n\t\t\t\tposition: constObservable({\n\t\t\t\t\tpreference: OverlayWidgetPositionPreference.BOTTOM_RIGHT_CORNER\n\t\t\t\t})\n\t\t\t}));\n\t\t}));\n\t}\n}\n"]}
+{"version":3,"sources":["file:///mnt/vss/_work/1/s/dependencies/vscode/out-editor-src/vs/editor/contrib/floatingMenu/browser/floatingMenu.ts","vs/editor/contrib/floatingMenu/browser/floatingMenu.ts"],"names":[],"mappings":"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","file":"floatingMenu.js","sourceRoot":"file:///mnt/vss/_work/1/s/dependencies/vscode/out-editor-src","sourcesContent":["/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { h } from '../../../../base/browser/dom.js';\nimport { Disposable } from '../../../../base/common/lifecycle.js';\nimport { autorun, constObservable, observableFromEvent } from '../../../../base/common/observable.js';\nimport { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';\nimport { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';\nimport { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';\nimport { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';\nimport { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';\nimport { ICodeEditor, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';\nimport { observableCodeEditor } from '../../../browser/observableCodeEditor.js';\nimport { IEditorContribution } from '../../../common/editorCommon.js';\n\nexport class FloatingEditorToolbar extends Disposable implements IEditorContribution {\n\tstatic readonly ID = 'editor.contrib.floatingToolbar';\n\n\tconstructor(\n\t\teditor: ICodeEditor,\n\t\t@IInstantiationService instantiationService: IInstantiationService,\n\t\t@IKeybindingService keybindingService: IKeybindingService,\n\t\t@IMenuService menuService: IMenuService\n\t) {\n\t\tsuper();\n\n\t\tconst editorObs = this._register(observableCodeEditor(editor));\n\n\t\tconst menu = this._register(menuService.createMenu(MenuId.EditorContent, editor.contextKeyService));\n\t\tconst menuIsEmptyObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions().length === 0);\n\n\t\tthis._register(autorun(reader => {\n\t\t\tconst menuIsEmpty = menuIsEmptyObs.read(reader);\n\t\t\tif (menuIsEmpty) {\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tconst container = h('div.floating-menu-overlay-widget');\n\n\t\t\t// Set height explicitly to ensure that the floating menu element\n\t\t\t// is rendered in the lower right corner at the correct position.\n\t\t\tcontainer.root.style.height = '28px';\n\n\t\t\t// Toolbar\n\t\t\tconst toolbar = instantiationService.createInstance(MenuWorkbenchToolBar, container.root, MenuId.EditorContent, {\n\t\t\t\tactionViewItemProvider: (action, options) => {\n\t\t\t\t\tif (!(action instanceof MenuItemAction)) {\n\t\t\t\t\t\treturn undefined;\n\t\t\t\t\t}\n\n\t\t\t\t\tconst keybinding = keybindingService.lookupKeybinding(action.id);\n\t\t\t\t\tif (!keybinding) {\n\t\t\t\t\t\treturn undefined;\n\t\t\t\t\t}\n\n\t\t\t\t\treturn instantiationService.createInstance(class extends MenuEntryActionViewItem {\n\t\t\t\t\t\tprotected override updateLabel(): void {\n\t\t\t\t\t\t\tif (this.options.label && this.label) {\n\t\t\t\t\t\t\t\tthis.label.textContent = `${this._commandAction.label} (${keybinding.getLabel()})`;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}, action, { ...options, keybindingNotRenderedWithLabel: true });\n\t\t\t\t},\n\t\t\t\thiddenItemStrategy: HiddenItemStrategy.Ignore,\n\t\t\t\tmenuOptions: {\n\t\t\t\t\tshouldForwardArgs: true\n\t\t\t\t},\n\t\t\t\ttelemetrySource: 'editor.overlayToolbar',\n\t\t\t\ttoolbarOptions: {\n\t\t\t\t\tprimaryGroup: () => true,\n\t\t\t\t\tuseSeparatorsInPrimaryActions: true\n\t\t\t\t},\n\t\t\t});\n\n\t\t\treader.store.add(toolbar);\n\t\t\treader.store.add(autorun(reader => {\n\t\t\t\tconst model = editorObs.model.read(reader);\n\t\t\t\ttoolbar.context = model?.uri;\n\t\t\t}));\n\n\t\t\t// Overlay widget\n\t\t\treader.store.add(editorObs.createOverlayWidget({\n\t\t\t\tallowEditorOverflow: false,\n\t\t\t\tdomNode: container.root,\n\t\t\t\tminContentWidthInPx: constObservable(0),\n\t\t\t\tposition: constObservable({\n\t\t\t\t\tpreference: OverlayWidgetPositionPreference.BOTTOM_RIGHT_CORNER\n\t\t\t\t})\n\t\t\t}));\n\t\t}));\n\t}\n}\n","/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { h } from '../../../../base/browser/dom.js';\nimport { Disposable } from '../../../../base/common/lifecycle.js';\nimport { autorun, constObservable, observableFromEvent } from '../../../../base/common/observable.js';\nimport { MenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';\nimport { HiddenItemStrategy, MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';\nimport { IMenuService, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';\nimport { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';\nimport { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';\nimport { ICodeEditor, OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';\nimport { observableCodeEditor } from '../../../browser/observableCodeEditor.js';\nimport { IEditorContribution } from '../../../common/editorCommon.js';\n\nexport class FloatingEditorToolbar extends Disposable implements IEditorContribution {\n\tstatic readonly ID = 'editor.contrib.floatingToolbar';\n\n\tconstructor(\n\t\teditor: ICodeEditor,\n\t\t@IInstantiationService instantiationService: IInstantiationService,\n\t\t@IKeybindingService keybindingService: IKeybindingService,\n\t\t@IMenuService menuService: IMenuService\n\t) {\n\t\tsuper();\n\n\t\tconst editorObs = this._register(observableCodeEditor(editor));\n\n\t\tconst menu = this._register(menuService.createMenu(MenuId.EditorContent, editor.contextKeyService));\n\t\tconst menuIsEmptyObs = observableFromEvent(this, menu.onDidChange, () => menu.getActions().length === 0);\n\n\t\tthis._register(autorun(reader => {\n\t\t\tconst menuIsEmpty = menuIsEmptyObs.read(reader);\n\t\t\tif (menuIsEmpty) {\n\t\t\t\treturn;\n\t\t\t}\n\n\t\t\tconst container = h('div.floating-menu-overlay-widget');\n\n\t\t\t// Set height explicitly to ensure that the floating menu element\n\t\t\t// is rendered in the lower right corner at the correct position.\n\t\t\tcontainer.root.style.height = '28px';\n\n\t\t\t// Toolbar\n\t\t\tconst toolbar = instantiationService.createInstance(MenuWorkbenchToolBar, container.root, MenuId.EditorContent, {\n\t\t\t\tactionViewItemProvider: (action, options) => {\n\t\t\t\t\tif (!(action instanceof MenuItemAction)) {\n\t\t\t\t\t\treturn undefined;\n\t\t\t\t\t}\n\n\t\t\t\t\tconst keybinding = keybindingService.lookupKeybinding(action.id);\n\t\t\t\t\tif (!keybinding) {\n\t\t\t\t\t\treturn undefined;\n\t\t\t\t\t}\n\n\t\t\t\t\treturn instantiationService.createInstance(class extends MenuEntryActionViewItem {\n\t\t\t\t\t\tprotected override updateLabel(): void {\n\t\t\t\t\t\t\tif (this.options.label && this.label) {\n\t\t\t\t\t\t\t\tthis.label.textContent = `${this._commandAction.label} (${keybinding.getLabel()})`;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}, action, { ...options, keybindingNotRenderedWithLabel: true });\n\t\t\t\t},\n\t\t\t\thiddenItemStrategy: HiddenItemStrategy.Ignore,\n\t\t\t\tmenuOptions: {\n\t\t\t\t\tshouldForwardArgs: true\n\t\t\t\t},\n\t\t\t\ttelemetrySource: 'editor.overlayToolbar',\n\t\t\t\ttoolbarOptions: {\n\t\t\t\t\tprimaryGroup: () => true,\n\t\t\t\t\tuseSeparatorsInPrimaryActions: true\n\t\t\t\t},\n\t\t\t});\n\n\t\t\treader.store.add(toolbar);\n\t\t\treader.store.add(autorun(reader => {\n\t\t\t\tconst model = editorObs.model.read(reader);\n\t\t\t\ttoolbar.context = model?.uri;\n\t\t\t}));\n\n\t\t\t// Overlay widget\n\t\t\treader.store.add(editorObs.createOverlayWidget({\n\t\t\t\tallowEditorOverflow: false,\n\t\t\t\tdomNode: container.root,\n\t\t\t\tminContentWidthInPx: constObservable(0),\n\t\t\t\tposition: constObservable({\n\t\t\t\t\tpreference: OverlayWidgetPositionPreference.BOTTOM_RIGHT_CORNER\n\t\t\t\t})\n\t\t\t}));\n\t\t}));\n\t}\n}\n"]}

package/esm/vs/editor/contrib/folding/browser/folding.js

@@ -507,7 +507,7 @@ class UnfoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfold',
-            label: nls.localize2(975, "Unfold"),
+            label: nls.localize2(976, "Unfold"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -568,7 +568,7 @@ class UnFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldRecursively',
-            label: nls.localize2(976, "Unfold Recursively"),
+            label: nls.localize2(977, "Unfold Recursively"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -585,7 +585,7 @@ class FoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.fold',
-            label: nls.localize2(977, "Fold"),
+            label: nls.localize2(978, "Fold"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -652,7 +652,7 @@ class ToggleFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleFold',
-            label: nls.localize2(978, "Toggle Fold"),
+            label: nls.localize2(979, "Toggle Fold"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -670,7 +670,7 @@ class FoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldRecursively',
-            label: nls.localize2(979, "Fold Recursively"),
+            label: nls.localize2(980, "Fold Recursively"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -688,7 +688,7 @@ class ToggleFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleFoldRecursively',
-            label: nls.localize2(980, "Toggle Fold Recursively"),
+            label: nls.localize2(981, "Toggle Fold Recursively"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -706,7 +706,7 @@ class FoldAllBlockCommentsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllBlockComments',
-            label: nls.localize2(981, "Fold All Block Comments"),
+            label: nls.localize2(982, "Fold All Block Comments"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -736,7 +736,7 @@ class FoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllMarkerRegions',
-            label: nls.localize2(982, "Fold All Regions"),
+            label: nls.localize2(983, "Fold All Regions"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -766,7 +766,7 @@ class UnfoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllMarkerRegions',
-            label: nls.localize2(983, "Unfold All Regions"),
+            label: nls.localize2(984, "Unfold All Regions"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -796,7 +796,7 @@ class FoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllExcept',
-            label: nls.localize2(984, "Fold All Except Selected"),
+            label: nls.localize2(985, "Fold All Except Selected"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -814,7 +814,7 @@ class UnfoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllExcept',
-            label: nls.localize2(985, "Unfold All Except Selected"),
+            label: nls.localize2(986, "Unfold All Except Selected"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -832,7 +832,7 @@ class FoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAll',
-            label: nls.localize2(986, "Fold All"),
+            label: nls.localize2(987, "Fold All"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -849,7 +849,7 @@ class UnfoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAll',
-            label: nls.localize2(987, "Unfold All"),
+            label: nls.localize2(988, "Unfold All"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -877,7 +877,7 @@ class GotoParentFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoParentFold',
-            label: nls.localize2(988, "Go to Parent Fold"),
+            label: nls.localize2(989, "Go to Parent Fold"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -905,7 +905,7 @@ class GotoPreviousFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoPreviousFold',
-            label: nls.localize2(989, "Go to Previous Folding Range"),
+            label: nls.localize2(990, "Go to Previous Folding Range"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -933,7 +933,7 @@ class GotoNextFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoNextFold',
-            label: nls.localize2(990, "Go to Next Folding Range"),
+            label: nls.localize2(991, "Go to Next Folding Range"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -960,7 +960,7 @@ class FoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.createFoldingRangeFromSelection',
-            label: nls.localize2(991, "Create Folding Range from Selection"),
+            label: nls.localize2(992, "Create Folding Range from Selection"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1008,7 +1008,7 @@ class RemoveFoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.removeManualFoldingRanges',
-            label: nls.localize2(992, "Remove Manual Folding Ranges"),
+            label: nls.localize2(993, "Remove Manual Folding Ranges"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1034,7 +1034,7 @@ class ToggleImportFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleImportFold',
-            label: nls.localize2(993, "Toggle Import Fold"),
+            label: nls.localize2(994, "Toggle Import Fold"),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1077,7 +1077,7 @@ registerEditorAction(ToggleImportFoldAction);
 for (let i = 1; i <= 7; i++) {
     registerInstantiatedEditorAction(new FoldLevelAction({
         id: FoldLevelAction.ID(i),
-        label: nls.localize2(994, "Fold Level {0}", i),
+        label: nls.localize2(995, "Fold Level {0}", i),
         precondition: CONTEXT_FOLDING_ENABLED,
         kbOpts: {
             kbExpr: EditorContextKeys.editorTextFocus,

package/esm/vs/editor/contrib/folding/browser/foldingDecorations.js

@@ -9,16 +9,16 @@ import { editorSelectionBackground, iconForeground, registerColor, transparent }
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-const foldBackground = registerColor('editor.foldBackground', { light: transparent(editorSelectionBackground, 0.3), dark: transparent(editorSelectionBackground, 0.3), hcDark: null, hcLight: null }, localize(995, "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."), true);
-registerColor('editor.foldPlaceholderForeground', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, localize(996, "Color of the collapsed text after the first line of a folded range."));
-registerColor('editorGutter.foldingControlForeground', iconForeground, localize(997, 'Color of the folding control in the editor gutter.'));
-export const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, localize(998, 'Icon for expanded ranges in the editor glyph margin.'));
-export const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, localize(999, 'Icon for collapsed ranges in the editor glyph margin.'));
-export const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, localize(1000, 'Icon for manually collapsed ranges in the editor glyph margin.'));
-export const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, localize(1001, 'Icon for manually expanded ranges in the editor glyph margin.'));
+const foldBackground = registerColor('editor.foldBackground', { light: transparent(editorSelectionBackground, 0.3), dark: transparent(editorSelectionBackground, 0.3), hcDark: null, hcLight: null }, localize(996, "Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations."), true);
+registerColor('editor.foldPlaceholderForeground', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, localize(997, "Color of the collapsed text after the first line of a folded range."));
+registerColor('editorGutter.foldingControlForeground', iconForeground, localize(998, 'Color of the folding control in the editor gutter.'));
+export const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, localize(999, 'Icon for expanded ranges in the editor glyph margin.'));
+export const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, localize(1000, 'Icon for collapsed ranges in the editor glyph margin.'));
+export const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, localize(1001, 'Icon for manually collapsed ranges in the editor glyph margin.'));
+export const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, localize(1002, 'Icon for manually expanded ranges in the editor glyph margin.'));
 const foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: 1 /* MinimapPosition.Inline */ };
-const collapsed = localize(1002, "Click to expand the range.");
-const expanded = localize(1003, "Click to collapse the range.");
+const collapsed = localize(1003, "Click to expand the range.");
+const expanded = localize(1004, "Click to collapse the range.");
 export class FoldingDecorationProvider {
     static { this.COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-collapsed-visual-decoration',

package/esm/vs/editor/contrib/folding/browser/foldingDecorations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["vs/editor/contrib/folding/browser/foldingDecorations.ts"],"names":[],"mappings":"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","file":"foldingDecorations.js","sourceRoot":"file:///mnt/vss/_work/1/s/dependencies/vscode/out-editor-src","sourcesContent":["/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { Codicon } from '../../../../base/common/codicons.js';\nimport { ICodeEditor } from '../../../browser/editorBrowser.js';\nimport { IModelDecorationOptions, IModelDecorationsChangeAccessor, MinimapPosition, TrackedRangeStickiness } from '../../../common/model.js';\nimport { ModelDecorationOptions } from '../../../common/model/textModel.js';\nimport { IDecorationProvider } from './foldingModel.js';\nimport { localize } from '../../../../nls.js';\nimport { editorSelectionBackground, iconForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';\nimport { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';\nimport { themeColorFromId } from '../../../../platform/theme/common/themeService.js';\nimport { ThemeIcon } from '../../../../base/common/themables.js';\n\nconst foldBackground = registerColor('editor.foldBackground', { light: transparent(editorSelectionBackground, 0.3), dark: transparent(editorSelectionBackground, 0.3), hcDark: null, hcLight: null }, localize('foldBackgroundBackground', \"Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations.\"), true);\nregisterColor('editor.foldPlaceholderForeground', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, localize('collapsedTextColor', \"Color of the collapsed text after the first line of a folded range.\"));\nregisterColor('editorGutter.foldingControlForeground', iconForeground, localize('editorGutter.foldingControlForeground', 'Color of the folding control in the editor gutter.'));\n\nexport const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, localize('foldingExpandedIcon', 'Icon for expanded ranges in the editor glyph margin.'));\nexport const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, localize('foldingCollapsedIcon', 'Icon for collapsed ranges in the editor glyph margin.'));\nexport const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, localize('foldingManualCollapedIcon', 'Icon for manually collapsed ranges in the editor glyph margin.'));\nexport const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, localize('foldingManualExpandedIcon', 'Icon for manually expanded ranges in the editor glyph margin.'));\n\nconst foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: MinimapPosition.Inline };\n\nconst collapsed = localize('linesCollapsed', \"Click to expand the range.\");\nconst expanded = localize('linesExpanded', \"Click to collapse the range.\");\n\nexport class FoldingDecorationProvider implements IDecorationProvider {\n\n\tprivate static readonly COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-collapsed-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingCollapsedIcon),\n\t});\n\n\tprivate static readonly COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-collapsed-highlighted-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tclassName: 'folded-background',\n\t\tminimap: foldedBackgroundMinimap,\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingCollapsedIcon)\n\t});\n\n\tprivate static readonly MANUALLY_COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-manually-collapsed-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingManualCollapsedIcon)\n\t});\n\n\tprivate static readonly MANUALLY_COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-manually-collapsed-highlighted-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tclassName: 'folded-background',\n\t\tminimap: foldedBackgroundMinimap,\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingManualCollapsedIcon)\n\t});\n\n\tprivate static readonly NO_CONTROLS_COLLAPSED_RANGE_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-no-controls-range-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t});\n\n\tprivate static readonly NO_CONTROLS_COLLAPSED_HIGHLIGHTED_RANGE_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-no-controls-range-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tclassName: 'folded-background',\n\t\tminimap: foldedBackgroundMinimap,\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t});\n\n\tprivate static readonly EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-expanded-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,\n\t\tisWholeLine: true,\n\t\tfirstLineDecorationClassName: 'alwaysShowFoldIcons ' + ThemeIcon.asClassName(foldingExpandedIcon),\n\t\tlinesDecorationsTooltip: expanded,\n\t});\n\n\tprivate static readonly EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-expanded-auto-hide-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,\n\t\tisWholeLine: true,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingExpandedIcon),\n\t\tlinesDecorationsTooltip: expanded,\n\t});\n\n\tprivate static readonly MANUALLY_EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-manually-expanded-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tisWholeLine: true,\n\t\tfirstLineDecorationClassName: 'alwaysShowFoldIcons ' + ThemeIcon.asClassName(foldingManualExpandedIcon),\n\t\tlinesDecorationsTooltip: expanded,\n\t});\n\n\tprivate static readonly MANUALLY_EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-manually-expanded-auto-hide-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tisWholeLine: true,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingManualExpandedIcon),\n\t\tlinesDecorationsTooltip: expanded,\n\t});\n\n\tprivate static readonly NO_CONTROLS_EXPANDED_RANGE_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-no-controls-range-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tisWholeLine: true\n\t});\n\n\tprivate static readonly HIDDEN_RANGE_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-hidden-range-decoration',\n\t\tstickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges\n\t});\n\n\tpublic showFoldingControls: 'always' | 'never' | 'mouseover' = 'mouseover';\n\n\tpublic showFoldingHighlights: boolean = true;\n\n\tconstructor(private readonly editor: ICodeEditor) {\n\t}\n\n\tgetDecorationOption(isCollapsed: boolean, isHidden: boolean, isManual: boolean): IModelDecorationOptions {\n\t\tif (isHidden) { // is inside another collapsed region\n\t\t\treturn FoldingDecorationProvider.HIDDEN_RANGE_DECORATION;\n\t\t}\n\t\tif (this.showFoldingControls === 'never') {\n\t\t\tif (isCollapsed) {\n\t\t\t\treturn this.showFoldingHighlights ? FoldingDecorationProvider.NO_CONTROLS_COLLAPSED_HIGHLIGHTED_RANGE_DECORATION : FoldingDecorationProvider.NO_CONTROLS_COLLAPSED_RANGE_DECORATION;\n\t\t\t}\n\t\t\treturn FoldingDecorationProvider.NO_CONTROLS_EXPANDED_RANGE_DECORATION;\n\t\t}\n\t\tif (isCollapsed) {\n\t\t\treturn isManual ?\n\t\t\t\t(this.showFoldingHighlights ? FoldingDecorationProvider.MANUALLY_COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION : FoldingDecorationProvider.MANUALLY_COLLAPSED_VISUAL_DECORATION)\n\t\t\t\t: (this.showFoldingHighlights ? FoldingDecorationProvider.COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION : FoldingDecorationProvider.COLLAPSED_VISUAL_DECORATION);\n\t\t} else if (this.showFoldingControls === 'mouseover') {\n\t\t\treturn isManual ? FoldingDecorationProvider.MANUALLY_EXPANDED_AUTO_HIDE_VISUAL_DECORATION : FoldingDecorationProvider.EXPANDED_AUTO_HIDE_VISUAL_DECORATION;\n\t\t} else {\n\t\t\treturn isManual ? FoldingDecorationProvider.MANUALLY_EXPANDED_VISUAL_DECORATION : FoldingDecorationProvider.EXPANDED_VISUAL_DECORATION;\n\t\t}\n\t}\n\n\tchangeDecorations<T>(callback: (changeAccessor: IModelDecorationsChangeAccessor) => T): T {\n\t\treturn this.editor.changeDecorations(callback);\n\t}\n\n\tremoveDecorations(decorationIds: string[]): void {\n\t\tthis.editor.removeDecorations(decorationIds);\n\t}\n}\n"]}
+{"version":3,"sources":["vs/editor/contrib/folding/browser/foldingDecorations.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAG9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,yBAAyB,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oDAAoD,CAAC;AAC3I,OAAO,EAAE,YAAY,EAAE,MAAM,mDAAmD,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AAEjE,MAAM,cAAc,GAAG,aAAa,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,yBAAyB,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,yBAAyB,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,QAAQ,CAAC,GAA0B,EAAE,+GAA+G,CAAC,EAAE,IAAI,CAAC,CAAC;AACnW,aAAa,CAAC,kCAAkC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,QAAQ,CAAC,GAAoB,EAAE,qEAAqE,CAAC,CAAC,CAAC;AAC7N,aAAa,CAAC,uCAAuC,EAAE,cAAc,EAAE,QAAQ,CAAC,GAAuC,EAAE,oDAAoD,CAAC,CAAC,CAAC;AAEhL,MAAM,CAAC,MAAM,mBAAmB,GAAG,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAqB,EAAE,sDAAsD,CAAC,CAAC,CAAC;AAClL,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,IAAsB,EAAE,uDAAuD,CAAC,CAAC,CAAC;AACvL,MAAM,CAAC,MAAM,0BAA0B,GAAG,YAAY,CAAC,0BAA0B,EAAE,oBAAoB,EAAE,QAAQ,CAAC,IAA2B,EAAE,gEAAgE,CAAC,CAAC,CAAC;AAClN,MAAM,CAAC,MAAM,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,EAAE,mBAAmB,EAAE,QAAQ,CAAC,IAA2B,EAAE,+DAA+D,CAAC,CAAC,CAAC;AAE9M,MAAM,uBAAuB,GAAG,EAAE,KAAK,EAAE,gBAAgB,CAAC,cAAc,CAAC,EAAE,QAAQ,gCAAwB,EAAE,CAAC;AAE9G,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAgB,EAAE,4BAA4B,CAAC,CAAC;AAC3E,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAe,EAAE,8BAA8B,CAAC,CAAC;AAE3E,MAAM,OAAO,yBAAyB;aAEb,gCAA2B,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QACrF,WAAW,EAAE,qCAAqC;QAClD,UAAU,6DAAqD;QAC/D,qBAAqB,EAAE,eAAe;QACtC,WAAW,EAAE,IAAI;QACjB,uBAAuB,EAAE,SAAS;QAClC,4BAA4B,EAAE,SAAS,CAAC,WAAW,CAAC,oBAAoB,CAAC;KACzE,CAPkD,AAOjD,CAAC;aAEqB,4CAAuC,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QACjG,WAAW,EAAE,iDAAiD;QAC9D,UAAU,6DAAqD;QAC/D,qBAAqB,EAAE,eAAe;QACtC,SAAS,EAAE,mBAAmB;QAC9B,OAAO,EAAE,uBAAuB;QAChC,WAAW,EAAE,IAAI;QACjB,uBAAuB,EAAE,SAAS;QAClC,4BAA4B,EAAE,SAAS,CAAC,WAAW,CAAC,oBAAoB,CAAC;KACzE,CAT8D,AAS7D,CAAC;aAEqB,yCAAoC,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QAC9F,WAAW,EAAE,8CAA8C;QAC3D,UAAU,6DAAqD;QAC/D,qBAAqB,EAAE,eAAe;QACtC,WAAW,EAAE,IAAI;QACjB,uBAAuB,EAAE,SAAS;QAClC,4BAA4B,EAAE,SAAS,CAAC,WAAW,CAAC,0BAA0B,CAAC;KAC/E,CAP2D,AAO1D,CAAC;aAEqB,qDAAgD,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QAC1G,WAAW,EAAE,0DAA0D;QACvE,UAAU,6DAAqD;QAC/D,qBAAqB,EAAE,eAAe;QACtC,SAAS,EAAE,mBAAmB;QAC9B,OAAO,EAAE,uBAAuB;QAChC,WAAW,EAAE,IAAI;QACjB,uBAAuB,EAAE,SAAS;QAClC,4BAA4B,EAAE,SAAS,CAAC,WAAW,CAAC,0BAA0B,CAAC;KAC/E,CATuE,AAStE,CAAC;aAEqB,2CAAsC,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QAChG,WAAW,EAAE,sCAAsC;QACnD,UAAU,6DAAqD;QAC/D,qBAAqB,EAAE,eAAe;QACtC,WAAW,EAAE,IAAI;QACjB,uBAAuB,EAAE,SAAS;KAClC,CAN6D,AAM5D,CAAC;aAEqB,uDAAkD,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QAC5G,WAAW,EAAE,sCAAsC;QACnD,UAAU,6DAAqD;QAC/D,qBAAqB,EAAE,eAAe;QACtC,SAAS,EAAE,mBAAmB;QAC9B,OAAO,EAAE,uBAAuB;QAChC,WAAW,EAAE,IAAI;QACjB,uBAAuB,EAAE,SAAS;KAClC,CARyE,AAQxE,CAAC;aAEqB,+BAA0B,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QACpF,WAAW,EAAE,oCAAoC;QACjD,UAAU,4DAAoD;QAC9D,WAAW,EAAE,IAAI;QACjB,4BAA4B,EAAE,sBAAsB,GAAG,SAAS,CAAC,WAAW,CAAC,mBAAmB,CAAC;QACjG,uBAAuB,EAAE,QAAQ;KACjC,CANiD,AAMhD,CAAC;aAEqB,yCAAoC,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QAC9F,WAAW,EAAE,8CAA8C;QAC3D,UAAU,4DAAoD;QAC9D,WAAW,EAAE,IAAI;QACjB,4BAA4B,EAAE,SAAS,CAAC,WAAW,CAAC,mBAAmB,CAAC;QACxE,uBAAuB,EAAE,QAAQ;KACjC,CAN2D,AAM1D,CAAC;aAEqB,wCAAmC,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QAC7F,WAAW,EAAE,6CAA6C;QAC1D,UAAU,6DAAqD;QAC/D,WAAW,EAAE,IAAI;QACjB,4BAA4B,EAAE,sBAAsB,GAAG,SAAS,CAAC,WAAW,CAAC,yBAAyB,CAAC;QACvG,uBAAuB,EAAE,QAAQ;KACjC,CAN0D,AAMzD,CAAC;aAEqB,kDAA6C,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QACvG,WAAW,EAAE,uDAAuD;QACpE,UAAU,6DAAqD;QAC/D,WAAW,EAAE,IAAI;QACjB,4BAA4B,EAAE,SAAS,CAAC,WAAW,CAAC,yBAAyB,CAAC;QAC9E,uBAAuB,EAAE,QAAQ;KACjC,CANoE,AAMnE,CAAC;aAEqB,0CAAqC,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QAC/F,WAAW,EAAE,sCAAsC;QACnD,UAAU,6DAAqD;QAC/D,WAAW,EAAE,IAAI;KACjB,CAJ4D,AAI3D,CAAC;aAEqB,4BAAuB,GAAG,sBAAsB,CAAC,QAAQ,CAAC;QACjF,WAAW,EAAE,iCAAiC;QAC9C,UAAU,4DAAoD;KAC9D,CAH8C,AAG7C,CAAC;IAMH,YAA6B,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QAJzC,wBAAmB,GAAqC,WAAW,CAAC;QAEpE,0BAAqB,GAAY,IAAI,CAAC;IAG7C,CAAC;IAED,mBAAmB,CAAC,WAAoB,EAAE,QAAiB,EAAE,QAAiB;QAC7E,IAAI,QAAQ,EAAE,CAAC,CAAC,qCAAqC;YACpD,OAAO,yBAAyB,CAAC,uBAAuB,CAAC;QAC1D,CAAC;QACD,IAAI,IAAI,CAAC,mBAAmB,KAAK,OAAO,EAAE,CAAC;YAC1C,IAAI,WAAW,EAAE,CAAC;gBACjB,OAAO,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,yBAAyB,CAAC,kDAAkD,CAAC,CAAC,CAAC,yBAAyB,CAAC,sCAAsC,CAAC;YACrL,CAAC;YACD,OAAO,yBAAyB,CAAC,qCAAqC,CAAC;QACxE,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YACjB,OAAO,QAAQ,CAAC,CAAC;gBAChB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,yBAAyB,CAAC,gDAAgD,CAAC,CAAC,CAAC,yBAAyB,CAAC,oCAAoC,CAAC;gBAC1K,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,yBAAyB,CAAC,uCAAuC,CAAC,CAAC,CAAC,yBAAyB,CAAC,2BAA2B,CAAC,CAAC;QAC7J,CAAC;aAAM,IAAI,IAAI,CAAC,mBAAmB,KAAK,WAAW,EAAE,CAAC;YACrD,OAAO,QAAQ,CAAC,CAAC,CAAC,yBAAyB,CAAC,6CAA6C,CAAC,CAAC,CAAC,yBAAyB,CAAC,oCAAoC,CAAC;QAC5J,CAAC;aAAM,CAAC;YACP,OAAO,QAAQ,CAAC,CAAC,CAAC,yBAAyB,CAAC,mCAAmC,CAAC,CAAC,CAAC,yBAAyB,CAAC,0BAA0B,CAAC;QACxI,CAAC;IACF,CAAC;IAED,iBAAiB,CAAI,QAAgE;QACpF,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,iBAAiB,CAAC,aAAuB;QACxC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAC9C,CAAC","file":"foldingDecorations.js","sourceRoot":"file:///mnt/vss/_work/1/s/dependencies/vscode/out-editor-src","sourcesContent":["/*---------------------------------------------------------------------------------------------\n *  Copyright (c) Microsoft Corporation. All rights reserved.\n *  Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { Codicon } from '../../../../base/common/codicons.js';\nimport { ICodeEditor } from '../../../browser/editorBrowser.js';\nimport { IModelDecorationOptions, IModelDecorationsChangeAccessor, MinimapPosition, TrackedRangeStickiness } from '../../../common/model.js';\nimport { ModelDecorationOptions } from '../../../common/model/textModel.js';\nimport { IDecorationProvider } from './foldingModel.js';\nimport { localize } from '../../../../nls.js';\nimport { editorSelectionBackground, iconForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';\nimport { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';\nimport { themeColorFromId } from '../../../../platform/theme/common/themeService.js';\nimport { ThemeIcon } from '../../../../base/common/themables.js';\n\nconst foldBackground = registerColor('editor.foldBackground', { light: transparent(editorSelectionBackground, 0.3), dark: transparent(editorSelectionBackground, 0.3), hcDark: null, hcLight: null }, localize('foldBackgroundBackground', \"Background color behind folded ranges. The color must not be opaque so as not to hide underlying decorations.\"), true);\nregisterColor('editor.foldPlaceholderForeground', { light: '#808080', dark: '#808080', hcDark: null, hcLight: null }, localize('collapsedTextColor', \"Color of the collapsed text after the first line of a folded range.\"));\nregisterColor('editorGutter.foldingControlForeground', iconForeground, localize('editorGutter.foldingControlForeground', 'Color of the folding control in the editor gutter.'));\n\nexport const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, localize('foldingExpandedIcon', 'Icon for expanded ranges in the editor glyph margin.'));\nexport const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, localize('foldingCollapsedIcon', 'Icon for collapsed ranges in the editor glyph margin.'));\nexport const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, localize('foldingManualCollapedIcon', 'Icon for manually collapsed ranges in the editor glyph margin.'));\nexport const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, localize('foldingManualExpandedIcon', 'Icon for manually expanded ranges in the editor glyph margin.'));\n\nconst foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: MinimapPosition.Inline };\n\nconst collapsed = localize('linesCollapsed', \"Click to expand the range.\");\nconst expanded = localize('linesExpanded', \"Click to collapse the range.\");\n\nexport class FoldingDecorationProvider implements IDecorationProvider {\n\n\tprivate static readonly COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-collapsed-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingCollapsedIcon),\n\t});\n\n\tprivate static readonly COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-collapsed-highlighted-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tclassName: 'folded-background',\n\t\tminimap: foldedBackgroundMinimap,\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingCollapsedIcon)\n\t});\n\n\tprivate static readonly MANUALLY_COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-manually-collapsed-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingManualCollapsedIcon)\n\t});\n\n\tprivate static readonly MANUALLY_COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-manually-collapsed-highlighted-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tclassName: 'folded-background',\n\t\tminimap: foldedBackgroundMinimap,\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingManualCollapsedIcon)\n\t});\n\n\tprivate static readonly NO_CONTROLS_COLLAPSED_RANGE_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-no-controls-range-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t});\n\n\tprivate static readonly NO_CONTROLS_COLLAPSED_HIGHLIGHTED_RANGE_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-no-controls-range-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tafterContentClassName: 'inline-folded',\n\t\tclassName: 'folded-background',\n\t\tminimap: foldedBackgroundMinimap,\n\t\tisWholeLine: true,\n\t\tlinesDecorationsTooltip: collapsed,\n\t});\n\n\tprivate static readonly EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-expanded-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,\n\t\tisWholeLine: true,\n\t\tfirstLineDecorationClassName: 'alwaysShowFoldIcons ' + ThemeIcon.asClassName(foldingExpandedIcon),\n\t\tlinesDecorationsTooltip: expanded,\n\t});\n\n\tprivate static readonly EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-expanded-auto-hide-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,\n\t\tisWholeLine: true,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingExpandedIcon),\n\t\tlinesDecorationsTooltip: expanded,\n\t});\n\n\tprivate static readonly MANUALLY_EXPANDED_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-manually-expanded-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tisWholeLine: true,\n\t\tfirstLineDecorationClassName: 'alwaysShowFoldIcons ' + ThemeIcon.asClassName(foldingManualExpandedIcon),\n\t\tlinesDecorationsTooltip: expanded,\n\t});\n\n\tprivate static readonly MANUALLY_EXPANDED_AUTO_HIDE_VISUAL_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-manually-expanded-auto-hide-visual-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tisWholeLine: true,\n\t\tfirstLineDecorationClassName: ThemeIcon.asClassName(foldingManualExpandedIcon),\n\t\tlinesDecorationsTooltip: expanded,\n\t});\n\n\tprivate static readonly NO_CONTROLS_EXPANDED_RANGE_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-no-controls-range-decoration',\n\t\tstickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,\n\t\tisWholeLine: true\n\t});\n\n\tprivate static readonly HIDDEN_RANGE_DECORATION = ModelDecorationOptions.register({\n\t\tdescription: 'folding-hidden-range-decoration',\n\t\tstickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges\n\t});\n\n\tpublic showFoldingControls: 'always' | 'never' | 'mouseover' = 'mouseover';\n\n\tpublic showFoldingHighlights: boolean = true;\n\n\tconstructor(private readonly editor: ICodeEditor) {\n\t}\n\n\tgetDecorationOption(isCollapsed: boolean, isHidden: boolean, isManual: boolean): IModelDecorationOptions {\n\t\tif (isHidden) { // is inside another collapsed region\n\t\t\treturn FoldingDecorationProvider.HIDDEN_RANGE_DECORATION;\n\t\t}\n\t\tif (this.showFoldingControls === 'never') {\n\t\t\tif (isCollapsed) {\n\t\t\t\treturn this.showFoldingHighlights ? FoldingDecorationProvider.NO_CONTROLS_COLLAPSED_HIGHLIGHTED_RANGE_DECORATION : FoldingDecorationProvider.NO_CONTROLS_COLLAPSED_RANGE_DECORATION;\n\t\t\t}\n\t\t\treturn FoldingDecorationProvider.NO_CONTROLS_EXPANDED_RANGE_DECORATION;\n\t\t}\n\t\tif (isCollapsed) {\n\t\t\treturn isManual ?\n\t\t\t\t(this.showFoldingHighlights ? FoldingDecorationProvider.MANUALLY_COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION : FoldingDecorationProvider.MANUALLY_COLLAPSED_VISUAL_DECORATION)\n\t\t\t\t: (this.showFoldingHighlights ? FoldingDecorationProvider.COLLAPSED_HIGHLIGHTED_VISUAL_DECORATION : FoldingDecorationProvider.COLLAPSED_VISUAL_DECORATION);\n\t\t} else if (this.showFoldingControls === 'mouseover') {\n\t\t\treturn isManual ? FoldingDecorationProvider.MANUALLY_EXPANDED_AUTO_HIDE_VISUAL_DECORATION : FoldingDecorationProvider.EXPANDED_AUTO_HIDE_VISUAL_DECORATION;\n\t\t} else {\n\t\t\treturn isManual ? FoldingDecorationProvider.MANUALLY_EXPANDED_VISUAL_DECORATION : FoldingDecorationProvider.EXPANDED_VISUAL_DECORATION;\n\t\t}\n\t}\n\n\tchangeDecorations<T>(callback: (changeAccessor: IModelDecorationsChangeAccessor) => T): T {\n\t\treturn this.editor.changeDecorations(callback);\n\t}\n\n\tremoveDecorations(decorationIds: string[]): void {\n\t\tthis.editor.removeDecorations(decorationIds);\n\t}\n}\n"]}

package/esm/vs/editor/contrib/fontZoom/browser/fontZoom.js

@@ -9,7 +9,7 @@ class EditorFontZoomIn extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomIn',
-            label: nls.localize2(1004, "Increase Editor Font Size"),
+            label: nls.localize2(1005, "Increase Editor Font Size"),
             precondition: undefined
         });
     }
@@ -21,7 +21,7 @@ class EditorFontZoomOut extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomOut',
-            label: nls.localize2(1005, "Decrease Editor Font Size"),
+            label: nls.localize2(1006, "Decrease Editor Font Size"),
             precondition: undefined
         });
     }
@@ -33,7 +33,7 @@ class EditorFontZoomReset extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomReset',
-            label: nls.localize2(1006, "Reset Editor Font Size"),
+            label: nls.localize2(1007, "Reset Editor Font Size"),
             precondition: undefined
         });
     }

package/esm/vs/editor/contrib/format/browser/format.js

@@ -178,6 +178,9 @@ export async function formatDocumentRangesWithProvider(accessor, provider, edito
                 allEdits.push(...minimalEdits);
             }
         }
+        if (cts.token.isCancellationRequested) {
+            return true;
+        }
     }
     finally {
         cts.dispose();