@codingame/monaco-vscode-api 8.0.4 → 9.0.0

package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js

@@ -252,12 +252,12 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         let text;
         if (_move.changes.length > 0) {
             text = this._kind === 'original' ? ( localize(
-                5264,
+                9363,
                 'Code moved with changes to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localize(
-                5265,
+                9364,
                 'Code moved with changes from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1
@@ -265,12 +265,12 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         }
         else {
             text = this._kind === 'original' ? ( localize(
-                5266,
+                9365,
                 'Code moved to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localize(
-                5267,
+                9366,
                 'Code moved from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1

package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js

@@ -102,8 +102,8 @@ class RevertButton extends Disposable {
         this._id = `revertButton${RevertButton.counter++}`;
         this._domNode = h('div.revertButton', {
             title: this._revertSelection
-                ? ( localize(5268, 'Revert Selected Changes'))
-                : ( localize(5269, 'Revert Change'))
+                ? ( localize(9367, 'Revert Selected Changes'))
+                : ( localize(9368, 'Revert Change'))
         }, [renderIcon(Codicon.arrowRight)]).root;
         this._register(addDisposableListener(this._domNode, EventType.MOUSE_DOWN, e => {
             if (e.button !== 2) {

package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js

@@ -14,14 +14,14 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-registerColor('diffEditor.move.border', '#8b8b8b9c', ( localize(4988, 'The border color for text that got moved in the diff editor.')));
+registerColor('diffEditor.move.border', '#8b8b8b9c', ( localize(4968, 'The border color for text that got moved in the diff editor.')));
 registerColor('diffEditor.moveActive.border', '#FFA500', ( localize(
-    4989,
+    4969,
     'The active border color for text that got moved in the diff editor.'
 )));
-registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localize(4990, 'The color of the shadow around unchanged region widgets.')));
-const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localize(4991, 'Line decoration for inserts in the diff editor.')));
-const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localize(4992, 'Line decoration for removals in the diff editor.')));
+registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localize(4970, 'The color of the shadow around unchanged region widgets.')));
+const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localize(4971, 'Line decoration for inserts in the diff editor.')));
+const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localize(4972, 'Line decoration for removals in the diff editor.')));
 const diffLineAddDecorationBackgroundWithIndicator = ModelDecorationOptions.register({
     className: 'line-insert',
     description: 'line-insert',

package/vscode/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.js

@@ -76,9 +76,9 @@ class EditorGutter extends Disposable {
                         const top = gutterItem.range.startLineNumber <= this._editor.getModel().getLineCount()
                             ? this._editor.getTopForLineNumber(gutterItem.range.startLineNumber, true) - scrollTop
                             : this._editor.getBottomForLineNumber(gutterItem.range.startLineNumber - 1, false) - scrollTop;
-                        const bottom = gutterItem.range.isEmpty
-                            ? top
-                            : (this._editor.getBottomForLineNumber(gutterItem.range.endLineNumberExclusive - 1, true) - scrollTop);
+                        const bottom = gutterItem.range.endLineNumberExclusive === 1 ?
+                            Math.max(top, this._editor.getTopForLineNumber(gutterItem.range.startLineNumber, false) - scrollTop)
+                            : Math.max(top, this._editor.getBottomForLineNumber(gutterItem.range.endLineNumberExclusive - 1, true) - scrollTop);
                         const height = bottom - top;
                         view.domNode.style.top = `${top}px`;
                         view.domNode.style.height = `${height}px`;

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js

@@ -2,7 +2,7 @@ import { localize } from '../../../../nls.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
-import '../../../../platform/theme/common/colors/editorColors.js';
+import { editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';
 import '../../../../platform/theme/common/colors/inputColors.js';
 import '../../../../platform/theme/common/colors/listColors.js';
 import '../../../../platform/theme/common/colors/menuColors.js';
@@ -10,6 +10,6 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localize(9361, 'The background color of the diff editor\'s header')));
-registerColor('multiDiffEditor.background', 'editorBackground', ( localize(9362, 'The background color of the multi file diff editor')));
-registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localize(9363, 'The border color of the multi file diff editor')));
+registerColor('multiDiffEditor.headerBackground', { dark: '#262626', light: 'tab.inactiveBackground', hcDark: 'tab.inactiveBackground', hcLight: 'tab.inactiveBackground', }, ( localize(9824, 'The background color of the diff editor\'s header')));
+registerColor('multiDiffEditor.background', editorBackground, ( localize(9825, 'The background color of the multi file diff editor')));
+registerColor('multiDiffEditor.border', { dark: 'sideBarSectionHeader.border', light: '#cccccc', hcDark: 'sideBarSectionHeader.border', hcLight: '#cccccc', }, ( localize(9826, 'The border color of the multi file diff editor')));

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.js

@@ -16,6 +16,8 @@ import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolb
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ActionRunnerWithContext } from './utils.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 class TemplateData {
     constructor(viewModel, deltaScrollVertical) {
         this.viewModel = viewModel;
@@ -26,7 +28,7 @@ class TemplateData {
     }
 }
 let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
-    constructor(_container, _overflowWidgetsDomNode, _workbenchUIElementFactory, _instantiationService) {
+    constructor(_container, _overflowWidgetsDomNode, _workbenchUIElementFactory, _instantiationService, _parentContextKeyService) {
         super();
         this._container = _container;
         this._overflowWidgetsDomNode = _overflowWidgetsDomNode;
@@ -81,7 +83,7 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         this._resourceLabel2 = this._workbenchUIElementFactory.createResourceLabel
             ? this._register(this._workbenchUIElementFactory.createResourceLabel(this._elements.secondaryPath))
             : undefined;
-        this._dataStore = ( new DisposableStore());
+        this._dataStore = this._register(( new DisposableStore()));
         this._headerHeight = 40;
         this._lastScrollTop = -1;
         this._isSettingScrollTop = false;
@@ -127,13 +129,15 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
         }));
         this._container.appendChild(this._elements.root);
         this._outerEditorHeight = this._headerHeight;
-        this._register(this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.actions, MenuId.MultiDiffEditorFileToolbar, {
+        this._contextKeyService = this._register(_parentContextKeyService.createScoped(this._elements.actions));
+        const instantiationService = this._register(this._instantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService]))));
+        this._register(instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.actions, MenuId.MultiDiffEditorFileToolbar, {
             actionRunner: this._register(( new ActionRunnerWithContext(() => (this._viewModel.get()?.modifiedUri)))),
             menuOptions: {
                 shouldForwardArgs: true,
             },
             toolbarOptions: { primaryGroup: g => g.startsWith('navigation') },
-            actionViewItemProvider: (action, options) => createActionViewItem(_instantiationService, action, options),
+            actionViewItemProvider: (action, options) => createActionViewItem(instantiationService, action, options),
         }));
     }
     setScrollLeft(left) {
@@ -211,6 +215,11 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
                 this.setData(undefined);
             }
         });
+        if (data.viewModel.documentDiffItem.contextKeys) {
+            for (const [key, value] of Object.entries(data.viewModel.documentDiffItem.contextKeys)) {
+                this._contextKeyService.createKey(key, value);
+            }
+        }
     }
     render(verticalRange, width, editorScroll, viewPort) {
         this._elements.root.style.visibility = 'visible';
@@ -244,6 +253,7 @@ let DiffEditorItemTemplate = class DiffEditorItemTemplate extends Disposable {
     }
 };
 DiffEditorItemTemplate = ( __decorate([
-    ( __param(3, IInstantiationService))
+    ( __param(3, IInstantiationService)),
+    ( __param(4, IContextKeyService))
 ], DiffEditorItemTemplate));
 export { DiffEditorItemTemplate, TemplateData };

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js

@@ -51,7 +51,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         }, this._scrollable))));
         this._elements = h('div.monaco-component.multiDiffEditor', {}, [
             h('div', {}, [this._scrollableElement.getDomNode()]),
-            h('div.placeholder@placeholder', {}, [h('div', [( localize(9360, 'No Changed Files'))])]),
+            h('div.placeholder@placeholder', {}, [h('div', [( localize(9823, 'No Changed Files'))])]),
         ]);
         this._sizeObserver = this._register(( (new ObservableElementSizeObserver(this._element, undefined))));
         this._objectPool = this._register(( (new ObjectPool((data) => {

package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js

@@ -8,7 +8,7 @@ const editorConfigurationBaseNode = ( (Object.freeze({
     id: 'editor',
     order: 5,
     type: 'object',
-    title: ( localize(1209, "Editor")),
+    title: ( localize(682, "Editor")),
     scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
 })));
 const editorConfiguration = {
@@ -19,7 +19,7 @@ const editorConfiguration = {
             default: EDITOR_MODEL_DEFAULTS.tabSize,
             minimum: 1,
             markdownDescription: ( localize(
-                1210,
+                683,
                 "The number of spaces a tab is equal to. This setting is overridden based on the file contents when {0} is on.",
                 '`#editor.detectIndentation#`'
             ))
@@ -37,7 +37,7 @@ const editorConfiguration = {
             ],
             default: 'tabSize',
             markdownDescription: ( localize(
-                1211,
+                684,
                 "The number of spaces used for indentation or `\"tabSize\"` to use the value from `#editor.tabSize#`. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on."
             ))
         },
@@ -45,7 +45,7 @@ const editorConfiguration = {
             type: 'boolean',
             default: EDITOR_MODEL_DEFAULTS.insertSpaces,
             markdownDescription: ( localize(
-                1212,
+                685,
                 "Insert spaces when pressing `Tab`. This setting is overridden based on the file contents when {0} is on.",
                 '`#editor.detectIndentation#`'
             ))
@@ -54,7 +54,7 @@ const editorConfiguration = {
             type: 'boolean',
             default: EDITOR_MODEL_DEFAULTS.detectIndentation,
             markdownDescription: ( localize(
-                1213,
+                686,
                 "Controls whether {0} and {1} will be automatically detected when a file is opened based on the file contents.",
                 '`#editor.tabSize#`',
                 '`#editor.insertSpaces#`'
@@ -63,13 +63,13 @@ const editorConfiguration = {
         'editor.trimAutoWhitespace': {
             type: 'boolean',
             default: EDITOR_MODEL_DEFAULTS.trimAutoWhitespace,
-            description: ( localize(1214, "Remove trailing auto inserted whitespace."))
+            description: ( localize(687, "Remove trailing auto inserted whitespace."))
         },
         'editor.largeFileOptimizations': {
             type: 'boolean',
             default: EDITOR_MODEL_DEFAULTS.largeFileOptimizations,
             description: ( localize(
-                1215,
+                688,
                 "Special handling for large files to disable certain memory intensive features."
             ))
         },
@@ -77,29 +77,29 @@ const editorConfiguration = {
             enum: ['off', 'currentDocument', 'matchingDocuments', 'allDocuments'],
             default: 'matchingDocuments',
             enumDescriptions: [
-                ( localize(1216, 'Turn off Word Based Suggestions.')),
-                ( localize(1217, 'Only suggest words from the active document.')),
-                ( localize(1218, 'Suggest words from all open documents of the same language.')),
-                ( localize(1219, 'Suggest words from all open documents.'))
+                ( localize(689, 'Turn off Word Based Suggestions.')),
+                ( localize(690, 'Only suggest words from the active document.')),
+                ( localize(691, 'Suggest words from all open documents of the same language.')),
+                ( localize(692, 'Suggest words from all open documents.'))
             ],
             description: ( localize(
-                1220,
+                693,
                 "Controls whether completions should be computed based on words in the document and from which documents they are computed."
             ))
         },
         'editor.semanticHighlighting.enabled': {
             enum: [true, false, 'configuredByTheme'],
             enumDescriptions: [
-                ( localize(1221, 'Semantic highlighting enabled for all color themes.')),
-                ( localize(1222, 'Semantic highlighting disabled for all color themes.')),
+                ( localize(694, 'Semantic highlighting enabled for all color themes.')),
+                ( localize(695, 'Semantic highlighting disabled for all color themes.')),
                 ( localize(
-                    1223,
+                    696,
                     'Semantic highlighting is configured by the current color theme\'s `semanticHighlighting` setting.'
                 ))
             ],
             default: 'configuredByTheme',
             description: ( localize(
-                1224,
+                697,
                 "Controls whether the semanticHighlighting is shown for the languages that support it."
             ))
         },
@@ -107,7 +107,7 @@ const editorConfiguration = {
             type: 'boolean',
             default: false,
             markdownDescription: ( localize(
-                1225,
+                698,
                 "Keep peek editors open even when double-clicking their content or when hitting `Escape`."
             ))
         },
@@ -115,15 +115,15 @@ const editorConfiguration = {
             type: 'integer',
             default: 20_000,
             description: ( localize(
-                1226,
+                699,
                 "Lines above this length will not be tokenized for performance reasons"
             ))
         },
         'editor.experimental.asyncTokenization': {
             type: 'boolean',
-            default: false,
+            default: true,
             description: ( localize(
-                1227,
+                700,
                 "Controls whether the tokenization should happen asynchronously on a web worker."
             )),
             tags: ['experimental'],
@@ -132,7 +132,7 @@ const editorConfiguration = {
             type: 'boolean',
             default: false,
             description: ( localize(
-                1228,
+                701,
                 "Controls whether async tokenization should be logged. For debugging only."
             )),
         },
@@ -140,16 +140,25 @@ const editorConfiguration = {
             type: 'boolean',
             default: false,
             description: ( localize(
-                1229,
+                702,
                 "Controls whether async tokenization should be verified against legacy background tokenization. Might slow down tokenization. For debugging only."
             )),
             tags: ['experimental'],
         },
+        'editor.experimental.treeSitterTelemetry': {
+            type: 'boolean',
+            default: false,
+            markdownDescription: ( localize(
+                703,
+                "Controls whether tree sitter parsing should be turned on and telemetry collected. Setting `editor.experimental.preferTreeSitter` for specific languages will take precedence."
+            )),
+            tags: ['experimental']
+        },
         'editor.language.brackets': {
             type: ['array', 'null'],
             default: null,
             description: ( localize(
-                1230,
+                704,
                 'Defines the bracket symbols that increase or decrease the indentation.'
             )),
             items: {
@@ -157,11 +166,11 @@ const editorConfiguration = {
                 items: [
                     {
                         type: 'string',
-                        description: ( localize(1231, 'The opening bracket character or string sequence.'))
+                        description: ( localize(705, 'The opening bracket character or string sequence.'))
                     },
                     {
                         type: 'string',
-                        description: ( localize(1232, 'The closing bracket character or string sequence.'))
+                        description: ( localize(706, 'The closing bracket character or string sequence.'))
                     }
                 ]
             }
@@ -170,7 +179,7 @@ const editorConfiguration = {
             type: ['array', 'null'],
             default: null,
             description: ( localize(
-                1233,
+                707,
                 'Defines the bracket pairs that are colorized by their nesting level if bracket pair colorization is enabled.'
             )),
             items: {
@@ -178,11 +187,11 @@ const editorConfiguration = {
                 items: [
                     {
                         type: 'string',
-                        description: ( localize(1231, 'The opening bracket character or string sequence.'))
+                        description: ( localize(705, 'The opening bracket character or string sequence.'))
                     },
                     {
                         type: 'string',
-                        description: ( localize(1232, 'The closing bracket character or string sequence.'))
+                        description: ( localize(706, 'The closing bracket character or string sequence.'))
                     }
                 ]
             }
@@ -191,7 +200,7 @@ const editorConfiguration = {
             type: 'number',
             default: diffEditorDefaultOptions.maxComputationTime,
             description: ( localize(
-                1234,
+                708,
                 "Timeout in milliseconds after which diff computation is cancelled. Use 0 for no timeout."
             ))
         },
@@ -199,7 +208,7 @@ const editorConfiguration = {
             type: 'number',
             default: diffEditorDefaultOptions.maxFileSize,
             description: ( localize(
-                1235,
+                709,
                 "Maximum file size in MB for which to compute diffs. Use 0 for no limit."
             ))
         },
@@ -207,7 +216,7 @@ const editorConfiguration = {
             type: 'boolean',
             default: diffEditorDefaultOptions.renderSideBySide,
             description: ( localize(
-                1236,
+                710,
                 "Controls whether the diff editor shows the diff side by side or inline."
             ))
         },
@@ -215,7 +224,7 @@ const editorConfiguration = {
             type: 'number',
             default: diffEditorDefaultOptions.renderSideBySideInlineBreakpoint,
             description: ( localize(
-                1237,
+                711,
                 "If the diff editor width is smaller than this value, the inline view is used."
             ))
         },
@@ -223,7 +232,7 @@ const editorConfiguration = {
             type: 'boolean',
             default: diffEditorDefaultOptions.useInlineViewWhenSpaceIsLimited,
             description: ( localize(
-                1238,
+                712,
                 "If enabled and the editor width is too small, the inline view is used."
             ))
         },
@@ -231,7 +240,7 @@ const editorConfiguration = {
             type: 'boolean',
             default: diffEditorDefaultOptions.renderMarginRevertIcon,
             description: ( localize(
-                1239,
+                713,
                 "When enabled, the diff editor shows arrows in its glyph margin to revert changes."
             ))
         },
@@ -239,7 +248,7 @@ const editorConfiguration = {
             type: 'boolean',
             default: diffEditorDefaultOptions.renderGutterMenu,
             description: ( localize(
-                1240,
+                714,
                 "When enabled, the diff editor shows a special gutter for revert and stage actions."
             ))
         },
@@ -247,7 +256,7 @@ const editorConfiguration = {
             type: 'boolean',
             default: diffEditorDefaultOptions.ignoreTrimWhitespace,
             description: ( localize(
-                1241,
+                715,
                 "When enabled, the diff editor ignores changes in leading or trailing whitespace."
             ))
         },
@@ -255,24 +264,24 @@ const editorConfiguration = {
             type: 'boolean',
             default: diffEditorDefaultOptions.renderIndicators,
             description: ( localize(
-                1242,
+                716,
                 "Controls whether the diff editor shows +/- indicators for added/removed changes."
             ))
         },
         'diffEditor.codeLens': {
             type: 'boolean',
             default: diffEditorDefaultOptions.diffCodeLens,
-            description: ( localize(1243, "Controls whether the editor shows CodeLens."))
+            description: ( localize(717, "Controls whether the editor shows CodeLens."))
         },
         'diffEditor.wordWrap': {
             type: 'string',
             enum: ['off', 'on', 'inherit'],
             default: diffEditorDefaultOptions.diffWordWrap,
             markdownEnumDescriptions: [
-                ( localize(1244, "Lines will never wrap.")),
-                ( localize(1245, "Lines will wrap at the viewport width.")),
+                ( localize(718, "Lines will never wrap.")),
+                ( localize(719, "Lines will wrap at the viewport width.")),
                 ( localize(
-                    1246,
+                    720,
                     "Lines will wrap according to the {0} setting.",
                     '`#editor.wordWrap#`'
                 )),
@@ -283,27 +292,27 @@ const editorConfiguration = {
             enum: ['legacy', 'advanced'],
             default: diffEditorDefaultOptions.diffAlgorithm,
             markdownEnumDescriptions: [
-                ( localize(1247, "Uses the legacy diffing algorithm.")),
-                ( localize(1248, "Uses the advanced diffing algorithm.")),
+                ( localize(721, "Uses the legacy diffing algorithm.")),
+                ( localize(722, "Uses the advanced diffing algorithm.")),
             ],
             tags: ['experimental'],
         },
         'diffEditor.hideUnchangedRegions.enabled': {
             type: 'boolean',
             default: diffEditorDefaultOptions.hideUnchangedRegions.enabled,
-            markdownDescription: ( localize(1249, "Controls whether the diff editor shows unchanged regions.")),
+            markdownDescription: ( localize(723, "Controls whether the diff editor shows unchanged regions.")),
         },
         'diffEditor.hideUnchangedRegions.revealLineCount': {
             type: 'integer',
             default: diffEditorDefaultOptions.hideUnchangedRegions.revealLineCount,
-            markdownDescription: ( localize(1250, "Controls how many lines are used for unchanged regions.")),
+            markdownDescription: ( localize(724, "Controls how many lines are used for unchanged regions.")),
             minimum: 1,
         },
         'diffEditor.hideUnchangedRegions.minimumLineCount': {
             type: 'integer',
             default: diffEditorDefaultOptions.hideUnchangedRegions.minimumLineCount,
             markdownDescription: ( localize(
-                1251,
+                725,
                 "Controls how many lines are used as a minimum for unchanged regions."
             )),
             minimum: 1,
@@ -312,7 +321,7 @@ const editorConfiguration = {
             type: 'integer',
             default: diffEditorDefaultOptions.hideUnchangedRegions.contextLineCount,
             markdownDescription: ( localize(
-                1252,
+                726,
                 "Controls how many lines are used as context when comparing unchanged regions."
             )),
             minimum: 1,
@@ -320,13 +329,13 @@ const editorConfiguration = {
         'diffEditor.experimental.showMoves': {
             type: 'boolean',
             default: diffEditorDefaultOptions.experimental.showMoves,
-            markdownDescription: ( localize(1253, "Controls whether the diff editor should show detected code moves."))
+            markdownDescription: ( localize(727, "Controls whether the diff editor should show detected code moves."))
         },
         'diffEditor.experimental.showEmptyDecorations': {
             type: 'boolean',
             default: diffEditorDefaultOptions.experimental.showEmptyDecorations,
             description: ( localize(
-                1254,
+                728,
                 "Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted."
             )),
         },
@@ -334,7 +343,7 @@ const editorConfiguration = {
             type: 'boolean',
             default: diffEditorDefaultOptions.experimental.useTrueInlineView,
             description: ( localize(
-                1255,
+                729,
                 "If enabled and the editor uses the inline view, word changes are rendered inline."
             )),
         },

package/vscode/src/vs/editor/common/config/editorOptions.js

@@ -1218,7 +1218,7 @@ var ShowLightbulbIconMode;
 })(ShowLightbulbIconMode || (ShowLightbulbIconMode = {}))));
 class EditorLightbulb extends BaseEditorOption {
     constructor() {
-        const defaults = { enabled: ShowLightbulbIconMode.On };
+        const defaults = { enabled: ShowLightbulbIconMode.OnCode };
         super(EditorOption.lightbulb, 'lightbulb', defaults, {
             'editor.lightbulb.enabled': {
                 type: 'string',