@codingame/monaco-vscode-api 15.0.2 → 16.0.0

package/vscode/src/vs/editor/contrib/find/browser/findWidget.css

@@ -0,0 +1,223 @@
+.monaco-editor .find-widget {
+	position: absolute;
+	z-index: 35;
+	height: 33px;
+	overflow: hidden;
+	line-height: 19px;
+	transition: transform 200ms linear;
+	padding: 0 4px;
+	box-sizing: border-box;
+	transform: translateY(calc(-100% - 10px));
+	box-shadow: 0 0 8px 2px var(--vscode-widget-shadow);
+	color: var(--vscode-editorWidget-foreground);
+	border-left: 1px solid var(--vscode-widget-border);
+	border-right: 1px solid var(--vscode-widget-border);
+	border-bottom: 1px solid var(--vscode-widget-border);
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
+	background-color: var(--vscode-editorWidget-background);
+}
+.monaco-workbench.reduce-motion .monaco-editor .find-widget {
+	transition: transform 0ms linear;
+}
+.monaco-editor .find-widget textarea {
+	margin: 0px;
+}
+.monaco-editor .find-widget.hiddenEditor {
+	display: none;
+}
+.monaco-editor .find-widget.replaceToggled > .replace-part {
+	display: flex;
+}
+.monaco-editor .find-widget.visible  {
+	transform: translateY(0);
+}
+.monaco-editor .find-widget .monaco-inputbox.synthetic-focus {
+	outline: 1px solid -webkit-focus-ring-color;
+	outline-offset: -1px;
+	outline-color: var(--vscode-focusBorder);
+}
+.monaco-editor .find-widget .monaco-inputbox .input {
+	background-color: transparent;
+	min-height: 0;
+}
+.monaco-editor .find-widget .monaco-findInput .input {
+	font-size: 13px;
+}
+.monaco-editor .find-widget > .find-part,
+.monaco-editor .find-widget > .replace-part {
+	margin: 3px 25px 0 17px;
+	font-size: 12px;
+	display: flex;
+}
+.monaco-editor .find-widget > .find-part .monaco-inputbox,
+.monaco-editor .find-widget > .replace-part .monaco-inputbox {
+	min-height: 25px;
+}
+.monaco-editor .find-widget > .replace-part .monaco-inputbox > .ibwrapper > .mirror {
+	padding-right: 22px;
+}
+.monaco-editor .find-widget > .find-part .monaco-inputbox > .ibwrapper > .input,
+.monaco-editor .find-widget > .find-part .monaco-inputbox > .ibwrapper > .mirror,
+.monaco-editor .find-widget > .replace-part .monaco-inputbox > .ibwrapper > .input,
+.monaco-editor .find-widget > .replace-part .monaco-inputbox > .ibwrapper > .mirror {
+	padding-top: 2px;
+	padding-bottom: 2px;
+}
+.monaco-editor .find-widget > .find-part .find-actions {
+	height: 25px;
+	display: flex;
+	align-items: center;
+}
+.monaco-editor .find-widget > .replace-part .replace-actions {
+	height: 25px;
+	display: flex;
+	align-items: center;
+}
+.monaco-editor .find-widget .monaco-findInput {
+	vertical-align: middle;
+	display: flex;
+	flex:1;
+}
+.monaco-editor .find-widget .monaco-findInput .monaco-scrollable-element {
+	width: 100%;
+}
+.monaco-editor .find-widget .monaco-findInput .monaco-scrollable-element .scrollbar.vertical {
+	opacity: 0;
+}
+.monaco-editor .find-widget .matchesCount {
+	display: flex;
+	flex: initial;
+	margin: 0 0 0 3px;
+	padding: 2px 0 0 2px;
+	height: 25px;
+	vertical-align: middle;
+	box-sizing: border-box;
+	text-align: center;
+	line-height: 23px;
+}
+.monaco-editor .find-widget .button {
+	width: 16px;
+	height: 16px;
+	padding: 3px;
+	border-radius: 5px;
+	display: flex;
+	flex: initial;
+	margin-left: 3px;
+	background-position: center center;
+	background-repeat: no-repeat;
+	cursor: pointer;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.monaco-editor .find-widget .codicon-find-selection {
+	width: 22px;
+	height: 22px;
+	padding: 3px;
+	border-radius: 5px;
+}
+.monaco-editor .find-widget .button.left {
+	margin-left: 0;
+	margin-right: 3px;
+}
+.monaco-editor .find-widget .button.wide {
+	width: auto;
+	padding: 1px 6px;
+	top: -1px;
+}
+.monaco-editor .find-widget .button.toggle {
+	position: absolute;
+	top: 0;
+	left: 3px;
+	width: 18px;
+	height: 100%;
+	border-radius: 0;
+	box-sizing: border-box;
+}
+.monaco-editor .find-widget .button.toggle.disabled {
+	display: none;
+}
+.monaco-editor .find-widget .disabled {
+	color: var(--vscode-disabledForeground);
+	cursor: default;
+}
+.monaco-editor .find-widget > .replace-part {
+	display: none;
+}
+.monaco-editor .find-widget > .replace-part > .monaco-findInput {
+	position: relative;
+	display: flex;
+	vertical-align: middle;
+	flex: auto;
+	flex-grow: 0;
+	flex-shrink: 0;
+}
+.monaco-editor .find-widget > .replace-part > .monaco-findInput > .controls {
+	position: absolute;
+	top: 3px;
+	right: 2px;
+}
+.monaco-editor .find-widget.reduced-find-widget .matchesCount {
+	display:none;
+}
+.monaco-editor .find-widget.narrow-find-widget {
+	max-width: 257px !important;
+}
+.monaco-editor .find-widget.collapsed-find-widget {
+	max-width: 170px !important;
+}
+.monaco-editor .find-widget.collapsed-find-widget .button.previous,
+.monaco-editor .find-widget.collapsed-find-widget .button.next,
+.monaco-editor .find-widget.collapsed-find-widget .button.replace,
+.monaco-editor .find-widget.collapsed-find-widget .button.replace-all,
+.monaco-editor .find-widget.collapsed-find-widget > .find-part .monaco-findInput .controls {
+	display:none;
+}
+.monaco-editor .find-widget.no-results .matchesCount {
+	color: var(--vscode-errorForeground);
+}
+.monaco-editor .findMatch {
+	animation-duration: 0;
+	animation-name: inherit !important;
+	background-color: var(--vscode-editor-findMatchHighlightBackground);
+}
+.monaco-editor .currentFindMatch {
+	background-color: var(--vscode-editor-findMatchBackground);
+	border: 2px solid var(--vscode-editor-findMatchBorder);
+	padding: 1px;
+	box-sizing: border-box;
+}
+.monaco-editor .findScope {
+	background-color: var(--vscode-editor-findRangeHighlightBackground);
+}
+.monaco-editor .find-widget .monaco-sash {
+	left: 0 !important;
+	background-color: var(--vscode-editorWidget-resizeBorder, var(--vscode-editorWidget-border));
+}
+.monaco-editor.hc-black .find-widget .button:before {
+	position: relative;
+	top: 1px;
+	left: 2px;
+}
+.monaco-editor .find-widget .button:not(.disabled):hover,
+.monaco-editor .find-widget .codicon-find-selection:hover {
+	background-color: var(--vscode-toolbar-hoverBackground) !important;
+}
+.monaco-editor.findMatch {
+	background-color: var(--vscode-editor-findMatchHighlightBackground);
+}
+.monaco-editor.currentFindMatch {
+	background-color: var(--vscode-editor-findMatchBackground);
+}
+.monaco-editor.findScope {
+	background-color: var(--vscode-editor-findRangeHighlightBackground);
+}
+.monaco-editor.findMatch {
+	background-color: var(--vscode-editorWidget-background);
+}
+.monaco-editor .find-widget > .button.codicon-widget-close {
+	position: absolute;
+	top: 5px;
+	right: 4px;
+}

package/vscode/src/vs/editor/contrib/find/browser/findWidget.js

@@ -11,7 +11,7 @@ import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { isMacintosh, isWindows, isNative, isLinux } from '../../../../base/common/platform.js';
 import { format } from '../../../../base/common/strings.js';
-import './findWidget.css.js';
+import './findWidget.css';
 import { OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
@@ -40,32 +40,32 @@ import { assertIsDefined } from '../../../../base/common/types.js';
 import { defaultToggleStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 
-const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localize(988, 'Icon to indicate that the editor find widget is collapsed.')));
-const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localize(989, 'Icon to indicate that the editor find widget is expanded.')));
-const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localize(990, 'Icon for \'Find in Selection\' in the editor find widget.')));
-const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localize(991, 'Icon for \'Replace\' in the editor find widget.')));
-const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localize(992, 'Icon for \'Replace All\' in the editor find widget.')));
-const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localize(993, 'Icon for \'Find Previous\' in the editor find widget.')));
-const findNextMatchIcon = registerIcon('find-next-match', Codicon.arrowDown, ( localize(994, 'Icon for \'Find Next\' in the editor find widget.')));
-const NLS_FIND_DIALOG_LABEL = ( localize(995, "Find / Replace"));
-const NLS_FIND_INPUT_LABEL = ( localize(996, "Find"));
-const NLS_FIND_INPUT_PLACEHOLDER = ( localize(997, "Find"));
-const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(998, "Previous Match"));
-const NLS_NEXT_MATCH_BTN_LABEL = ( localize(999, "Next Match"));
-const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(1000, "Find in Selection"));
-const NLS_CLOSE_BTN_LABEL = ( localize(1001, "Close"));
-const NLS_REPLACE_INPUT_LABEL = ( localize(1002, "Replace"));
-const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(1003, "Replace"));
-const NLS_REPLACE_BTN_LABEL = ( localize(1004, "Replace"));
-const NLS_REPLACE_ALL_BTN_LABEL = ( localize(1005, "Replace All"));
-const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(1006, "Toggle Replace"));
+const findCollapsedIcon = registerIcon('find-collapsed', Codicon.chevronRight, ( localize(1018, 'Icon to indicate that the editor find widget is collapsed.')));
+const findExpandedIcon = registerIcon('find-expanded', Codicon.chevronDown, ( localize(1019, 'Icon to indicate that the editor find widget is expanded.')));
+const findSelectionIcon = registerIcon('find-selection', Codicon.selection, ( localize(1020, 'Icon for \'Find in Selection\' in the editor find widget.')));
+const findReplaceIcon = registerIcon('find-replace', Codicon.replace, ( localize(1021, 'Icon for \'Replace\' in the editor find widget.')));
+const findReplaceAllIcon = registerIcon('find-replace-all', Codicon.replaceAll, ( localize(1022, 'Icon for \'Replace All\' in the editor find widget.')));
+const findPreviousMatchIcon = registerIcon('find-previous-match', Codicon.arrowUp, ( localize(1023, 'Icon for \'Find Previous\' in the editor find widget.')));
+const findNextMatchIcon = registerIcon('find-next-match', Codicon.arrowDown, ( localize(1024, 'Icon for \'Find Next\' in the editor find widget.')));
+const NLS_FIND_DIALOG_LABEL = ( localize(1025, "Find / Replace"));
+const NLS_FIND_INPUT_LABEL = ( localize(1026, "Find"));
+const NLS_FIND_INPUT_PLACEHOLDER = ( localize(1027, "Find"));
+const NLS_PREVIOUS_MATCH_BTN_LABEL = ( localize(1028, "Previous Match"));
+const NLS_NEXT_MATCH_BTN_LABEL = ( localize(1029, "Next Match"));
+const NLS_TOGGLE_SELECTION_FIND_TITLE = ( localize(1030, "Find in Selection"));
+const NLS_CLOSE_BTN_LABEL = ( localize(1031, "Close"));
+const NLS_REPLACE_INPUT_LABEL = ( localize(1032, "Replace"));
+const NLS_REPLACE_INPUT_PLACEHOLDER = ( localize(1033, "Replace"));
+const NLS_REPLACE_BTN_LABEL = ( localize(1034, "Replace"));
+const NLS_REPLACE_ALL_BTN_LABEL = ( localize(1035, "Replace All"));
+const NLS_TOGGLE_REPLACE_MODE_BTN_LABEL = ( localize(1036, "Toggle Replace"));
 const NLS_MATCHES_COUNT_LIMIT_TITLE = ( localize(
-    1007,
+    1037,
     "Only the first {0} results are highlighted, but all find operations work on the entire text.",
     MATCHES_LIMIT
 ));
-const NLS_MATCHES_LOCATION = ( localize(1008, "{0} of {1}"));
-const NLS_NO_RESULTS = ( localize(1009, "No results"));
+const NLS_MATCHES_LOCATION = ( localize(1038, "{0} of {1}"));
+const NLS_NO_RESULTS = ( localize(1039, "No results"));
 const FIND_WIDGET_INITIAL_WIDTH = 419;
 const PART_WIDTH = 275;
 const FIND_INPUT_AREA_WIDTH = PART_WIDTH - 54;
@@ -339,12 +339,12 @@ class FindWidget extends Widget {
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localize(1010, "{0} found", label))
-                : ( localize(1011, "{0} found for '{1}'", label, searchString));
+                ? ( localize(1040, "{0} found", label))
+                : ( localize(1041, "{0} found for '{1}'", label, searchString));
         }
         if (currentMatch) {
             const ariaLabel = ( localize(
-                1012,
+                1042,
                 "{0} found for '{1}', at {2}",
                 label,
                 searchString,
@@ -357,7 +357,7 @@ class FindWidget extends Widget {
             }
             return ariaLabel;
         }
-        return localize(1013, "{0} found for '{1}'", label, searchString);
+        return localize(1043, "{0} found for '{1}'", label, searchString);
     }
     _updateToggleSelectionFindButton() {
         const selection = this._codeEditor.getSelection();
@@ -690,7 +690,7 @@ class FindWidget extends Widget {
             else {
                 if (isWindows && isNative && !this._ctrlEnterReplaceAllWarningPrompted) {
                     this._notificationService.info(( localize(
-                        1014,
+                        1044,
                         'Ctrl+Enter now inserts line break instead of replacing all. You can modify the keybinding for editor.action.replaceAll to override this behavior.'
                     )));
                     this._ctrlEnterReplaceAllWarningPrompted = true;

package/vscode/src/vs/editor/contrib/folding/browser/folding.css

@@ -0,0 +1,42 @@
+.monaco-editor .margin-view-overlays .codicon-folding-manual-collapsed,
+.monaco-editor .margin-view-overlays .codicon-folding-manual-expanded,
+.monaco-editor .margin-view-overlays .codicon-folding-expanded,
+.monaco-editor .margin-view-overlays .codicon-folding-collapsed {
+	cursor: pointer;
+	opacity: 0;
+	transition: opacity 0.5s;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 140%;
+	margin-left: 2px;
+}
+.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-manual-collapsed,
+.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-manual-expanded,
+.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-expanded,
+.monaco-workbench.reduce-motion .monaco-editor .margin-view-overlays .codicon-folding-collapsed {
+	transition: initial;
+}
+.monaco-editor .margin-view-overlays:hover .codicon,
+.monaco-editor .margin-view-overlays .codicon.codicon-folding-collapsed,
+.monaco-editor .margin-view-overlays .codicon.codicon-folding-manual-collapsed,
+.monaco-editor .margin-view-overlays .codicon.alwaysShowFoldIcons {
+	opacity: 1;
+}
+.monaco-editor .inline-folded:after {
+	color: var(--vscode-editor-foldPlaceholderForeground);
+	margin: 0.1em 0.2em 0 0.2em;
+	content: "\22EF";
+	display: inline;
+	line-height: 1em;
+	cursor: pointer;
+}
+.monaco-editor .folded-background {
+	background-color: var(--vscode-editor-foldBackground);
+}
+.monaco-editor .cldr.codicon.codicon-folding-expanded,
+.monaco-editor .cldr.codicon.codicon-folding-collapsed,
+.monaco-editor .cldr.codicon.codicon-folding-manual-expanded,
+.monaco-editor .cldr.codicon.codicon-folding-manual-collapsed {
+	color: var(--vscode-editorGutter-foldingControlForeground) !important;
+}

package/vscode/src/vs/editor/contrib/folding/browser/folding.js

@@ -7,7 +7,7 @@ import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../../base/common/k
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { escapeRegExpCharacters } from '../../../../base/common/strings.js';
 import { isUndefined, isObject, isNumber, isString } from '../../../../base/common/types.js';
-import './folding.css.js';
+import './folding.css';
 import { StableEditorScrollState } from '../../../browser/stableEditorScroll.js';
 import { MouseTargetType } from '../../../browser/editorBrowser.js';
 import { EditorAction, registerEditorContribution, EditorContributionInstantiation, registerEditorAction, registerInstantiatedEditorAction } from '../../../browser/editorExtensions.js';
@@ -507,7 +507,7 @@ class UnfoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfold',
-            label: ( localize2(1015, "Unfold")),
+            label: ( localize2(1045, "Unfold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -568,7 +568,7 @@ class UnFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldRecursively',
-            label: ( localize2(1016, "Unfold Recursively")),
+            label: ( localize2(1046, "Unfold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -585,7 +585,7 @@ class FoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.fold',
-            label: ( localize2(1017, "Fold")),
+            label: ( localize2(1047, "Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -651,7 +651,7 @@ class ToggleFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleFold',
-            label: ( localize2(1018, "Toggle Fold")),
+            label: ( localize2(1048, "Toggle Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -669,7 +669,7 @@ class FoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldRecursively',
-            label: ( localize2(1019, "Fold Recursively")),
+            label: ( localize2(1049, "Fold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -687,7 +687,7 @@ class ToggleFoldRecursivelyAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleFoldRecursively',
-            label: ( localize2(1020, "Toggle Fold Recursively")),
+            label: ( localize2(1050, "Toggle Fold Recursively")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -705,7 +705,7 @@ class FoldAllBlockCommentsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllBlockComments',
-            label: ( localize2(1021, "Fold All Block Comments")),
+            label: ( localize2(1051, "Fold All Block Comments")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -735,7 +735,7 @@ class FoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllMarkerRegions',
-            label: ( localize2(1022, "Fold All Regions")),
+            label: ( localize2(1052, "Fold All Regions")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -765,7 +765,7 @@ class UnfoldAllRegionsAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllMarkerRegions',
-            label: ( localize2(1023, "Unfold All Regions")),
+            label: ( localize2(1053, "Unfold All Regions")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -795,7 +795,7 @@ class FoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAllExcept',
-            label: ( localize2(1024, "Fold All Except Selected")),
+            label: ( localize2(1054, "Fold All Except Selected")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -813,7 +813,7 @@ class UnfoldAllExceptAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAllExcept',
-            label: ( localize2(1025, "Unfold All Except Selected")),
+            label: ( localize2(1055, "Unfold All Except Selected")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -831,7 +831,7 @@ class FoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.foldAll',
-            label: ( localize2(1026, "Fold All")),
+            label: ( localize2(1056, "Fold All")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -848,7 +848,7 @@ class UnfoldAllAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.unfoldAll',
-            label: ( localize2(1027, "Unfold All")),
+            label: ( localize2(1057, "Unfold All")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -875,7 +875,7 @@ class GotoParentFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoParentFold',
-            label: ( localize2(1028, "Go to Parent Fold")),
+            label: ( localize2(1058, "Go to Parent Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -902,7 +902,7 @@ class GotoPreviousFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoPreviousFold',
-            label: ( localize2(1029, "Go to Previous Folding Range")),
+            label: ( localize2(1059, "Go to Previous Folding Range")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -929,7 +929,7 @@ class GotoNextFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.gotoNextFold',
-            label: ( localize2(1030, "Go to Next Folding Range")),
+            label: ( localize2(1060, "Go to Next Folding Range")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -956,7 +956,7 @@ class FoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.createFoldingRangeFromSelection',
-            label: ( localize2(1031, "Create Folding Range from Selection")),
+            label: ( localize2(1061, "Create Folding Range from Selection")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1004,7 +1004,7 @@ class RemoveFoldRangeFromSelectionAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.removeManualFoldingRanges',
-            label: ( localize2(1032, "Remove Manual Folding Ranges")),
+            label: ( localize2(1062, "Remove Manual Folding Ranges")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1030,7 +1030,7 @@ class ToggleImportFoldAction extends FoldingAction {
     constructor() {
         super({
             id: 'editor.toggleImportFold',
-            label: ( localize2(1033, "Toggle Import Fold")),
+            label: ( localize2(1063, "Toggle Import Fold")),
             precondition: CONTEXT_FOLDING_ENABLED,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -1073,7 +1073,7 @@ registerEditorAction(ToggleImportFoldAction);
 for (let i = 1; i <= 7; i++) {
     registerInstantiatedEditorAction(( new FoldLevelAction({
         id: FoldLevelAction.ID(i),
-        label: ( localize2(1034, "Fold Level {0}", i)),
+        label: ( localize2(1064, "Fold Level {0}", i)),
         precondition: CONTEXT_FOLDING_ENABLED,
         kbOpts: {
             kbExpr: EditorContextKeys.editorTextFocus,

package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js

@@ -19,21 +19,21 @@ import { themeColorFromId } from '../../../../platform/theme/common/themeService
 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(
-    1035,
+    1065,
     "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(
-    1036,
+    1066,
     "Color of the collapsed text after the first line of a folded range."
 )));
-registerColor('editorGutter.foldingControlForeground', iconForeground, ( localize(1037, 'Color of the folding control in the editor gutter.')));
-const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, ( localize(1038, 'Icon for expanded ranges in the editor glyph margin.')));
-const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, ( localize(1039, 'Icon for collapsed ranges in the editor glyph margin.')));
-const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, ( localize(1040, 'Icon for manually collapsed ranges in the editor glyph margin.')));
-const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, ( localize(1041, 'Icon for manually expanded ranges in the editor glyph margin.')));
+registerColor('editorGutter.foldingControlForeground', iconForeground, ( localize(1067, 'Color of the folding control in the editor gutter.')));
+const foldingExpandedIcon = registerIcon('folding-expanded', Codicon.chevronDown, ( localize(1068, 'Icon for expanded ranges in the editor glyph margin.')));
+const foldingCollapsedIcon = registerIcon('folding-collapsed', Codicon.chevronRight, ( localize(1069, 'Icon for collapsed ranges in the editor glyph margin.')));
+const foldingManualCollapsedIcon = registerIcon('folding-manual-collapsed', foldingCollapsedIcon, ( localize(1070, 'Icon for manually collapsed ranges in the editor glyph margin.')));
+const foldingManualExpandedIcon = registerIcon('folding-manual-expanded', foldingExpandedIcon, ( localize(1071, 'Icon for manually expanded ranges in the editor glyph margin.')));
 const foldedBackgroundMinimap = { color: themeColorFromId(foldBackground), position: MinimapPosition.Inline };
-const collapsed = ( localize(1042, "Click to expand the range."));
-const expanded = ( localize(1043, "Click to collapse the range."));
+const collapsed = ( localize(1072, "Click to expand the range."));
+const expanded = ( localize(1073, "Click to collapse the range."));
 class FoldingDecorationProvider {
     static { this.COLLAPSED_VISUAL_DECORATION = ModelDecorationOptions.register({
         description: 'folding-collapsed-visual-decoration',

package/vscode/src/vs/editor/contrib/folding/browser/syntaxRangeProvider.js

@@ -26,6 +26,9 @@ class SyntaxRangeProvider {
     }
     compute(cancellationToken) {
         return collectSyntaxRanges(this.providers, this.editorModel, cancellationToken).then(ranges => {
+            if (this.editorModel.isDisposed()) {
+                return null;
+            }
             if (ranges) {
                 const res = sanitizeRanges(ranges, this.foldingRangesLimit);
                 return res;

package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js

@@ -7,7 +7,7 @@ class EditorFontZoomIn extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomIn',
-            label: ( localize2(1044, "Increase Editor Font Size")),
+            label: ( localize2(1074, "Increase Editor Font Size")),
             precondition: undefined
         });
     }
@@ -19,7 +19,7 @@ class EditorFontZoomOut extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomOut',
-            label: ( localize2(1045, "Decrease Editor Font Size")),
+            label: ( localize2(1075, "Decrease Editor Font Size")),
             precondition: undefined
         });
     }
@@ -31,7 +31,7 @@ class EditorFontZoomReset extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.fontZoomReset',
-            label: ( localize2(1046, "Reset Editor Font Size")),
+            label: ( localize2(1076, "Reset Editor Font Size")),
             precondition: undefined
         });
     }

package/vscode/src/vs/editor/contrib/format/browser/formatActions.js

@@ -164,7 +164,7 @@ class FormatDocumentAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatDocument',
-            label: ( localize2(1047, "Format Document")),
+            label: ( localize2(1077, "Format Document")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.notInCompositeEditor,
                 EditorContextKeys.writable,
@@ -194,7 +194,7 @@ class FormatSelectionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatSelection',
-            label: ( localize2(1048, "Format Selection")),
+            label: ( localize2(1078, "Format Selection")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 EditorContextKeys.hasDocumentSelectionFormattingProvider