@codingame/monaco-vscode-api 7.0.11 → 7.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/api.js +60 -10
- package/extensions.d.ts +9 -0
- package/l10n.d.ts +13 -1
- package/l10n.js +3 -2
- package/missing-services.js +35 -21
- package/package.json +9 -9
- package/service-override/workingCopy.d.ts +4 -1
- package/services.js +2 -2
- package/vscode/src/vs/base/browser/browser.js +4 -1
- package/vscode/src/vs/base/browser/defaultWorkerFactory.js +7 -1
- package/vscode/src/vs/base/browser/dom.js +8 -1
- package/vscode/src/vs/base/browser/markdownRenderer.js +1 -1
- package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.d.ts +1 -0
- package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js +13 -6
- package/vscode/src/vs/base/browser/ui/actionbar/actionbar.js +1 -1
- package/vscode/src/vs/base/browser/ui/button/button.js +2 -3
- package/vscode/src/vs/base/browser/ui/dialog/dialog.js +7 -8
- package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js +2 -3
- package/vscode/src/vs/base/browser/ui/findinput/findInput.js +2 -3
- package/vscode/src/vs/base/browser/ui/findinput/findInputToggles.js +4 -5
- package/vscode/src/vs/base/browser/ui/findinput/replaceInput.js +3 -4
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js +3 -5
- package/vscode/src/vs/base/browser/ui/icons/iconSelectBox.js +3 -4
- package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js +7 -8
- package/vscode/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.js +2 -3
- package/vscode/src/vs/base/browser/ui/list/listView.js +2 -2
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +2 -3
- package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js +4 -5
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +2 -3
- package/vscode/src/vs/base/browser/ui/table/tableWidget.js +1 -1
- package/vscode/src/vs/base/browser/ui/toggle/toggle.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js +2 -3
- package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +11 -12
- package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js +2 -3
- package/vscode/src/vs/base/common/actions.js +2 -3
- package/vscode/src/vs/base/common/arrays.js +7 -1
- package/vscode/src/vs/base/common/date.js +61 -63
- package/vscode/src/vs/base/common/errorMessage.js +8 -22
- package/vscode/src/vs/base/common/event.d.ts +16 -0
- package/vscode/src/vs/base/common/event.js +4 -0
- package/vscode/src/vs/base/common/hotReload.js +13 -1
- package/vscode/src/vs/base/common/hotReloadHelpers.js +25 -0
- package/vscode/src/vs/base/common/jsonErrorMessages.js +10 -11
- package/vscode/src/vs/base/common/jsonSchema.js +122 -0
- package/vscode/src/vs/base/common/keybindingLabels.js +21 -22
- package/vscode/src/vs/base/common/labels.js +2 -2
- package/vscode/src/vs/base/common/network.js +1 -1
- package/vscode/src/vs/base/common/observableInternal/base.d.ts +1 -0
- package/vscode/src/vs/base/common/observableInternal/base.js +6 -0
- package/vscode/src/vs/base/common/observableInternal/utils.js +4 -1
- package/vscode/src/vs/base/common/path.d.ts +1 -1
- package/vscode/src/vs/base/common/path.js +20 -17
- package/vscode/src/vs/base/common/performance.js +78 -15
- package/vscode/src/vs/base/common/platform.js +14 -17
- package/vscode/src/vs/base/common/prefixTree.d.ts +2 -0
- package/vscode/src/vs/base/common/prefixTree.js +3 -0
- package/vscode/src/vs/base/common/product.d.ts +3 -7
- package/vscode/src/vs/base/common/uri.js +3 -0
- package/vscode/src/vs/base/parts/ipc/common/ipc.net.js +6 -3
- package/vscode/src/vs/editor/browser/controller/mouseHandler.js +66 -18
- package/vscode/src/vs/editor/browser/controller/mouseTarget.js +18 -5
- package/vscode/src/vs/editor/browser/controller/pointerHandler.js +3 -3
- package/vscode/src/vs/editor/browser/controller/textAreaHandler.js +9 -13
- package/vscode/src/vs/editor/browser/coreCommands.js +4 -5
- package/vscode/src/vs/editor/browser/editorExtensions.js +7 -8
- package/vscode/src/vs/editor/browser/observableCodeEditor.js +2 -0
- package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js +2 -3
- package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js +2 -3
- package/vscode/src/vs/editor/browser/view.js +3 -1
- package/vscode/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.js +1 -2
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +4 -6
- package/vscode/src/vs/editor/browser/widget/codeEditor/editor.css.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js +13 -14
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js +17 -38
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorDecorations.js +20 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js +6 -6
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js +11 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js +10 -13
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js +6 -7
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.js +37 -3
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.js +4 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js +33 -23
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js +91 -41
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js +9 -14
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js +3 -4
- package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js +7 -13
- package/vscode/src/vs/editor/browser/widget/diffEditor/style.css.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/utils.js +80 -21
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js +4 -5
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.js +24 -18
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.js +26 -13
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.js +4 -1
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js +8 -4
- package/vscode/src/vs/editor/common/config/diffEditor.js +2 -0
- package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js +86 -115
- package/vscode/src/vs/editor/common/config/editorOptions.d.ts +11 -1
- package/vscode/src/vs/editor/common/config/editorOptions.js +547 -932
- package/vscode/src/vs/editor/common/core/editorColorRegistry.js +102 -144
- package/vscode/src/vs/editor/common/core/lineRange.js +1 -1
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.js +11 -0
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/computeMovedLines.js +2 -2
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js +8 -3
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.js +34 -34
- package/vscode/src/vs/editor/common/diff/rangeMapping.d.ts +7 -0
- package/vscode/src/vs/editor/common/diff/rangeMapping.js +40 -0
- package/vscode/src/vs/editor/common/editorContextKeys.js +52 -69
- package/vscode/src/vs/editor/common/languageFeatureRegistry.d.ts +1 -1
- package/vscode/src/vs/editor/common/languageFeatureRegistry.js +27 -14
- package/vscode/src/vs/editor/common/languages/modesRegistry.js +2 -3
- package/vscode/src/vs/editor/common/languages.d.ts +4 -0
- package/vscode/src/vs/editor/common/languages.js +28 -29
- package/vscode/src/vs/editor/common/model/editStack.js +2 -3
- package/vscode/src/vs/editor/common/model/guidesTextModelPart.js +1 -1
- package/vscode/src/vs/editor/common/standaloneStrings.js +57 -54
- package/vscode/src/vs/editor/common/viewLayout/viewLineRenderer.js +3 -9
- package/vscode/src/vs/editor/common/viewModel/modelLineProjection.js +1 -1
- package/vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js +7 -14
- package/vscode/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.js +7 -12
- package/vscode/src/vs/editor/contrib/caretOperations/browser/caretOperations.js +3 -4
- package/vscode/src/vs/editor/contrib/caretOperations/browser/transpose.js +2 -3
- package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js +18 -19
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js +2 -3
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionCommands.js +29 -53
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionContributions.js +22 -10
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +8 -9
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +9 -10
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.css.js +1 -1
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +183 -9
- package/vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.js +4 -5
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js +3 -4
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.js +2 -3
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.js +3 -4
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js +10 -13
- package/vscode/src/vs/editor/contrib/comment/browser/comment.js +7 -8
- package/vscode/src/vs/editor/contrib/contextmenu/browser/contextmenu.js +12 -15
- package/vscode/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.js +3 -4
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js +5 -7
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +9 -11
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +9 -10
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.js +3 -5
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js +4 -5
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js +3 -16
- package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js +3 -5
- package/vscode/src/vs/editor/contrib/find/browser/findController.js +20 -24
- package/vscode/src/vs/editor/contrib/find/browser/findModel.js +6 -1
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +31 -35
- package/vscode/src/vs/editor/contrib/folding/browser/folding.js +20 -21
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +11 -25
- package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js +4 -5
- package/vscode/src/vs/editor/contrib/format/browser/formatActions.js +3 -4
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoError.js +9 -10
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js +18 -25
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js +46 -47
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.js +42 -17
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js +3 -4
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +5 -13
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js +4 -5
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +4 -5
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.js +15 -22
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.js +7 -11
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverRendered.js +5 -7
- package/vscode/src/vs/editor/contrib/hover/browser/getHover.js +8 -4
- package/vscode/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.js +24 -38
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js +3 -4
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js +25 -27
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +12 -15
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +6 -7
- package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +3 -4
- package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js +21 -22
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +9 -10
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/commands.js +12 -13
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.js +3 -4
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.js +7 -10
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.js +51 -42
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.js +3 -5
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.js +6 -7
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.js +12 -16
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution.js +0 -3
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.css.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.js +58 -39
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditSideBySideWidget.css.js +4 -0
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditSideBySideWidget.js +301 -0
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/commands.js +7 -8
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/consts.js +3 -4
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/inlineEditsController.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/inlineEditsWidget.js +1 -1
- package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js +2 -3
- package/vscode/src/vs/editor/contrib/linesOperations/browser/linesOperations.js +31 -32
- package/vscode/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +3 -4
- package/vscode/src/vs/editor/contrib/links/browser/links.js +12 -14
- package/vscode/src/vs/editor/contrib/message/browser/messageController.js +2 -3
- package/vscode/src/vs/editor/contrib/multicursor/browser/multicursor.js +23 -24
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.css.js +1 -1
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.js +2 -3
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +11 -12
- package/vscode/src/vs/editor/contrib/peekView/browser/peekView.js +20 -35
- package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js +5 -56
- package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.css.js +1 -1
- package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderTextContribution.js +71 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +8 -11
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +35 -41
- package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js +3 -4
- package/vscode/src/vs/editor/contrib/rename/browser/rename.js +13 -25
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +9 -11
- package/vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.js +5 -6
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js +5 -6
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js +5 -6
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +13 -15
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js +1 -1
- package/vscode/src/vs/editor/contrib/suggest/browser/suggest.js +10 -20
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js +12 -14
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js +19 -32
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +3 -4
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +3 -4
- package/vscode/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.js +67 -101
- package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +6 -12
- package/vscode/src/vs/editor/contrib/tokenization/browser/tokenization.js +2 -3
- package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +30 -49
- package/vscode/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js +7 -9
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js +18 -27
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +5 -6
- package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js +2 -3
- package/vscode/src/vs/nls.js +27 -21
- package/vscode/src/vs/platform/accessibility/browser/accessibleView.js +15 -9
- package/vscode/src/vs/platform/accessibility/browser/accessibleViewRegistry.js +1 -16
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.d.ts +0 -1
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +53 -56
- package/vscode/src/vs/platform/action/common/actionCommonCategories.js +7 -8
- package/vscode/src/vs/platform/actionWidget/browser/actionList.js +5 -6
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js +8 -9
- package/vscode/src/vs/platform/actions/browser/buttonbar.js +4 -5
- package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js +43 -13
- package/vscode/src/vs/platform/actions/browser/toolbar.js +5 -6
- package/vscode/src/vs/platform/actions/common/actions.d.ts +4 -0
- package/vscode/src/vs/platform/actions/common/actions.js +4 -0
- package/vscode/src/vs/platform/actions/common/actions.service.d.ts +14 -1
- package/vscode/src/vs/platform/actions/common/menuResetAction.js +2 -3
- package/vscode/src/vs/platform/actions/common/menuService.js +52 -21
- package/vscode/src/vs/platform/configuration/common/configurationModels.js +11 -3
- package/vscode/src/vs/platform/configuration/common/configurationRegistry.d.ts +14 -8
- package/vscode/src/vs/platform/configuration/common/configurationRegistry.js +180 -146
- package/vscode/src/vs/platform/configuration/common/configurations.js +2 -2
- package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js +2 -3
- package/vscode/src/vs/platform/contextkey/common/contextkey.js +13 -21
- package/vscode/src/vs/platform/contextkey/common/contextkeys.js +10 -15
- package/vscode/src/vs/platform/contextkey/common/scanner.js +7 -16
- package/vscode/src/vs/platform/contextview/browser/contextMenuService.js +2 -3
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +11 -13
- package/vscode/src/vs/platform/dnd/browser/dnd.js +3 -5
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.d.ts +7 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +3 -5
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.service.d.ts +3 -2
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +2 -3
- package/vscode/src/vs/platform/extensionManagement/common/extensionStorage.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js +25 -33
- package/vscode/src/vs/platform/extensions/common/extensionValidator.js +33 -67
- package/vscode/src/vs/platform/extensions/common/extensions.d.ts +3 -18
- package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js +31 -0
- package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +3 -8
- package/vscode/src/vs/platform/files/common/files.js +7 -8
- package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js +2 -3
- package/vscode/src/vs/platform/instantiation/common/instantiationService.js +5 -0
- package/vscode/src/vs/platform/jsonschemas/common/jsonContributionRegistry.d.ts +10 -0
- package/vscode/src/vs/platform/jsonschemas/common/jsonContributionRegistry.js +8 -0
- package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js +9 -14
- package/vscode/src/vs/platform/languagePacks/common/languagePacks.js +2 -3
- package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +4 -5
- package/vscode/src/vs/platform/list/browser/listService.js +43 -71
- package/vscode/src/vs/platform/log/common/log.js +7 -8
- package/vscode/src/vs/platform/markers/common/markers.js +4 -5
- package/vscode/src/vs/platform/observable/common/wrapInReloadableClass.js +51 -0
- package/vscode/src/vs/platform/quickinput/browser/media/quickInput.css.js +1 -1
- package/vscode/src/vs/platform/quickinput/browser/quickInput.js +39 -32
- package/vscode/src/vs/platform/quickinput/browser/quickInputActions.js +7 -11
- package/vscode/src/vs/platform/quickinput/browser/quickInputController.js +14 -11
- package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +99 -142
- package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +3 -5
- package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js +3 -4
- package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts +16 -1
- package/vscode/src/vs/platform/quickinput/common/quickInput.js +6 -1
- package/vscode/src/vs/platform/request/common/request.js +23 -36
- package/vscode/src/vs/platform/theme/browser/defaultStyles.js +11 -2
- package/vscode/src/vs/platform/theme/common/colorUtils.js +3 -4
- package/vscode/src/vs/platform/theme/common/colors/baseColors.js +27 -37
- package/vscode/src/vs/platform/theme/common/colors/chartsColors.js +10 -11
- package/vscode/src/vs/platform/theme/common/colors/editorColors.js +120 -207
- package/vscode/src/vs/platform/theme/common/colors/inputColors.js +53 -61
- package/vscode/src/vs/platform/theme/common/colors/listColors.js +51 -98
- package/vscode/src/vs/platform/theme/common/colors/menuColors.js +8 -9
- package/vscode/src/vs/platform/theme/common/colors/minimapColors.js +13 -15
- package/vscode/src/vs/platform/theme/common/colors/miscColors.js +12 -16
- package/vscode/src/vs/platform/theme/common/colors/quickpickColors.js +13 -17
- package/vscode/src/vs/platform/theme/common/colors/searchColors.js +4 -9
- package/vscode/src/vs/platform/theme/common/iconRegistry.js +7 -9
- package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +49 -56
- package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js +35 -55
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js +2 -3
- package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js +5 -8
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.js +38 -19
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js +3 -5
- package/vscode/src/vs/platform/workspace/common/workspace.js +2 -3
- package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +88 -8
- package/vscode/src/vs/workbench/api/common/extHostApiCommands.js +60 -0
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +48 -18
- package/vscode/src/vs/workbench/api/common/extHostComments.js +26 -4
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +4 -6
- package/vscode/src/vs/workbench/api/common/extHostDocumentData.js +3 -0
- package/vscode/src/vs/workbench/api/common/extHostEmbedding.js +1 -0
- package/vscode/src/vs/workbench/api/common/extHostExtensionActivator.js +6 -5
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +19 -17
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +45 -48
- package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js +2 -1
- package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +2 -3
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +2 -3
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +3 -9
- package/vscode/src/vs/workbench/api/common/extHostNotebookDocument.js +3 -0
- package/vscode/src/vs/workbench/api/common/extHostNotebookEditor.js +3 -0
- package/vscode/src/vs/workbench/api/common/extHostQuickOpen.js +12 -8
- package/vscode/src/vs/workbench/api/common/extHostSCM.js +5 -5
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +4 -6
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +3 -5
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +2 -8
- package/vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostTesting.js +69 -6
- package/vscode/src/vs/workbench/api/common/extHostTextEditor.js +4 -1
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +2 -3
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +3 -4
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +41 -11
- package/vscode/src/vs/workbench/api/common/extHostTypes.js +78 -23
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +10 -5
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +19 -30
- package/vscode/src/vs/workbench/browser/actions/developerActions.js +41 -59
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +161 -132
- package/vscode/src/vs/workbench/browser/actions/textInputActions.js +7 -8
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +30 -43
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +22 -23
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +5 -6
- package/vscode/src/vs/workbench/browser/actions.js +2 -3
- package/vscode/src/vs/workbench/browser/editor.js +3 -4
- package/vscode/src/vs/workbench/browser/labels.js +3 -4
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +12 -17
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +16 -25
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +2 -3
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +5 -7
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +45 -53
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js +12 -13
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js +2 -3
- package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js +7 -8
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +153 -156
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +206 -329
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommandsContext.js +134 -0
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js +17 -17
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js +14 -15
- package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js +3 -4
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +15 -23
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +8 -11
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +63 -75
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +3 -4
- package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +16 -17
- package/vscode/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.js +1 -3
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +2 -3
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +2 -3
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +6 -9
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +2 -3
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +17 -19
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsActions.js +18 -19
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js +7 -11
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js +7 -8
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +10 -11
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsList.js +9 -24
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js +16 -28
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js +4 -11
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js +6 -13
- package/vscode/src/vs/workbench/browser/parts/panel/media/panelpart.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +48 -49
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +20 -22
- package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +3 -4
- package/vscode/src/vs/workbench/browser/parts/views/checkbox.js +2 -3
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +55 -49
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +2 -3
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.d.ts +2 -2
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +12 -11
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +11 -11
- package/vscode/src/vs/workbench/browser/quickaccess.js +2 -3
- package/vscode/src/vs/workbench/browser/window.js +20 -28
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +376 -584
- package/vscode/src/vs/workbench/common/configuration.js +15 -19
- package/vscode/src/vs/workbench/common/contextkeys.js +87 -100
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +2 -3
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +2 -9
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +3 -5
- package/vscode/src/vs/workbench/common/editor.d.ts +5 -2
- package/vscode/src/vs/workbench/common/editor.js +5 -6
- package/vscode/src/vs/workbench/common/theme.js +281 -450
- package/vscode/src/vs/workbench/common/views.js +7 -11
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +207 -284
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +50 -16
- package/vscode/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.js +5 -2
- package/vscode/src/vs/workbench/contrib/accessibility/common/accessibilityCommands.js +1 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +29 -15
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatClear.js +17 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js +5 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +10 -15
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.js +2 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.js +26 -27
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAgentHover.js +3 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.js +119 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.js +48 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart.js +2 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.js +11 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.js +62 -33
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTaskContentPart.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.js +5 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.js +2 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js +3 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js +2 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js +47 -26
- package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js +64 -37
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.js +2 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js +36 -20
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.js +32 -29
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js +8 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/media/chat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +0 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatColors.js +7 -8
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +17 -28
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +59 -9
- package/vscode/src/vs/workbench/contrib/chat/common/chatRequestParser.js +10 -3
- package/vscode/src/vs/workbench/contrib/chat/common/chatService.js +9 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js +16 -6
- package/vscode/src/vs/workbench/contrib/chat/common/chatWordCounter.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/languageModels.js +8 -14
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActions.contribution.js +3 -1
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +80 -23
- package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +11 -12
- package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +7 -8
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +5 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.js +25 -30
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +5 -7
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +11 -12
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +5 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +7 -8
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +45 -13
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +3 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +5 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +3 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +3 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +6 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +9 -11
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +10 -15
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +5 -6
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +14 -49
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +21 -18
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +4 -5
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +8 -13
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +43 -25
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js +27 -39
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +10 -14
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsModel.js +2 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +15 -18
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +25 -29
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +10 -11
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +11 -15
- package/vscode/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.js +1 -0
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +11 -17
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js +6 -9
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +2 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js +33 -36
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointWidget.js +18 -22
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +77 -97
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.js +15 -17
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +13 -14
- package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +35 -40
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +58 -75
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSessionPicker.js +4 -5
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +2 -3
- package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts +8 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +90 -205
- package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js +28 -11
- package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js +2 -3
- package/vscode/src/vs/workbench/contrib/debug/common/debugUtils.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/disassemblyViewInput.js +3 -4
- package/vscode/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.js +2 -3
- package/vscode/src/vs/workbench/contrib/debug/common/replModel.js +5 -6
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +342 -359
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +35 -74
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js +8 -19
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +3 -4
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js +5 -7
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +7 -14
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +6 -8
- package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +2 -3
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +12 -20
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +28 -38
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +18 -22
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +108 -168
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands._save.js +55 -30
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +9 -9
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +45 -59
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._configuration.js +102 -151
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._editorPane.js +3 -4
- package/vscode/src/vs/workbench/contrib/files/browser/files.js +21 -12
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +2 -3
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +6 -8
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +9 -10
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +20 -29
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +54 -35
- package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +7 -10
- package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +2 -3
- package/vscode/src/vs/workbench/contrib/files/common/files.js +19 -40
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +5 -7
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js +28 -36
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js +5 -6
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +2 -3
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +5 -10
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +23 -25
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.js +20 -6
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +26 -88
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +2 -34
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +7 -8
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js +13 -33
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js +2 -3
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +51 -91
- package/vscode/src/vs/workbench/contrib/issue/common/issue.service.js +2 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +2 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +40 -56
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +3 -4
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +9 -10
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js +2 -3
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +43 -46
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js +6 -5
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js +3 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js +8 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +18 -19
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +4 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js +3 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js +30 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js +7 -13
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js +16 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js +9 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/foldingController.js +4 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.js +5 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +13 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +29 -54
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookIcons.js +29 -30
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.js +11 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.js +5 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.js +54 -24
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js +3 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.js +5 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js +2 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.js +4 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js +3 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js +3 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js +5 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js +2 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js +22 -13
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js +8 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.js +17 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.js +13 -25
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.js +51 -43
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js +18 -26
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js +3 -4
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookContextKeys.js +3 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +2 -3
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +4 -10
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js +14 -24
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +12 -12
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js +50 -51
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.js +3 -2
- package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js +24 -31
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +27 -39
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIcons.js +18 -23
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +68 -80
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +3 -4
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +26 -57
- package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +11 -12
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js +2 -3
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +14 -16
- package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js +3 -4
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js +2 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js +3 -4
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +5 -19
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +4 -5
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +17 -29
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +30 -31
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +9 -13
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +9 -13
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +5 -7
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts +5 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.service.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +5 -14
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalMenus.js +33 -34
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.d.ts +2 -0
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +9 -15
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +37 -51
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +21 -37
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalStrings.js +29 -34
- package/vscode/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.js +4 -0
- package/vscode/src/vs/workbench/contrib/testing/common/constants.js +16 -13
- package/vscode/src/vs/workbench/contrib/testing/common/testId.js +1 -1
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +6 -7
- package/vscode/src/vs/workbench/contrib/testing/common/testTypes.d.ts +23 -1
- package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js +23 -1
- package/vscode/src/vs/workbench/contrib/url/browser/trustedDomains.js +7 -8
- package/vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js +4 -5
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor.js +21 -2
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +2 -3
- package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js +3 -8
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +17 -11
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +23 -25
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js +21 -34
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js +3 -5
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +35 -53
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +3 -5
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.js +2 -3
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +7 -8
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +145 -236
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +14 -19
- package/vscode/src/vs/workbench/services/language/common/languageService.js +40 -57
- package/vscode/src/vs/workbench/services/layout/browser/layoutService.d.ts +2 -1
- package/vscode/src/vs/workbench/services/layout/browser/layoutService.js +8 -2
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycle.d.ts +34 -4
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycle.js +6 -1
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js +3 -3
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js +3 -4
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js +8 -9
- package/vscode/src/vs/workbench/services/preferences/common/preferences.d.ts +1 -3
- package/vscode/src/vs/workbench/services/preferences/common/preferences.js +2 -1
- package/vscode/src/vs/workbench/services/preferences/common/preferences.service.d.ts +5 -2
- package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js +3 -4
- package/vscode/src/vs/workbench/services/preferences/common/preferencesModels.d.ts +5 -3
- package/vscode/src/vs/workbench/services/remote/common/remoteAgentService.d.ts +1 -0
- package/vscode/src/vs/workbench/services/remote/common/remoteAgentService.service.d.ts +4 -0
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +14 -20
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +9 -9
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +2 -8
- package/vscode/src/vs/workbench/services/search/common/search.js +1 -1
- package/vscode/src/vs/workbench/services/search/common/searchExtTypes.js +41 -1
- package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js +12 -27
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +4 -5
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +34 -50
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +22 -31
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorModel.js +1 -1
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +4 -5
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js +2 -3
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +12 -13
- package/vscode/src/vs/workbench/services/views/browser/viewsService.js +8 -9
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +25 -33
- package/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts +119 -0
- package/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts +61 -3
- package/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts +26 -0
- package/vscode-dts/vscode.proposed.commentReveal.d.ts +21 -8
- package/vscode-dts/vscode.proposed.commentThreadApplicability.d.ts +0 -2
- package/vscode-dts/vscode.proposed.contribSourceControlHistoryItemChangesMenu.d.ts +7 -0
- package/vscode-dts/vscode.proposed.fileComments.d.ts +1 -1
- package/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts +100 -0
- package/vscode-dts/vscode.proposed.findFiles2New.d.ts +80 -0
- package/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts +143 -0
- package/vscode-dts/vscode.proposed.lmTools.d.ts +5 -0
- package/vscode-dts/vscode.proposed.quickInputButtonLocation.d.ts +29 -0
- package/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts +2 -0
- package/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts +38 -0
- package/vscode-dts/vscode.proposed.testRelatedCode.d.ts +36 -0
- package/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts +46 -0
- package/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts +234 -0
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/model.js +0 -14
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/hoverParticipant.js +0 -115
- package/vscode/src/vs/platform/issue/common/issue.service.js +0 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/editActions.js +0 -570
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.js +0 -207
- package/vscode/src/vs/workbench/contrib/testing/common/observableValue.js +0 -30
- package/vscode/src/vs/workbench/services/preferences/common/preferencesModels.js +0 -1016
- package/vscode/src/vs/workbench/services/preferences/common/preferencesValidation.js +0 -390
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { localize } from '../../../nls.js';
|
|
2
2
|
import { Color, RGBA } from '../../../base/common/color.js';
|
|
3
3
|
import { registerColor } from '../../../platform/theme/common/colorUtils.js';
|
|
4
4
|
import { contrastBorder, activeContrastBorder } from '../../../platform/theme/common/colors/baseColors.js';
|
|
@@ -12,216 +12,174 @@ import '../../../platform/theme/common/colors/miscColors.js';
|
|
|
12
12
|
import '../../../platform/theme/common/colors/quickpickColors.js';
|
|
13
13
|
import '../../../platform/theme/common/colors/searchColors.js';
|
|
14
14
|
import { registerThemingParticipant } from '../../../platform/theme/common/themeService.js';
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
0,
|
|
19
|
-
'Background color for the highlight of line at the cursor position.'
|
|
20
|
-
)));
|
|
21
|
-
const editorLineHighlightBorder = registerColor('editor.lineHighlightBorder', { dark: '#282828', light: '#eeeeee', hcDark: '#f38518', hcLight: contrastBorder }, ( localizeWithPath(
|
|
22
|
-
_moduleId,
|
|
23
|
-
1,
|
|
15
|
+
const editorLineHighlight = registerColor('editor.lineHighlightBackground', null, ( localize(4577, 'Background color for the highlight of line at the cursor position.')));
|
|
16
|
+
const editorLineHighlightBorder = registerColor('editor.lineHighlightBorder', { dark: '#282828', light: '#eeeeee', hcDark: '#f38518', hcLight: contrastBorder }, ( localize(
|
|
17
|
+
4578,
|
|
24
18
|
'Background color for the border around the line at the cursor position.'
|
|
25
19
|
)));
|
|
26
|
-
const editorRangeHighlight = registerColor('editor.rangeHighlightBackground', { dark: '#ffffff0b', light: '#fdff0033', hcDark: null, hcLight: null }, (
|
|
27
|
-
|
|
28
|
-
2,
|
|
20
|
+
const editorRangeHighlight = registerColor('editor.rangeHighlightBackground', { dark: '#ffffff0b', light: '#fdff0033', hcDark: null, hcLight: null }, ( localize(
|
|
21
|
+
4579,
|
|
29
22
|
'Background color of highlighted ranges, like by quick open and find features. The color must not be opaque so as not to hide underlying decorations.'
|
|
30
23
|
)), true);
|
|
31
|
-
registerColor('editor.rangeHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, (
|
|
32
|
-
registerColor('editor.symbolHighlightBackground', { dark: editorFindMatchHighlight, light: editorFindMatchHighlight, hcDark: null, hcLight: null }, (
|
|
33
|
-
|
|
34
|
-
4,
|
|
24
|
+
registerColor('editor.rangeHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localize(4580, 'Background color of the border around highlighted ranges.')));
|
|
25
|
+
registerColor('editor.symbolHighlightBackground', { dark: editorFindMatchHighlight, light: editorFindMatchHighlight, hcDark: null, hcLight: null }, ( localize(
|
|
26
|
+
4581,
|
|
35
27
|
'Background color of highlighted symbol, like for go to definition or go next/previous symbol. The color must not be opaque so as not to hide underlying decorations.'
|
|
36
28
|
)), true);
|
|
37
|
-
registerColor('editor.symbolHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, (
|
|
38
|
-
const editorCursorForeground = registerColor('editorCursor.foreground', { dark: '#AEAFAD', light: Color.black, hcDark: Color.white, hcLight: '#0F4A85' }, (
|
|
39
|
-
const editorCursorBackground = registerColor('editorCursor.background', null, (
|
|
40
|
-
|
|
41
|
-
7,
|
|
29
|
+
registerColor('editor.symbolHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localize(4582, 'Background color of the border around highlighted symbols.')));
|
|
30
|
+
const editorCursorForeground = registerColor('editorCursor.foreground', { dark: '#AEAFAD', light: Color.black, hcDark: Color.white, hcLight: '#0F4A85' }, ( localize(4583, 'Color of the editor cursor.')));
|
|
31
|
+
const editorCursorBackground = registerColor('editorCursor.background', null, ( localize(
|
|
32
|
+
4584,
|
|
42
33
|
'The background color of the editor cursor. Allows customizing the color of a character overlapped by a block cursor.'
|
|
43
34
|
)));
|
|
44
|
-
const editorMultiCursorPrimaryForeground = registerColor('editorMultiCursor.primary.foreground', editorCursorForeground, (
|
|
45
|
-
|
|
46
|
-
8,
|
|
35
|
+
const editorMultiCursorPrimaryForeground = registerColor('editorMultiCursor.primary.foreground', editorCursorForeground, ( localize(
|
|
36
|
+
4585,
|
|
47
37
|
'Color of the primary editor cursor when multiple cursors are present.'
|
|
48
38
|
)));
|
|
49
|
-
const editorMultiCursorPrimaryBackground = registerColor('editorMultiCursor.primary.background', editorCursorBackground, (
|
|
50
|
-
|
|
51
|
-
9,
|
|
39
|
+
const editorMultiCursorPrimaryBackground = registerColor('editorMultiCursor.primary.background', editorCursorBackground, ( localize(
|
|
40
|
+
4586,
|
|
52
41
|
'The background color of the primary editor cursor when multiple cursors are present. Allows customizing the color of a character overlapped by a block cursor.'
|
|
53
42
|
)));
|
|
54
|
-
const editorMultiCursorSecondaryForeground = registerColor('editorMultiCursor.secondary.foreground', editorCursorForeground, (
|
|
55
|
-
|
|
56
|
-
10,
|
|
43
|
+
const editorMultiCursorSecondaryForeground = registerColor('editorMultiCursor.secondary.foreground', editorCursorForeground, ( localize(
|
|
44
|
+
4587,
|
|
57
45
|
'Color of secondary editor cursors when multiple cursors are present.'
|
|
58
46
|
)));
|
|
59
|
-
const editorMultiCursorSecondaryBackground = registerColor('editorMultiCursor.secondary.background', editorCursorBackground, (
|
|
60
|
-
|
|
61
|
-
11,
|
|
47
|
+
const editorMultiCursorSecondaryBackground = registerColor('editorMultiCursor.secondary.background', editorCursorBackground, ( localize(
|
|
48
|
+
4588,
|
|
62
49
|
'The background color of secondary editor cursors when multiple cursors are present. Allows customizing the color of a character overlapped by a block cursor.'
|
|
63
50
|
)));
|
|
64
|
-
const editorWhitespaces = registerColor('editorWhitespace.foreground', { dark: '#e3e4e229', light: '#33333333', hcDark: '#e3e4e229', hcLight: '#CCCCCC' }, (
|
|
65
|
-
const editorLineNumbers = registerColor('editorLineNumber.foreground', { dark: '#858585', light: '#237893', hcDark: Color.white, hcLight: '#292929' }, (
|
|
66
|
-
const deprecatedEditorIndentGuides = registerColor('editorIndentGuide.background', editorWhitespaces, (
|
|
67
|
-
|
|
68
|
-
15,
|
|
51
|
+
const editorWhitespaces = registerColor('editorWhitespace.foreground', { dark: '#e3e4e229', light: '#33333333', hcDark: '#e3e4e229', hcLight: '#CCCCCC' }, ( localize(4589, 'Color of whitespace characters in the editor.')));
|
|
52
|
+
const editorLineNumbers = registerColor('editorLineNumber.foreground', { dark: '#858585', light: '#237893', hcDark: Color.white, hcLight: '#292929' }, ( localize(4590, 'Color of editor line numbers.')));
|
|
53
|
+
const deprecatedEditorIndentGuides = registerColor('editorIndentGuide.background', editorWhitespaces, ( localize(4591, 'Color of the editor indentation guides.')), false, ( localize(
|
|
54
|
+
4592,
|
|
69
55
|
'\'editorIndentGuide.background\' is deprecated. Use \'editorIndentGuide.background1\' instead.'
|
|
70
56
|
)));
|
|
71
|
-
const deprecatedEditorActiveIndentGuides = registerColor('editorIndentGuide.activeBackground', editorWhitespaces, (
|
|
72
|
-
|
|
73
|
-
17,
|
|
57
|
+
const deprecatedEditorActiveIndentGuides = registerColor('editorIndentGuide.activeBackground', editorWhitespaces, ( localize(4593, 'Color of the active editor indentation guides.')), false, ( localize(
|
|
58
|
+
4594,
|
|
74
59
|
'\'editorIndentGuide.activeBackground\' is deprecated. Use \'editorIndentGuide.activeBackground1\' instead.'
|
|
75
60
|
)));
|
|
76
|
-
const editorIndentGuide1 = registerColor('editorIndentGuide.background1', deprecatedEditorIndentGuides, (
|
|
77
|
-
const editorIndentGuide2 = registerColor('editorIndentGuide.background2', '#00000000', (
|
|
78
|
-
const editorIndentGuide3 = registerColor('editorIndentGuide.background3', '#00000000', (
|
|
79
|
-
const editorIndentGuide4 = registerColor('editorIndentGuide.background4', '#00000000', (
|
|
80
|
-
const editorIndentGuide5 = registerColor('editorIndentGuide.background5', '#00000000', (
|
|
81
|
-
const editorIndentGuide6 = registerColor('editorIndentGuide.background6', '#00000000', (
|
|
82
|
-
const editorActiveIndentGuide1 = registerColor('editorIndentGuide.activeBackground1', deprecatedEditorActiveIndentGuides, (
|
|
83
|
-
const editorActiveIndentGuide2 = registerColor('editorIndentGuide.activeBackground2', '#00000000', (
|
|
84
|
-
const editorActiveIndentGuide3 = registerColor('editorIndentGuide.activeBackground3', '#00000000', (
|
|
85
|
-
const editorActiveIndentGuide4 = registerColor('editorIndentGuide.activeBackground4', '#00000000', (
|
|
86
|
-
const editorActiveIndentGuide5 = registerColor('editorIndentGuide.activeBackground5', '#00000000', (
|
|
87
|
-
const editorActiveIndentGuide6 = registerColor('editorIndentGuide.activeBackground6', '#00000000', (
|
|
88
|
-
const deprecatedEditorActiveLineNumber = registerColor('editorActiveLineNumber.foreground', { dark: '#c6c6c6', light: '#0B216F', hcDark: activeContrastBorder, hcLight: activeContrastBorder }, (
|
|
89
|
-
|
|
90
|
-
31,
|
|
61
|
+
const editorIndentGuide1 = registerColor('editorIndentGuide.background1', deprecatedEditorIndentGuides, ( localize(4595, 'Color of the editor indentation guides (1).')));
|
|
62
|
+
const editorIndentGuide2 = registerColor('editorIndentGuide.background2', '#00000000', ( localize(4596, 'Color of the editor indentation guides (2).')));
|
|
63
|
+
const editorIndentGuide3 = registerColor('editorIndentGuide.background3', '#00000000', ( localize(4597, 'Color of the editor indentation guides (3).')));
|
|
64
|
+
const editorIndentGuide4 = registerColor('editorIndentGuide.background4', '#00000000', ( localize(4598, 'Color of the editor indentation guides (4).')));
|
|
65
|
+
const editorIndentGuide5 = registerColor('editorIndentGuide.background5', '#00000000', ( localize(4599, 'Color of the editor indentation guides (5).')));
|
|
66
|
+
const editorIndentGuide6 = registerColor('editorIndentGuide.background6', '#00000000', ( localize(4600, 'Color of the editor indentation guides (6).')));
|
|
67
|
+
const editorActiveIndentGuide1 = registerColor('editorIndentGuide.activeBackground1', deprecatedEditorActiveIndentGuides, ( localize(4601, 'Color of the active editor indentation guides (1).')));
|
|
68
|
+
const editorActiveIndentGuide2 = registerColor('editorIndentGuide.activeBackground2', '#00000000', ( localize(4602, 'Color of the active editor indentation guides (2).')));
|
|
69
|
+
const editorActiveIndentGuide3 = registerColor('editorIndentGuide.activeBackground3', '#00000000', ( localize(4603, 'Color of the active editor indentation guides (3).')));
|
|
70
|
+
const editorActiveIndentGuide4 = registerColor('editorIndentGuide.activeBackground4', '#00000000', ( localize(4604, 'Color of the active editor indentation guides (4).')));
|
|
71
|
+
const editorActiveIndentGuide5 = registerColor('editorIndentGuide.activeBackground5', '#00000000', ( localize(4605, 'Color of the active editor indentation guides (5).')));
|
|
72
|
+
const editorActiveIndentGuide6 = registerColor('editorIndentGuide.activeBackground6', '#00000000', ( localize(4606, 'Color of the active editor indentation guides (6).')));
|
|
73
|
+
const deprecatedEditorActiveLineNumber = registerColor('editorActiveLineNumber.foreground', { dark: '#c6c6c6', light: '#0B216F', hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localize(4607, 'Color of editor active line number')), false, ( localize(
|
|
74
|
+
4608,
|
|
91
75
|
'Id is deprecated. Use \'editorLineNumber.activeForeground\' instead.'
|
|
92
76
|
)));
|
|
93
|
-
registerColor('editorLineNumber.activeForeground', deprecatedEditorActiveLineNumber, (
|
|
94
|
-
const editorDimmedLineNumber = registerColor('editorLineNumber.dimmedForeground', null, (
|
|
95
|
-
|
|
96
|
-
32,
|
|
77
|
+
registerColor('editorLineNumber.activeForeground', deprecatedEditorActiveLineNumber, ( localize(4608, 'Color of editor active line number')));
|
|
78
|
+
const editorDimmedLineNumber = registerColor('editorLineNumber.dimmedForeground', null, ( localize(
|
|
79
|
+
4609,
|
|
97
80
|
'Color of the final editor line when editor.renderFinalNewline is set to dimmed.'
|
|
98
81
|
)));
|
|
99
|
-
registerColor('editorRuler.foreground', { dark: '#5A5A5A', light: Color.lightgrey, hcDark: Color.white, hcLight: '#292929' }, (
|
|
100
|
-
registerColor('editorCodeLens.foreground', { dark: '#999999', light: '#919191', hcDark: '#999999', hcLight: '#292929' }, (
|
|
101
|
-
registerColor('editorBracketMatch.background', { dark: '#0064001a', light: '#0064001a', hcDark: '#0064001a', hcLight: '#0000' }, (
|
|
102
|
-
registerColor('editorBracketMatch.border', { dark: '#888', light: '#B9B9B9', hcDark: contrastBorder, hcLight: contrastBorder }, (
|
|
103
|
-
const editorOverviewRulerBorder = registerColor('editorOverviewRuler.border', { dark: '#7f7f7f4d', light: '#7f7f7f4d', hcDark: '#7f7f7f4d', hcLight: '#666666' }, (
|
|
104
|
-
const editorOverviewRulerBackground = registerColor('editorOverviewRuler.background', null, (
|
|
105
|
-
registerColor('editorGutter.background', editorBackground, (
|
|
106
|
-
|
|
107
|
-
39,
|
|
82
|
+
registerColor('editorRuler.foreground', { dark: '#5A5A5A', light: Color.lightgrey, hcDark: Color.white, hcLight: '#292929' }, ( localize(4610, 'Color of the editor rulers.')));
|
|
83
|
+
registerColor('editorCodeLens.foreground', { dark: '#999999', light: '#919191', hcDark: '#999999', hcLight: '#292929' }, ( localize(4611, 'Foreground color of editor CodeLens')));
|
|
84
|
+
registerColor('editorBracketMatch.background', { dark: '#0064001a', light: '#0064001a', hcDark: '#0064001a', hcLight: '#0000' }, ( localize(4612, 'Background color behind matching brackets')));
|
|
85
|
+
registerColor('editorBracketMatch.border', { dark: '#888', light: '#B9B9B9', hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(4613, 'Color for matching brackets boxes')));
|
|
86
|
+
const editorOverviewRulerBorder = registerColor('editorOverviewRuler.border', { dark: '#7f7f7f4d', light: '#7f7f7f4d', hcDark: '#7f7f7f4d', hcLight: '#666666' }, ( localize(4614, 'Color of the overview ruler border.')));
|
|
87
|
+
const editorOverviewRulerBackground = registerColor('editorOverviewRuler.background', null, ( localize(4615, 'Background color of the editor overview ruler.')));
|
|
88
|
+
registerColor('editorGutter.background', editorBackground, ( localize(
|
|
89
|
+
4616,
|
|
108
90
|
'Background color of the editor gutter. The gutter contains the glyph margins and the line numbers.'
|
|
109
91
|
)));
|
|
110
|
-
registerColor('editorUnnecessaryCode.border', { dark: null, light: null, hcDark: ( (( (Color.fromHex('#fff'))).transparent(0.8))), hcLight: contrastBorder }, (
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
'Border color of unnecessary (unused) source code in the editor.'
|
|
114
|
-
)));
|
|
115
|
-
const editorUnnecessaryCodeOpacity = registerColor('editorUnnecessaryCode.opacity', { dark: ( (Color.fromHex('#000a'))), light: ( (Color.fromHex('#0007'))), hcDark: null, hcLight: null }, ( localizeWithPath(
|
|
116
|
-
_moduleId,
|
|
117
|
-
41,
|
|
92
|
+
registerColor('editorUnnecessaryCode.border', { dark: null, light: null, hcDark: ( (( (Color.fromHex('#fff'))).transparent(0.8))), hcLight: contrastBorder }, ( localize(4617, 'Border color of unnecessary (unused) source code in the editor.')));
|
|
93
|
+
const editorUnnecessaryCodeOpacity = registerColor('editorUnnecessaryCode.opacity', { dark: ( (Color.fromHex('#000a'))), light: ( (Color.fromHex('#0007'))), hcDark: null, hcLight: null }, ( localize(
|
|
94
|
+
4618,
|
|
118
95
|
'Opacity of unnecessary (unused) source code in the editor. For example, "#000000c0" will render the code with 75% opacity. For high contrast themes, use the \'editorUnnecessaryCode.border\' theme color to underline unnecessary code instead of fading it out.'
|
|
119
96
|
)));
|
|
120
|
-
registerColor('editorGhostText.border', { dark: null, light: null, hcDark: ( (( (Color.fromHex('#fff'))).transparent(0.8))), hcLight: ( (( (Color.fromHex('#292929'))).transparent(0.8))) }, (
|
|
121
|
-
const ghostTextForeground = registerColor('editorGhostText.foreground', { dark: ( (Color.fromHex('#ffffff56'))), light: ( (Color.fromHex('#0007'))), hcDark: null, hcLight: null }, (
|
|
122
|
-
registerColor('editorGhostText.background', null, (
|
|
97
|
+
registerColor('editorGhostText.border', { dark: null, light: null, hcDark: ( (( (Color.fromHex('#fff'))).transparent(0.8))), hcLight: ( (( (Color.fromHex('#292929'))).transparent(0.8))) }, ( localize(4619, 'Border color of ghost text in the editor.')));
|
|
98
|
+
const ghostTextForeground = registerColor('editorGhostText.foreground', { dark: ( (Color.fromHex('#ffffff56'))), light: ( (Color.fromHex('#0007'))), hcDark: null, hcLight: null }, ( localize(4620, 'Foreground color of the ghost text in the editor.')));
|
|
99
|
+
registerColor('editorGhostText.background', null, ( localize(4621, 'Background color of the ghost text in the editor.')));
|
|
123
100
|
const rulerRangeDefault = ( (new Color( (new RGBA(0, 122, 204, 0.6)))));
|
|
124
|
-
const overviewRulerRangeHighlight = registerColor('editorOverviewRuler.rangeHighlightForeground', rulerRangeDefault, (
|
|
125
|
-
|
|
126
|
-
45,
|
|
101
|
+
const overviewRulerRangeHighlight = registerColor('editorOverviewRuler.rangeHighlightForeground', rulerRangeDefault, ( localize(
|
|
102
|
+
4622,
|
|
127
103
|
'Overview ruler marker color for range highlights. The color must not be opaque so as not to hide underlying decorations.'
|
|
128
104
|
)), true);
|
|
129
|
-
const overviewRulerError = registerColor('editorOverviewRuler.errorForeground', { dark: ( (new Color( (new RGBA(255, 18, 18, 0.7))))), light: ( (new Color( (new RGBA(255, 18, 18, 0.7))))), hcDark: ( (new Color( (new RGBA(255, 50, 50, 1))))), hcLight: '#B5200D' }, (
|
|
130
|
-
const overviewRulerWarning = registerColor('editorOverviewRuler.warningForeground', { dark: editorWarningForeground, light: editorWarningForeground, hcDark: editorWarningBorder, hcLight: editorWarningBorder }, (
|
|
131
|
-
const overviewRulerInfo = registerColor('editorOverviewRuler.infoForeground', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: editorInfoBorder, hcLight: editorInfoBorder }, (
|
|
132
|
-
const editorBracketHighlightingForeground1 = registerColor('editorBracketHighlight.foreground1', { dark: '#FFD700', light: '#0431FAFF', hcDark: '#FFD700', hcLight: '#0431FAFF' }, (
|
|
133
|
-
|
|
134
|
-
49,
|
|
105
|
+
const overviewRulerError = registerColor('editorOverviewRuler.errorForeground', { dark: ( (new Color( (new RGBA(255, 18, 18, 0.7))))), light: ( (new Color( (new RGBA(255, 18, 18, 0.7))))), hcDark: ( (new Color( (new RGBA(255, 50, 50, 1))))), hcLight: '#B5200D' }, ( localize(4623, 'Overview ruler marker color for errors.')));
|
|
106
|
+
const overviewRulerWarning = registerColor('editorOverviewRuler.warningForeground', { dark: editorWarningForeground, light: editorWarningForeground, hcDark: editorWarningBorder, hcLight: editorWarningBorder }, ( localize(4624, 'Overview ruler marker color for warnings.')));
|
|
107
|
+
const overviewRulerInfo = registerColor('editorOverviewRuler.infoForeground', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: editorInfoBorder, hcLight: editorInfoBorder }, ( localize(4625, 'Overview ruler marker color for infos.')));
|
|
108
|
+
const editorBracketHighlightingForeground1 = registerColor('editorBracketHighlight.foreground1', { dark: '#FFD700', light: '#0431FAFF', hcDark: '#FFD700', hcLight: '#0431FAFF' }, ( localize(
|
|
109
|
+
4626,
|
|
135
110
|
'Foreground color of brackets (1). Requires enabling bracket pair colorization.'
|
|
136
111
|
)));
|
|
137
|
-
const editorBracketHighlightingForeground2 = registerColor('editorBracketHighlight.foreground2', { dark: '#DA70D6', light: '#319331FF', hcDark: '#DA70D6', hcLight: '#319331FF' }, (
|
|
138
|
-
|
|
139
|
-
50,
|
|
112
|
+
const editorBracketHighlightingForeground2 = registerColor('editorBracketHighlight.foreground2', { dark: '#DA70D6', light: '#319331FF', hcDark: '#DA70D6', hcLight: '#319331FF' }, ( localize(
|
|
113
|
+
4627,
|
|
140
114
|
'Foreground color of brackets (2). Requires enabling bracket pair colorization.'
|
|
141
115
|
)));
|
|
142
|
-
const editorBracketHighlightingForeground3 = registerColor('editorBracketHighlight.foreground3', { dark: '#179FFF', light: '#7B3814FF', hcDark: '#87CEFA', hcLight: '#7B3814FF' }, (
|
|
143
|
-
|
|
144
|
-
51,
|
|
116
|
+
const editorBracketHighlightingForeground3 = registerColor('editorBracketHighlight.foreground3', { dark: '#179FFF', light: '#7B3814FF', hcDark: '#87CEFA', hcLight: '#7B3814FF' }, ( localize(
|
|
117
|
+
4628,
|
|
145
118
|
'Foreground color of brackets (3). Requires enabling bracket pair colorization.'
|
|
146
119
|
)));
|
|
147
|
-
const editorBracketHighlightingForeground4 = registerColor('editorBracketHighlight.foreground4', '#00000000', (
|
|
148
|
-
|
|
149
|
-
52,
|
|
120
|
+
const editorBracketHighlightingForeground4 = registerColor('editorBracketHighlight.foreground4', '#00000000', ( localize(
|
|
121
|
+
4629,
|
|
150
122
|
'Foreground color of brackets (4). Requires enabling bracket pair colorization.'
|
|
151
123
|
)));
|
|
152
|
-
const editorBracketHighlightingForeground5 = registerColor('editorBracketHighlight.foreground5', '#00000000', (
|
|
153
|
-
|
|
154
|
-
53,
|
|
124
|
+
const editorBracketHighlightingForeground5 = registerColor('editorBracketHighlight.foreground5', '#00000000', ( localize(
|
|
125
|
+
4630,
|
|
155
126
|
'Foreground color of brackets (5). Requires enabling bracket pair colorization.'
|
|
156
127
|
)));
|
|
157
|
-
const editorBracketHighlightingForeground6 = registerColor('editorBracketHighlight.foreground6', '#00000000', (
|
|
158
|
-
|
|
159
|
-
54,
|
|
128
|
+
const editorBracketHighlightingForeground6 = registerColor('editorBracketHighlight.foreground6', '#00000000', ( localize(
|
|
129
|
+
4631,
|
|
160
130
|
'Foreground color of brackets (6). Requires enabling bracket pair colorization.'
|
|
161
131
|
)));
|
|
162
|
-
const editorBracketHighlightingUnexpectedBracketForeground = registerColor('editorBracketHighlight.unexpectedBracket.foreground', { dark: ( (new Color( (new RGBA(255, 18, 18, 0.8))))), light: ( (new Color( (new RGBA(255, 18, 18, 0.8))))), hcDark: ( (new Color( (new RGBA(255, 50, 50, 1))))), hcLight: '' }, (
|
|
163
|
-
const editorBracketPairGuideBackground1 = registerColor('editorBracketPairGuide.background1', '#00000000', (
|
|
164
|
-
|
|
165
|
-
56,
|
|
132
|
+
const editorBracketHighlightingUnexpectedBracketForeground = registerColor('editorBracketHighlight.unexpectedBracket.foreground', { dark: ( (new Color( (new RGBA(255, 18, 18, 0.8))))), light: ( (new Color( (new RGBA(255, 18, 18, 0.8))))), hcDark: ( (new Color( (new RGBA(255, 50, 50, 1))))), hcLight: '' }, ( localize(4632, 'Foreground color of unexpected brackets.')));
|
|
133
|
+
const editorBracketPairGuideBackground1 = registerColor('editorBracketPairGuide.background1', '#00000000', ( localize(
|
|
134
|
+
4633,
|
|
166
135
|
'Background color of inactive bracket pair guides (1). Requires enabling bracket pair guides.'
|
|
167
136
|
)));
|
|
168
|
-
const editorBracketPairGuideBackground2 = registerColor('editorBracketPairGuide.background2', '#00000000', (
|
|
169
|
-
|
|
170
|
-
57,
|
|
137
|
+
const editorBracketPairGuideBackground2 = registerColor('editorBracketPairGuide.background2', '#00000000', ( localize(
|
|
138
|
+
4634,
|
|
171
139
|
'Background color of inactive bracket pair guides (2). Requires enabling bracket pair guides.'
|
|
172
140
|
)));
|
|
173
|
-
const editorBracketPairGuideBackground3 = registerColor('editorBracketPairGuide.background3', '#00000000', (
|
|
174
|
-
|
|
175
|
-
58,
|
|
141
|
+
const editorBracketPairGuideBackground3 = registerColor('editorBracketPairGuide.background3', '#00000000', ( localize(
|
|
142
|
+
4635,
|
|
176
143
|
'Background color of inactive bracket pair guides (3). Requires enabling bracket pair guides.'
|
|
177
144
|
)));
|
|
178
|
-
const editorBracketPairGuideBackground4 = registerColor('editorBracketPairGuide.background4', '#00000000', (
|
|
179
|
-
|
|
180
|
-
59,
|
|
145
|
+
const editorBracketPairGuideBackground4 = registerColor('editorBracketPairGuide.background4', '#00000000', ( localize(
|
|
146
|
+
4636,
|
|
181
147
|
'Background color of inactive bracket pair guides (4). Requires enabling bracket pair guides.'
|
|
182
148
|
)));
|
|
183
|
-
const editorBracketPairGuideBackground5 = registerColor('editorBracketPairGuide.background5', '#00000000', (
|
|
184
|
-
|
|
185
|
-
60,
|
|
149
|
+
const editorBracketPairGuideBackground5 = registerColor('editorBracketPairGuide.background5', '#00000000', ( localize(
|
|
150
|
+
4637,
|
|
186
151
|
'Background color of inactive bracket pair guides (5). Requires enabling bracket pair guides.'
|
|
187
152
|
)));
|
|
188
|
-
const editorBracketPairGuideBackground6 = registerColor('editorBracketPairGuide.background6', '#00000000', (
|
|
189
|
-
|
|
190
|
-
61,
|
|
153
|
+
const editorBracketPairGuideBackground6 = registerColor('editorBracketPairGuide.background6', '#00000000', ( localize(
|
|
154
|
+
4638,
|
|
191
155
|
'Background color of inactive bracket pair guides (6). Requires enabling bracket pair guides.'
|
|
192
156
|
)));
|
|
193
|
-
const editorBracketPairGuideActiveBackground1 = registerColor('editorBracketPairGuide.activeBackground1', '#00000000', (
|
|
194
|
-
|
|
195
|
-
62,
|
|
157
|
+
const editorBracketPairGuideActiveBackground1 = registerColor('editorBracketPairGuide.activeBackground1', '#00000000', ( localize(
|
|
158
|
+
4639,
|
|
196
159
|
'Background color of active bracket pair guides (1). Requires enabling bracket pair guides.'
|
|
197
160
|
)));
|
|
198
|
-
const editorBracketPairGuideActiveBackground2 = registerColor('editorBracketPairGuide.activeBackground2', '#00000000', (
|
|
199
|
-
|
|
200
|
-
63,
|
|
161
|
+
const editorBracketPairGuideActiveBackground2 = registerColor('editorBracketPairGuide.activeBackground2', '#00000000', ( localize(
|
|
162
|
+
4640,
|
|
201
163
|
'Background color of active bracket pair guides (2). Requires enabling bracket pair guides.'
|
|
202
164
|
)));
|
|
203
|
-
const editorBracketPairGuideActiveBackground3 = registerColor('editorBracketPairGuide.activeBackground3', '#00000000', (
|
|
204
|
-
|
|
205
|
-
64,
|
|
165
|
+
const editorBracketPairGuideActiveBackground3 = registerColor('editorBracketPairGuide.activeBackground3', '#00000000', ( localize(
|
|
166
|
+
4641,
|
|
206
167
|
'Background color of active bracket pair guides (3). Requires enabling bracket pair guides.'
|
|
207
168
|
)));
|
|
208
|
-
const editorBracketPairGuideActiveBackground4 = registerColor('editorBracketPairGuide.activeBackground4', '#00000000', (
|
|
209
|
-
|
|
210
|
-
65,
|
|
169
|
+
const editorBracketPairGuideActiveBackground4 = registerColor('editorBracketPairGuide.activeBackground4', '#00000000', ( localize(
|
|
170
|
+
4642,
|
|
211
171
|
'Background color of active bracket pair guides (4). Requires enabling bracket pair guides.'
|
|
212
172
|
)));
|
|
213
|
-
const editorBracketPairGuideActiveBackground5 = registerColor('editorBracketPairGuide.activeBackground5', '#00000000', (
|
|
214
|
-
|
|
215
|
-
66,
|
|
173
|
+
const editorBracketPairGuideActiveBackground5 = registerColor('editorBracketPairGuide.activeBackground5', '#00000000', ( localize(
|
|
174
|
+
4643,
|
|
216
175
|
'Background color of active bracket pair guides (5). Requires enabling bracket pair guides.'
|
|
217
176
|
)));
|
|
218
|
-
const editorBracketPairGuideActiveBackground6 = registerColor('editorBracketPairGuide.activeBackground6', '#00000000', (
|
|
219
|
-
|
|
220
|
-
67,
|
|
177
|
+
const editorBracketPairGuideActiveBackground6 = registerColor('editorBracketPairGuide.activeBackground6', '#00000000', ( localize(
|
|
178
|
+
4644,
|
|
221
179
|
'Background color of active bracket pair guides (6). Requires enabling bracket pair guides.'
|
|
222
180
|
)));
|
|
223
|
-
registerColor('editorUnicodeHighlight.border', editorWarningForeground, (
|
|
224
|
-
registerColor('editorUnicodeHighlight.background', editorWarningBackground, (
|
|
181
|
+
registerColor('editorUnicodeHighlight.border', editorWarningForeground, ( localize(4645, 'Border color used to highlight unicode characters.')));
|
|
182
|
+
registerColor('editorUnicodeHighlight.background', editorWarningBackground, ( localize(4646, 'Background color used to highlight unicode characters.')));
|
|
225
183
|
registerThemingParticipant((theme, collector) => {
|
|
226
184
|
const background = theme.getColor(editorBackground);
|
|
227
185
|
const lineHighlight = theme.getColor(editorLineHighlight);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { BugIndicatingError } from '../../../base/common/errors.js';
|
|
2
2
|
import { OffsetRange } from './offsetRange.js';
|
|
3
3
|
import { Range } from './range.js';
|
|
4
|
-
import { findFirstIdxMonotonousOrArrLen,
|
|
4
|
+
import { findFirstIdxMonotonousOrArrLen, findLastIdxMonotonous, findLastMonotonous } from '../../../base/common/arraysFind.js';
|
|
5
5
|
class LineRange {
|
|
6
6
|
static fromRange(range) {
|
|
7
7
|
return ( new LineRange(range.startLineNumber, range.endLineNumber));
|
package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.js
CHANGED
|
@@ -28,6 +28,17 @@ class SequenceDiff {
|
|
|
28
28
|
static fromOffsetPairs(start, endExclusive) {
|
|
29
29
|
return ( new SequenceDiff(( new OffsetRange(start.offset1, endExclusive.offset1)), ( new OffsetRange(start.offset2, endExclusive.offset2))));
|
|
30
30
|
}
|
|
31
|
+
static assertSorted(sequenceDiffs) {
|
|
32
|
+
let last = undefined;
|
|
33
|
+
for (const cur of sequenceDiffs) {
|
|
34
|
+
if (last) {
|
|
35
|
+
if (!(last.seq1Range.endExclusive <= cur.seq1Range.start && last.seq2Range.endExclusive <= cur.seq2Range.start)) {
|
|
36
|
+
throw ( new BugIndicatingError('Sequence diffs must be sorted'));
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
last = cur;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
31
42
|
constructor(seq1Range, seq2Range) {
|
|
32
43
|
this.seq1Range = seq1Range;
|
|
33
44
|
this.seq2Range = seq2Range;
|
|
@@ -4,10 +4,10 @@ import { pushMany, compareBy, numberComparator, reverseOrder } from '../../../..
|
|
|
4
4
|
import { findLastMonotonous, MonotonousArray } from '../../../../base/common/arraysFind.js';
|
|
5
5
|
import { SetMap } from '../../../../base/common/map.js';
|
|
6
6
|
import { LineRange, LineRangeSet } from '../../core/lineRange.js';
|
|
7
|
-
import { OffsetRange } from '../../core/offsetRange.js';
|
|
8
7
|
import { LinesSliceCharSequence } from './linesSliceCharSequence.js';
|
|
9
8
|
import { isSpace, LineRangeFragment } from './utils.js';
|
|
10
9
|
import { MyersDiffAlgorithm } from './algorithms/myersDiffAlgorithm.js';
|
|
10
|
+
import { Range } from '../../core/range.js';
|
|
11
11
|
function computeMovedLines(changes, originalLines, modifiedLines, hashedOriginalLines, hashedModifiedLines, timeout) {
|
|
12
12
|
let { moves, excludedChanges } = computeMovesFromSimpleDeletionsToSimpleInsertions(changes, originalLines, modifiedLines, timeout);
|
|
13
13
|
if (!timeout.isValid()) {
|
|
@@ -202,7 +202,7 @@ function areLinesSimilar(line1, line2, timeout) {
|
|
|
202
202
|
return false;
|
|
203
203
|
}
|
|
204
204
|
const myersDiffingAlgorithm = ( new MyersDiffAlgorithm());
|
|
205
|
-
const result = myersDiffingAlgorithm.compute(( new LinesSliceCharSequence([line1], ( new
|
|
205
|
+
const result = myersDiffingAlgorithm.compute(( new LinesSliceCharSequence([line1], ( new Range(1, 1, 1, line1.length)), false)), ( new LinesSliceCharSequence([line2], ( new Range(1, 1, 1, line2.length)), false)), timeout);
|
|
206
206
|
let commonNonSpaceCharCount = 0;
|
|
207
207
|
const inverted = SequenceDiff.invert(result.diffs, line1.length);
|
|
208
208
|
for (const seq of inverted) {
|
package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js
CHANGED
|
@@ -11,7 +11,7 @@ import { optimizeSequenceDiffs, removeVeryShortMatchingLinesBetweenDiffs, extend
|
|
|
11
11
|
import { LineSequence } from './lineSequence.js';
|
|
12
12
|
import { LinesSliceCharSequence } from './linesSliceCharSequence.js';
|
|
13
13
|
import { LinesDiff, MovedText } from '../linesDiffComputer.js';
|
|
14
|
-
import { DetailedLineRangeMapping, RangeMapping } from '../rangeMapping.js';
|
|
14
|
+
import { DetailedLineRangeMapping, RangeMapping, LineRangeMapping } from '../rangeMapping.js';
|
|
15
15
|
class DefaultLinesDiffComputer {
|
|
16
16
|
constructor() {
|
|
17
17
|
this.dynamicProgrammingDiffing = ( new DynamicProgrammingDiffing());
|
|
@@ -157,8 +157,10 @@ class DefaultLinesDiffComputer {
|
|
|
157
157
|
return movesWithDiffs;
|
|
158
158
|
}
|
|
159
159
|
refineDiff(originalLines, modifiedLines, diff, timeout, considerWhitespaceChanges) {
|
|
160
|
-
const
|
|
161
|
-
const
|
|
160
|
+
const lineRangeMapping = toLineRangeMapping(diff);
|
|
161
|
+
const rangeMapping = lineRangeMapping.toRangeMapping2(originalLines, modifiedLines);
|
|
162
|
+
const slice1 = ( new LinesSliceCharSequence(originalLines, rangeMapping.originalRange, considerWhitespaceChanges));
|
|
163
|
+
const slice2 = ( new LinesSliceCharSequence(modifiedLines, rangeMapping.modifiedRange, considerWhitespaceChanges));
|
|
162
164
|
const diffResult = slice1.length + slice2.length < 500
|
|
163
165
|
? this.dynamicProgrammingDiffing.compute(slice1, slice2, timeout)
|
|
164
166
|
: this.myersDiffingAlgorithm.compute(slice1, slice2, timeout);
|
|
@@ -225,4 +227,7 @@ function getLineRangeMapping(rangeMapping, originalLines, modifiedLines) {
|
|
|
225
227
|
));
|
|
226
228
|
return ( new DetailedLineRangeMapping(originalLineRange, modifiedLineRange, [rangeMapping]));
|
|
227
229
|
}
|
|
230
|
+
function toLineRangeMapping(sequenceDiff) {
|
|
231
|
+
return ( new LineRangeMapping(( new LineRange(sequenceDiff.seq1Range.start + 1, sequenceDiff.seq1Range.endExclusive + 1)), ( new LineRange(sequenceDiff.seq2Range.start + 1, sequenceDiff.seq2Range.endExclusive + 1))));
|
|
232
|
+
}
|
|
228
233
|
export { DefaultLinesDiffComputer, getLineRangeMapping, lineRangeMappingFromRangeMappings };
|
|
@@ -5,42 +5,39 @@ import { Position } from '../../core/position.js';
|
|
|
5
5
|
import { Range } from '../../core/range.js';
|
|
6
6
|
import { isSpace } from './utils.js';
|
|
7
7
|
class LinesSliceCharSequence {
|
|
8
|
-
constructor(lines,
|
|
8
|
+
constructor(lines, range, considerWhitespaceChanges) {
|
|
9
9
|
this.lines = lines;
|
|
10
|
+
this.range = range;
|
|
10
11
|
this.considerWhitespaceChanges = considerWhitespaceChanges;
|
|
11
12
|
this.elements = [];
|
|
12
|
-
this.
|
|
13
|
-
this.
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
let line = lines[i];
|
|
23
|
-
let offset = 0;
|
|
24
|
-
if (trimFirstLineFully) {
|
|
25
|
-
offset = line.length;
|
|
26
|
-
line = '';
|
|
27
|
-
trimFirstLineFully = false;
|
|
13
|
+
this.firstElementOffsetByLineIdx = [];
|
|
14
|
+
this.lineStartOffsets = [];
|
|
15
|
+
this.trimmedWsLengthsByLineIdx = [];
|
|
16
|
+
this.firstElementOffsetByLineIdx.push(0);
|
|
17
|
+
for (let lineNumber = this.range.startLineNumber; lineNumber <= this.range.endLineNumber; lineNumber++) {
|
|
18
|
+
let line = lines[lineNumber - 1];
|
|
19
|
+
let lineStartOffset = 0;
|
|
20
|
+
if (lineNumber === this.range.startLineNumber && this.range.startColumn > 1) {
|
|
21
|
+
lineStartOffset = this.range.startColumn - 1;
|
|
22
|
+
line = line.substring(lineStartOffset);
|
|
28
23
|
}
|
|
29
|
-
|
|
24
|
+
this.lineStartOffsets.push(lineStartOffset);
|
|
25
|
+
let trimmedWsLength = 0;
|
|
26
|
+
if (!considerWhitespaceChanges) {
|
|
30
27
|
const trimmedStartLine = line.trimStart();
|
|
31
|
-
|
|
28
|
+
trimmedWsLength = line.length - trimmedStartLine.length;
|
|
32
29
|
line = trimmedStartLine.trimEnd();
|
|
33
30
|
}
|
|
34
|
-
this.
|
|
35
|
-
|
|
31
|
+
this.trimmedWsLengthsByLineIdx.push(trimmedWsLength);
|
|
32
|
+
const lineLength = lineNumber === this.range.endLineNumber ? Math.min(this.range.endColumn - 1 - lineStartOffset - trimmedWsLength, line.length) : line.length;
|
|
33
|
+
for (let i = 0; i < lineLength; i++) {
|
|
36
34
|
this.elements.push(line.charCodeAt(i));
|
|
37
35
|
}
|
|
38
|
-
if (
|
|
36
|
+
if (lineNumber < this.range.endLineNumber) {
|
|
39
37
|
this.elements.push('\n'.charCodeAt(0));
|
|
40
|
-
this.
|
|
38
|
+
this.firstElementOffsetByLineIdx.push(this.elements.length);
|
|
41
39
|
}
|
|
42
40
|
}
|
|
43
|
-
this.additionalOffsetByLine.push(0);
|
|
44
41
|
}
|
|
45
42
|
toString() {
|
|
46
43
|
return `Slice: "${this.text}"`;
|
|
@@ -77,18 +74,21 @@ class LinesSliceCharSequence {
|
|
|
77
74
|
score += getCategoryBoundaryScore(nextCategory);
|
|
78
75
|
return score;
|
|
79
76
|
}
|
|
80
|
-
translateOffset(offset) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
}
|
|
84
|
-
const i = findLastIdxMonotonous(this.firstCharOffsetByLine, (value) => value <= offset);
|
|
77
|
+
translateOffset(offset, preference = 'right') {
|
|
78
|
+
const i = findLastIdxMonotonous(this.firstElementOffsetByLineIdx, (value) => value <= offset);
|
|
79
|
+
const lineOffset = offset - this.firstElementOffsetByLineIdx[i];
|
|
85
80
|
return ( new Position(
|
|
86
|
-
this.
|
|
87
|
-
|
|
81
|
+
this.range.startLineNumber + i,
|
|
82
|
+
1 + this.lineStartOffsets[i] + lineOffset + ((lineOffset === 0 && preference === 'left') ? 0 : this.trimmedWsLengthsByLineIdx[i])
|
|
88
83
|
));
|
|
89
84
|
}
|
|
90
85
|
translateRange(range) {
|
|
91
|
-
|
|
86
|
+
const pos1 = this.translateOffset(range.start, 'right');
|
|
87
|
+
const pos2 = this.translateOffset(range.endExclusive, 'left');
|
|
88
|
+
if (pos2.isBefore(pos1)) {
|
|
89
|
+
return Range.fromPositions(pos2, pos2);
|
|
90
|
+
}
|
|
91
|
+
return Range.fromPositions(pos1, pos2);
|
|
92
92
|
}
|
|
93
93
|
findWordContaining(offset) {
|
|
94
94
|
if (offset < 0 || offset >= this.elements.length) {
|
|
@@ -114,8 +114,8 @@ class LinesSliceCharSequence {
|
|
|
114
114
|
return this.elements[offset1] === this.elements[offset2];
|
|
115
115
|
}
|
|
116
116
|
extendToFullLines(range) {
|
|
117
|
-
const start = findLastMonotonous(this.
|
|
118
|
-
const end = findFirstMonotonous(this.
|
|
117
|
+
const start = findLastMonotonous(this.firstElementOffsetByLineIdx, x => x <= range.start) ?? 0;
|
|
118
|
+
const end = findFirstMonotonous(this.firstElementOffsetByLineIdx, x => range.endExclusive <= x) ?? this.elements.length;
|
|
119
119
|
return ( new OffsetRange(start, end));
|
|
120
120
|
}
|
|
121
121
|
}
|
|
@@ -27,6 +27,12 @@ declare class LineRangeMapping {
|
|
|
27
27
|
* It avoids various problems when the line range points to non-existing line-numbers.
|
|
28
28
|
*/
|
|
29
29
|
toRangeMapping(): RangeMapping;
|
|
30
|
+
/**
|
|
31
|
+
* This method assumes that the LineRangeMapping describes a valid diff!
|
|
32
|
+
* I.e. if one range is empty, the other range cannot be the entire document.
|
|
33
|
+
* It avoids various problems when the line range points to non-existing line-numbers.
|
|
34
|
+
*/
|
|
35
|
+
toRangeMapping2(original: string[], modified: string[]): RangeMapping;
|
|
30
36
|
}
|
|
31
37
|
/**
|
|
32
38
|
* Maps a line range in the original text model to a line range in the modified text model.
|
|
@@ -49,6 +55,7 @@ declare class DetailedLineRangeMapping extends LineRangeMapping {
|
|
|
49
55
|
* Maps a range in the original text model to a range in the modified text model.
|
|
50
56
|
*/
|
|
51
57
|
declare class RangeMapping {
|
|
58
|
+
static assertSorted(rangeMappings: RangeMapping[]): void;
|
|
52
59
|
/**
|
|
53
60
|
* The original range.
|
|
54
61
|
*/
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { BugIndicatingError } from '../../../base/common/errors.js';
|
|
2
2
|
import { LineRange } from '../core/lineRange.js';
|
|
3
|
+
import { Position } from '../core/position.js';
|
|
3
4
|
import { Range } from '../core/range.js';
|
|
4
5
|
import { SingleTextEdit } from '../core/textEdit.js';
|
|
5
6
|
class LineRangeMapping {
|
|
@@ -74,6 +75,35 @@ class LineRangeMapping {
|
|
|
74
75
|
))));
|
|
75
76
|
}
|
|
76
77
|
}
|
|
78
|
+
toRangeMapping2(original, modified) {
|
|
79
|
+
if (isValidLineNumber(this.original.endLineNumberExclusive, original)
|
|
80
|
+
&& isValidLineNumber(this.modified.endLineNumberExclusive, modified)) {
|
|
81
|
+
return ( new RangeMapping(( new Range(this.original.startLineNumber, 1, this.original.endLineNumberExclusive, 1)), ( new Range(this.modified.startLineNumber, 1, this.modified.endLineNumberExclusive, 1))));
|
|
82
|
+
}
|
|
83
|
+
if (!this.original.isEmpty && !this.modified.isEmpty) {
|
|
84
|
+
return ( new RangeMapping(Range.fromPositions(( new Position(this.original.startLineNumber, 1)), normalizePosition(( new Position(this.original.endLineNumberExclusive - 1, Number.MAX_SAFE_INTEGER)), original)), Range.fromPositions(( new Position(this.modified.startLineNumber, 1)), normalizePosition(( new Position(this.modified.endLineNumberExclusive - 1, Number.MAX_SAFE_INTEGER)), modified))));
|
|
85
|
+
}
|
|
86
|
+
if (this.original.startLineNumber > 1 && this.modified.startLineNumber > 1) {
|
|
87
|
+
return ( new RangeMapping(Range.fromPositions(normalizePosition(( new Position(this.original.startLineNumber - 1, Number.MAX_SAFE_INTEGER)), original), normalizePosition(( new Position(this.original.endLineNumberExclusive - 1, Number.MAX_SAFE_INTEGER)), original)), Range.fromPositions(normalizePosition(( new Position(this.modified.startLineNumber - 1, Number.MAX_SAFE_INTEGER)), modified), normalizePosition(( new Position(this.modified.endLineNumberExclusive - 1, Number.MAX_SAFE_INTEGER)), modified))));
|
|
88
|
+
}
|
|
89
|
+
throw ( new BugIndicatingError());
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
function normalizePosition(position, content) {
|
|
93
|
+
if (position.lineNumber < 1) {
|
|
94
|
+
return ( new Position(1, 1));
|
|
95
|
+
}
|
|
96
|
+
if (position.lineNumber > content.length) {
|
|
97
|
+
return ( new Position(content.length, content[content.length - 1].length + 1));
|
|
98
|
+
}
|
|
99
|
+
const line = content[position.lineNumber - 1];
|
|
100
|
+
if (position.column > line.length + 1) {
|
|
101
|
+
return ( new Position(position.lineNumber, line.length + 1));
|
|
102
|
+
}
|
|
103
|
+
return position;
|
|
104
|
+
}
|
|
105
|
+
function isValidLineNumber(lineNumber, lines) {
|
|
106
|
+
return lineNumber >= 1 && lineNumber <= lines.length;
|
|
77
107
|
}
|
|
78
108
|
class DetailedLineRangeMapping extends LineRangeMapping {
|
|
79
109
|
static fromRangeMappings(rangeMappings) {
|
|
@@ -93,6 +123,16 @@ class DetailedLineRangeMapping extends LineRangeMapping {
|
|
|
93
123
|
}
|
|
94
124
|
}
|
|
95
125
|
class RangeMapping {
|
|
126
|
+
static assertSorted(rangeMappings) {
|
|
127
|
+
for (let i = 1; i < rangeMappings.length; i++) {
|
|
128
|
+
const previous = rangeMappings[i - 1];
|
|
129
|
+
const current = rangeMappings[i];
|
|
130
|
+
if (!(previous.originalRange.getEndPosition().isBeforeOrEqual(current.originalRange.getStartPosition())
|
|
131
|
+
&& previous.modifiedRange.getEndPosition().isBeforeOrEqual(current.modifiedRange.getStartPosition()))) {
|
|
132
|
+
throw ( new BugIndicatingError('Range mappings must be sorted'));
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
96
136
|
constructor(originalRange, modifiedRange) {
|
|
97
137
|
this.originalRange = originalRange;
|
|
98
138
|
this.modifiedRange = modifiedRange;
|