@codingame/monaco-vscode-api 4.5.1 → 4.5.2
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/extensions.js +10 -2
- package/package.json +8 -8
- package/services.js +1 -0
- package/vscode/src/vs/base/browser/defaultWorkerFactory.js +4 -2
- package/vscode/src/vs/base/browser/dom.js +3 -3
- package/vscode/src/vs/base/browser/iframe.js +3 -1
- package/vscode/src/vs/base/browser/indexedDB.js +2 -2
- package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js +4 -9
- package/vscode/src/vs/base/browser/ui/button/button.js +16 -19
- package/vscode/src/vs/base/browser/ui/dialog/dialog.js +168 -165
- package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js +5 -8
- package/vscode/src/vs/base/browser/ui/findinput/findInput.js +19 -18
- package/vscode/src/vs/base/browser/ui/findinput/findInputToggles.js +4 -15
- package/vscode/src/vs/base/browser/ui/findinput/replaceInput.js +13 -16
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js +10 -12
- package/vscode/src/vs/base/browser/ui/hover/updatableHoverWidget.js +13 -14
- package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js +19 -39
- package/vscode/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.js +3 -2
- package/vscode/src/vs/base/browser/ui/list/listView.js +6 -6
- package/vscode/src/vs/base/browser/ui/list/listWidget.js +7 -7
- package/vscode/src/vs/base/browser/ui/list/rowCache.js +2 -2
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +24 -23
- package/vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.js +1 -1
- package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js +12 -15
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +25 -25
- package/vscode/src/vs/base/browser/ui/splitview/splitview.js +10 -10
- package/vscode/src/vs/base/browser/ui/table/tableWidget.js +1 -1
- package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js +11 -10
- package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +177 -152
- package/vscode/src/vs/base/browser/ui/tree/asyncDataTree.js +7 -7
- package/vscode/src/vs/base/browser/ui/tree/compressedObjectTreeModel.js +2 -2
- package/vscode/src/vs/base/browser/ui/tree/dataTree.js +2 -2
- package/vscode/src/vs/base/browser/ui/tree/indexTreeModel.js +6 -6
- package/vscode/src/vs/base/browser/ui/tree/objectTree.js +1 -1
- package/vscode/src/vs/base/browser/ui/tree/objectTreeModel.js +4 -4
- package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js +2 -1
- package/vscode/src/vs/base/common/actions.js +6 -5
- package/vscode/src/vs/base/common/arrays.js +2 -2
- package/vscode/src/vs/base/common/arraysFind.js +3 -1
- package/vscode/src/vs/base/common/assert.js +2 -2
- package/vscode/src/vs/base/common/async.js +3 -3
- package/vscode/src/vs/base/common/buffer.js +2 -2
- package/vscode/src/vs/base/common/codiconsUtil.js +1 -1
- package/vscode/src/vs/base/common/color.js +2 -2
- package/vscode/src/vs/base/common/date.js +70 -284
- package/vscode/src/vs/base/common/decorators.js +2 -2
- package/vscode/src/vs/base/common/diff/diff.js +1 -1
- package/vscode/src/vs/base/common/errorMessage.js +12 -22
- package/vscode/src/vs/base/common/errors.js +2 -2
- package/vscode/src/vs/base/common/event.js +2 -2
- package/vscode/src/vs/base/common/extpath.js +1 -1
- package/vscode/src/vs/base/common/filters.js +1 -1
- package/vscode/src/vs/base/common/history.js +1 -1
- package/vscode/src/vs/base/common/jsonEdit.js +6 -4
- package/vscode/src/vs/base/common/jsonErrorMessages.js +10 -45
- package/vscode/src/vs/base/common/keyCodes.js +3 -1
- package/vscode/src/vs/base/common/keybindingLabels.js +29 -108
- package/vscode/src/vs/base/common/labels.js +2 -2
- package/vscode/src/vs/base/common/lifecycle.js +5 -5
- package/vscode/src/vs/base/common/map.js +11 -11
- package/vscode/src/vs/base/common/objects.js +1 -1
- package/vscode/src/vs/base/common/path.js +2 -2
- package/vscode/src/vs/base/common/platform.js +7 -26
- package/vscode/src/vs/base/common/stream.js +1 -1
- package/vscode/src/vs/base/common/strings.js +2 -2
- package/vscode/src/vs/base/common/ternarySearchTree.js +3 -3
- package/vscode/src/vs/base/common/types.js +7 -5
- package/vscode/src/vs/base/common/uri.js +11 -5
- package/vscode/src/vs/base/common/worker/simpleWorker.js +7 -7
- package/vscode/src/vs/base/parts/ipc/common/ipc.net.js +1 -1
- package/vscode/src/vs/editor/browser/config/editorConfiguration.js +1 -1
- package/vscode/src/vs/editor/browser/controller/textAreaHandler.js +47 -42
- package/vscode/src/vs/editor/browser/coreCommands.js +104 -115
- package/vscode/src/vs/editor/browser/editorExtensions.js +24 -35
- package/vscode/src/vs/editor/browser/services/abstractCodeEditorService.js +2 -2
- package/vscode/src/vs/editor/browser/services/bulkEditService.js +1 -1
- package/vscode/src/vs/editor/browser/services/editorWorkerService.js +1 -1
- package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js +18 -22
- package/vscode/src/vs/editor/browser/services/openerService.js +1 -1
- package/vscode/src/vs/editor/browser/view/viewLayer.js +1 -1
- package/vscode/src/vs/editor/browser/view.js +6 -6
- package/vscode/src/vs/editor/browser/viewParts/lines/viewLine.js +1 -1
- package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.js +2 -2
- package/vscode/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.js +1 -1
- package/vscode/src/vs/editor/browser/viewParts/viewZones/viewZones.js +1 -1
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorContributions.js +1 -1
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +129 -128
- package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js +25 -68
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js +66 -99
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js +10 -9
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js +15 -34
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js +25 -41
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js +27 -51
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js +40 -31
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js +13 -20
- package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js +8 -19
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js +4 -15
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js +1 -1
- package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js +83 -154
- package/vscode/src/vs/editor/common/config/editorOptions.js +863 -1427
- package/vscode/src/vs/editor/common/core/editorColorRegistry.js +110 -253
- package/vscode/src/vs/editor/common/core/lineRange.js +4 -2
- package/vscode/src/vs/editor/common/core/offsetRange.js +3 -3
- package/vscode/src/vs/editor/common/core/textEdit.js +1 -1
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.js +1 -1
- package/vscode/src/vs/editor/common/diff/legacyLinesDiffComputer.js +1 -1
- package/vscode/src/vs/editor/common/editorContextKeys.js +80 -239
- package/vscode/src/vs/editor/common/languages/modesRegistry.js +5 -8
- package/vscode/src/vs/editor/common/languages/supports/tokenization.js +2 -2
- package/vscode/src/vs/editor/common/languages.js +68 -71
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast.js +12 -12
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/concat23Trees.js +2 -2
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/nodeReader.js +1 -1
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/parser.js +2 -2
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.js +1 -1
- package/vscode/src/vs/editor/common/model/editStack.js +47 -36
- package/vscode/src/vs/editor/common/model/guidesTextModelPart.js +3 -3
- package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.js +2 -2
- package/vscode/src/vs/editor/common/model/textModel.js +9 -9
- package/vscode/src/vs/editor/common/model/textModelPart.js +1 -1
- package/vscode/src/vs/editor/common/model/textModelTokens.js +2 -2
- package/vscode/src/vs/editor/common/model/tokenizationTextModelPart.js +1 -1
- package/vscode/src/vs/editor/common/services/editorSimpleWorker.js +2 -2
- package/vscode/src/vs/editor/common/services/modelService.js +1 -1
- package/vscode/src/vs/editor/common/standaloneStrings.js +56 -115
- package/vscode/src/vs/editor/common/textModelGuides.js +1 -1
- package/vscode/src/vs/editor/common/tokens/contiguousMultilineTokens.js +2 -2
- package/vscode/src/vs/editor/common/tokens/sparseMultilineTokens.js +1 -1
- package/vscode/src/vs/editor/common/viewLayout/viewLineRenderer.js +79 -67
- package/vscode/src/vs/editor/common/viewModel/modelLineProjection.js +12 -12
- package/vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js +12 -31
- package/vscode/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.js +25 -40
- package/vscode/src/vs/editor/contrib/caretOperations/browser/caretOperations.js +4 -11
- package/vscode/src/vs/editor/contrib/caretOperations/browser/transpose.js +3 -6
- package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js +28 -76
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js +36 -25
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionCommands.js +54 -143
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionContributions.js +8 -7
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +30 -37
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +25 -54
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +15 -28
- package/vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.js +1 -1
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js +30 -37
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.js +24 -31
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js +7 -24
- package/vscode/src/vs/editor/contrib/comment/browser/comment.js +11 -34
- package/vscode/src/vs/editor/contrib/contextmenu/browser/contextmenu.js +37 -70
- package/vscode/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.js +15 -14
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js +6 -13
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +33 -50
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +37 -68
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.js +4 -3
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js +20 -27
- package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js +8 -7
- package/vscode/src/vs/editor/contrib/find/browser/findController.js +83 -120
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +59 -143
- package/vscode/src/vs/editor/contrib/folding/browser/folding.js +51 -117
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +13 -32
- package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.js +2 -2
- package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js +4 -15
- package/vscode/src/vs/editor/contrib/format/browser/formatActions.js +28 -35
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoError.js +21 -52
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js +38 -77
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js +109 -246
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js +21 -23
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +40 -30
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js +23 -34
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +31 -42
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.js +33 -39
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.js +24 -23
- package/vscode/src/vs/editor/contrib/hover/browser/hover.js +31 -95
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +41 -32
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +18 -37
- package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +11 -18
- package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js +29 -76
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHints.js +1 -1
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +80 -99
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/commands.js +30 -63
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.js +45 -42
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.js +11 -18
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.js +28 -23
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.js +39 -60
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/singleTextEdit.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/utils.js +3 -1
- package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js +2 -5
- package/vscode/src/vs/editor/contrib/linesOperations/browser/linesOperations.js +135 -234
- package/vscode/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +26 -33
- package/vscode/src/vs/editor/contrib/links/browser/links.js +32 -64
- package/vscode/src/vs/editor/contrib/message/browser/messageController.js +13 -16
- package/vscode/src/vs/editor/contrib/multicursor/browser/multicursor.js +122 -195
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.js +17 -20
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +16 -32
- package/vscode/src/vs/editor/contrib/peekView/browser/peekView.js +43 -86
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +10 -24
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +46 -170
- package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js +3 -10
- package/vscode/src/vs/editor/contrib/rename/browser/rename.js +54 -76
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +37 -45
- package/vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.js +73 -86
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js +23 -38
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetSession.js +1 -1
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js +13 -80
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +20 -56
- package/vscode/src/vs/editor/contrib/suggest/browser/suggest.js +55 -72
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js +161 -147
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js +43 -95
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +21 -28
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +16 -23
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.js +11 -10
- package/vscode/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.js +67 -66
- package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +6 -13
- package/vscode/src/vs/editor/contrib/tokenization/browser/tokenization.js +3 -6
- package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +72 -136
- package/vscode/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js +11 -26
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js +19 -22
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +66 -59
- package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js +72 -51
- package/vscode/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js +1 -1
- package/vscode/src/vs/editor/standalone/browser/standaloneCodeEditor.js +3 -1
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.js +7 -7
- package/vscode/src/vs/editor/standalone/browser/standaloneThemeService.js +2 -2
- package/vscode/src/vs/nls.js +1 -4
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +88 -255
- package/vscode/src/vs/platform/action/common/actionCommonCategories.js +9 -16
- package/vscode/src/vs/platform/actionWidget/browser/actionList.js +21 -41
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js +18 -45
- package/vscode/src/vs/platform/actions/browser/buttonbar.js +19 -24
- package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js +40 -51
- package/vscode/src/vs/platform/actions/browser/toolbar.js +24 -23
- package/vscode/src/vs/platform/actions/common/actions.contribution.js +5 -0
- package/vscode/src/vs/platform/actions/common/actions.js +4 -2
- package/vscode/src/vs/platform/actions/common/menuResetAction.js +21 -0
- package/vscode/src/vs/platform/actions/common/menuService.js +49 -51
- package/vscode/src/vs/platform/commands/common/commands.js +2 -2
- package/vscode/src/vs/platform/configuration/common/configurationModels.js +1 -1
- package/vscode/src/vs/platform/configuration/common/configurationRegistry.js +38 -61
- package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js +68 -51
- package/vscode/src/vs/platform/contextkey/common/contextkey.js +168 -130
- package/vscode/src/vs/platform/contextkey/common/contextkeys.js +14 -45
- package/vscode/src/vs/platform/contextkey/common/scanner.js +12 -26
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +18 -33
- package/vscode/src/vs/platform/dnd/browser/dnd.js +24 -19
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +8 -15
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +2 -6
- package/vscode/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.js +335 -0
- package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js +915 -0
- package/vscode/src/vs/platform/extensions/common/extensionValidator.js +36 -43
- package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +23 -16
- package/vscode/src/vs/platform/files/common/files.js +41 -58
- package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js +28 -21
- package/vscode/src/vs/platform/hover/browser/hover.js +2 -2
- package/vscode/src/vs/platform/instantiation/common/instantiation.js +1 -1
- package/vscode/src/vs/platform/instantiation/common/instantiationService.js +7 -7
- package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js +21 -20
- package/vscode/src/vs/platform/languagePacks/common/languagePacks.js +75 -6
- package/vscode/src/vs/platform/layout/browser/zIndexRegistry.js +4 -2
- package/vscode/src/vs/platform/list/browser/listService.js +159 -189
- package/vscode/src/vs/platform/log/common/log.js +20 -19
- package/vscode/src/vs/platform/markers/common/markerService.js +1 -1
- package/vscode/src/vs/platform/markers/common/markers.js +15 -14
- package/vscode/src/vs/platform/product/common/product.js +1 -1
- package/vscode/src/vs/platform/quickinput/browser/quickInput.js +34 -47
- package/vscode/src/vs/platform/quickinput/browser/quickInputController.js +183 -193
- package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +107 -98
- package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +9 -8
- package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js +5 -12
- package/vscode/src/vs/platform/request/common/request.js +31 -40
- package/vscode/src/vs/platform/terminal/common/terminal.js +3 -1
- package/vscode/src/vs/platform/theme/common/colors/baseColors.js +28 -59
- package/vscode/src/vs/platform/theme/common/colors/chartsColors.js +9 -40
- package/vscode/src/vs/platform/theme/common/colors/editorColors.js +151 -350
- package/vscode/src/vs/platform/theme/common/colors/inputColors.js +51 -170
- package/vscode/src/vs/platform/theme/common/colors/listColors.js +63 -90
- package/vscode/src/vs/platform/theme/common/colors/menuColors.js +8 -35
- package/vscode/src/vs/platform/theme/common/colors/minimapColors.js +14 -53
- package/vscode/src/vs/platform/theme/common/colors/miscColors.js +13 -32
- package/vscode/src/vs/platform/theme/common/colors/quickpickColors.js +14 -37
- package/vscode/src/vs/platform/theme/common/colors/searchColors.js +6 -13
- package/vscode/src/vs/platform/theme/common/iconRegistry.js +9 -24
- package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +64 -207
- package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js +111 -114
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js +51 -54
- package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js +20 -5
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.js +25 -32
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js +7 -1
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncStoreService.js +173 -35
- package/vscode/src/vs/platform/workspace/common/workspace.js +8 -9
- package/vscode/src/vs/platform/workspaces/common/workspaces.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostAiRelatedInformation.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostApiCommands.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostAuthentication.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +55 -46
- package/vscode/src/vs/workbench/api/common/extHostCodeInsets.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostCommands.js +9 -5
- package/vscode/src/vs/workbench/api/common/extHostConfiguration.js +10 -4
- package/vscode/src/vs/workbench/api/common/extHostCustomEditors.js +17 -15
- package/vscode/src/vs/workbench/api/common/extHostDebugService.js +40 -24
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +37 -34
- package/vscode/src/vs/workbench/api/common/extHostDocumentContentProviders.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostDocumentData.js +6 -4
- package/vscode/src/vs/workbench/api/common/extHostDocuments.js +5 -5
- package/vscode/src/vs/workbench/api/common/extHostDocumentsAndEditors.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostEditorTabs.js +12 -8
- package/vscode/src/vs/workbench/api/common/extHostEmbeddingVector.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostExtensionActivator.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +22 -7
- package/vscode/src/vs/workbench/api/common/extHostFileSystem.js +16 -16
- package/vscode/src/vs/workbench/api/common/extHostFileSystemConsumer.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostInlineChat.js +4 -2
- package/vscode/src/vs/workbench/api/common/extHostIssueReporter.js +9 -9
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +272 -200
- package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +49 -42
- package/vscode/src/vs/workbench/api/common/extHostLanguages.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +6 -13
- package/vscode/src/vs/workbench/api/common/extHostManagedSockets.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +20 -14
- package/vscode/src/vs/workbench/api/common/extHostNotebookDocument.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostNotebookDocumentSaveParticipant.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostNotebookKernels.js +20 -18
- package/vscode/src/vs/workbench/api/common/extHostNotebookRenderers.js +3 -1
- package/vscode/src/vs/workbench/api/common/extHostOutput.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostProfileContentHandler.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostSCM.js +4 -2
- package/vscode/src/vs/workbench/api/common/extHostSearch.js +8 -6
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +41 -38
- package/vscode/src/vs/workbench/api/common/extHostTask.js +15 -11
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +22 -21
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +109 -94
- package/vscode/src/vs/workbench/api/common/extHostTestItem.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTesting.js +9 -7
- package/vscode/src/vs/workbench/api/common/extHostTestingPrivateApi.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTextEditor.js +6 -6
- package/vscode/src/vs/workbench/api/common/extHostTextEditors.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostTimeline.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +17 -10
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +31 -36
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +11 -11
- package/vscode/src/vs/workbench/api/common/extHostTypes.js +31 -27
- package/vscode/src/vs/workbench/api/common/extHostUriOpener.js +6 -4
- package/vscode/src/vs/workbench/api/common/extHostUrls.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostWebview.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostWebviewMessaging.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostWebviewPanels.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostWebviewView.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +51 -48
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +29 -44
- package/vscode/src/vs/workbench/api/worker/extHostExtensionService.js +3 -3
- package/vscode/src/vs/workbench/api/worker/extensionHostWorker.js +2 -2
- package/vscode/src/vs/workbench/browser/actions/developerActions.js +93 -157
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +270 -614
- package/vscode/src/vs/workbench/browser/actions/textInputActions.js +31 -30
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +49 -123
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +63 -119
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +11 -26
- package/vscode/src/vs/workbench/browser/editor.js +62 -55
- package/vscode/src/vs/workbench/browser/labels.js +40 -51
- package/vscode/src/vs/workbench/browser/part.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +23 -56
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +72 -115
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +12 -17
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +11 -18
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +51 -198
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js +60 -101
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js +51 -48
- package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js +10 -33
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +176 -684
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +51 -104
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js +61 -91
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js +26 -77
- package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js +19 -27
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +41 -60
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +86 -94
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +124 -353
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +21 -30
- package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +45 -48
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +34 -31
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +2 -5
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +27 -24
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +21 -18
- package/vscode/src/vs/workbench/browser/parts/editor/textResourceEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +117 -135
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsActions.js +42 -109
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js +11 -10
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js +25 -52
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +24 -59
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsList.js +22 -30
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js +21 -61
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js +23 -25
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js +32 -50
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +58 -196
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +73 -124
- package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +19 -30
- package/vscode/src/vs/workbench/browser/parts/views/checkbox.js +6 -5
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +152 -141
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +13 -16
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +62 -72
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +68 -85
- package/vscode/src/vs/workbench/browser/quickaccess.js +12 -12
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +381 -589
- package/vscode/src/vs/workbench/common/configuration.js +33 -52
- package/vscode/src/vs/workbench/common/contextkeys.js +117 -348
- package/vscode/src/vs/workbench/common/contributions.js +9 -3
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +14 -15
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +18 -15
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +14 -11
- package/vscode/src/vs/workbench/common/editor/textResourceEditorInput.js +1 -1
- package/vscode/src/vs/workbench/common/editor.js +31 -36
- package/vscode/src/vs/workbench/common/theme.js +359 -406
- package/vscode/src/vs/workbench/common/views.js +36 -35
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +221 -488
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.js +4 -22
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +37 -52
- package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution.js +56 -127
- package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/commands.js +18 -41
- package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.js +55 -54
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +27 -71
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js +13 -18
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +13 -45
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.js +2 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.js +21 -37
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js +17 -22
- package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js +8 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js +40 -52
- package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js +83 -138
- package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.js +31 -52
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js +20 -19
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/common/chatColors.js +7 -30
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +29 -64
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +14 -8
- package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js +1 -1
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +33 -40
- package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +24 -61
- package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +11 -34
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +22 -38
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +23 -34
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +23 -67
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +14 -17
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +25 -45
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +47 -55
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +4 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +13 -28
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +4 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +4 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +29 -41
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +14 -37
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +11 -14
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +82 -88
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +19 -22
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +17 -16
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +9 -20
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +15 -18
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js +33 -64
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +108 -124
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsModel.js +16 -19
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +43 -79
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +46 -61
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +16 -51
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +30 -44
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +24 -51
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js +22 -17
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +18 -21
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js +84 -242
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointWidget.js +33 -74
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +220 -412
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.js +14 -13
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +20 -67
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +62 -273
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +12 -17
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +227 -290
- package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js +147 -141
- package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js +13 -14
- package/vscode/src/vs/workbench/contrib/debug/common/disassemblyViewInput.js +4 -11
- package/vscode/src/vs/workbench/contrib/debug/common/replModel.js +25 -22
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +617 -1086
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +42 -69
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js +10 -13
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +9 -15
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js +32 -29
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +9 -12
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +26 -35
- package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +8 -11
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +38 -49
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +60 -107
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +71 -100
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +161 -373
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.save.js +10 -13
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +11 -22
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +151 -244
- package/vscode/src/vs/workbench/contrib/files/browser/files.configuration.contribution.js +105 -156
- package/vscode/src/vs/workbench/contrib/files/browser/files.editorPane.contribution.js +10 -17
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +18 -21
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +14 -25
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +52 -72
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +122 -155
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +55 -78
- package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +22 -25
- package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +8 -16
- package/vscode/src/vs/workbench/contrib/files/common/files.js +61 -84
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +11 -14
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js +58 -106
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js +9 -22
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +6 -9
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +15 -26
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +122 -171
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +53 -78
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatFileCreationWidget.js +19 -30
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +7 -7
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +46 -67
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js +56 -65
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js +7 -10
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/utils.js +3 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +78 -165
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +14 -18
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +74 -145
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +64 -53
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/utils.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +19 -50
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js +2 -5
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +58 -55
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.js +97 -157
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js +40 -60
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +57 -120
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +19 -35
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js +36 -43
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js +2 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js +11 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js +50 -63
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js +12 -27
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/editActions.js +90 -152
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/foldingController.js +8 -19
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.js +18 -45
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.js +6 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +58 -49
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +155 -210
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookIcons.js +28 -135
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.js +17 -26
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.js +63 -82
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js +16 -20
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.js +8 -23
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js +11 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.js +8 -16
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js +12 -20
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js +20 -24
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js +89 -100
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js +66 -73
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js +10 -13
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js +48 -101
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js +15 -19
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +21 -23
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js +6 -6
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +32 -44
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js +16 -51
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +52 -91
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js +52 -231
- package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js +34 -105
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +128 -156
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIcons.js +19 -82
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +250 -445
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +9 -16
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +123 -180
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js +2 -5
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +21 -62
- package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/search/common/cellSearchModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js +2 -5
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js +3 -10
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +18 -17
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +18 -24
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +71 -70
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +35 -146
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +18 -23
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +19 -23
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +134 -123
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +19 -26
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +10 -29
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +42 -78
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +106 -138
- package/vscode/src/vs/workbench/contrib/testing/common/testId.js +1 -1
- package/vscode/src/vs/workbench/contrib/testing/common/testItemCollection.js +5 -5
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +36 -31
- package/vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js +4 -11
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +20 -23
- package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js +6 -9
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +18 -8
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js +23 -62
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js +3 -2
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +99 -18
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +9 -8
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionFeatures.js +1 -1
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.js +3 -6
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +40 -57
- package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.js +1 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensions.js +6 -2
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +176 -223
- package/vscode/src/vs/workbench/services/extensions/common/rpcProtocol.js +5 -3
- package/vscode/src/vs/workbench/services/extensions/worker/polyfillNestedWorker.js +1 -1
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +35 -38
- package/vscode/src/vs/workbench/services/language/common/languageService.js +55 -119
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js +1 -1
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js +6 -13
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js +33 -60
- package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js +8 -15
- package/vscode/src/vs/workbench/services/preferences/common/preferencesModels.js +79 -72
- package/vscode/src/vs/workbench/services/preferences/common/preferencesValidation.js +54 -141
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +30 -42
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +92 -101
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +50 -45
- package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js +15 -30
- package/vscode/src/vs/workbench/services/textfile/common/encoding.js +4 -1
- package/vscode/src/vs/workbench/services/textfile/common/textEditorService.js +3 -1
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +32 -35
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +48 -83
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +26 -45
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +14 -23
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js +2 -5
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +22 -62
- package/vscode/src/vs/workbench/services/views/browser/viewsService.js +49 -78
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +48 -87
- package/tools/l10n.js +0 -177
|
@@ -60,6 +60,7 @@ import { IAccessibilityService } from '../../../../platform/accessibility/common
|
|
|
60
60
|
import { IQuickDiffService } from '../common/quickDiff.service.js';
|
|
61
61
|
import { SwitchQuickDiffViewItem, SwitchQuickDiffBaseAction } from './dirtyDiffSwitcher.js';
|
|
62
62
|
var DirtyDiffController_1, DirtyDiffDecorator_1;
|
|
63
|
+
const _moduleId = "vs/workbench/contrib/scm/browser/dirtydiffDecorator";
|
|
63
64
|
class DiffActionRunner extends ActionRunner {
|
|
64
65
|
runAction(action, context) {
|
|
65
66
|
if (action instanceof MenuItemAction) {
|
|
@@ -68,7 +69,7 @@ class DiffActionRunner extends ActionRunner {
|
|
|
68
69
|
return super.runAction(action, context);
|
|
69
70
|
}
|
|
70
71
|
}
|
|
71
|
-
const isDirtyDiffVisible = ( new RawContextKey('dirtyDiffVisible', false));
|
|
72
|
+
const isDirtyDiffVisible = ( (new RawContextKey('dirtyDiffVisible', false)));
|
|
72
73
|
function getChangeHeight(change) {
|
|
73
74
|
const modified = change.modifiedEndLineNumber - change.modifiedStartLineNumber + 1;
|
|
74
75
|
const original = change.originalEndLineNumber - change.originalStartLineNumber + 1;
|
|
@@ -109,16 +110,16 @@ let UIEditorAction = class UIEditorAction extends Action {
|
|
|
109
110
|
return Promise.resolve(this.instantiationService.invokeFunction(accessor => this.action.run(accessor, this.editor, null)));
|
|
110
111
|
}
|
|
111
112
|
};
|
|
112
|
-
UIEditorAction = ( __decorate([
|
|
113
|
-
( __param(3, IKeybindingService)),
|
|
114
|
-
( __param(4, IInstantiationService))
|
|
115
|
-
], UIEditorAction));
|
|
113
|
+
UIEditorAction = ( (__decorate([
|
|
114
|
+
( (__param(3, IKeybindingService))),
|
|
115
|
+
( (__param(4, IInstantiationService)))
|
|
116
|
+
], UIEditorAction)));
|
|
116
117
|
var ChangeType;
|
|
117
|
-
( (function(ChangeType) {
|
|
118
|
+
( ((function(ChangeType) {
|
|
118
119
|
ChangeType[ChangeType["Modify"] = 0] = "Modify";
|
|
119
120
|
ChangeType[ChangeType["Add"] = 1] = "Add";
|
|
120
121
|
ChangeType[ChangeType["Delete"] = 2] = "Delete";
|
|
121
|
-
})(ChangeType || (ChangeType = {})));
|
|
122
|
+
})(ChangeType || (ChangeType = {}))));
|
|
122
123
|
function getChangeType(change) {
|
|
123
124
|
if (change.originalEndLineNumber === 0) {
|
|
124
125
|
return ChangeType.Add;
|
|
@@ -159,7 +160,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
|
|
|
159
160
|
this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
|
|
160
161
|
this._applyTheme(themeService.getColorTheme());
|
|
161
162
|
if (this.model.original.length > 0) {
|
|
162
|
-
contextKeyService = contextKeyService.createOverlay([['originalResourceScheme', this.model.original[0].uri.scheme], ['originalResourceSchemes', ( this.model.original.map(original => original.uri.scheme))]]);
|
|
163
|
+
contextKeyService = contextKeyService.createOverlay([['originalResourceScheme', this.model.original[0].uri.scheme], ['originalResourceSchemes', ( (this.model.original.map(original => original.uri.scheme)))]]);
|
|
163
164
|
}
|
|
164
165
|
this.create();
|
|
165
166
|
if (editor.hasModel()) {
|
|
@@ -194,13 +195,13 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
|
|
|
194
195
|
}
|
|
195
196
|
const onFirstDiffUpdate = Event.once(this.diffEditor.onDidUpdateDiff);
|
|
196
197
|
onFirstDiffUpdate(() => setTimeout(() => this.revealChange(change), 0));
|
|
197
|
-
const diffEditorModel = this.model.getDiffEditorModel(( labeledChange.uri.toString()));
|
|
198
|
+
const diffEditorModel = this.model.getDiffEditorModel(( (labeledChange.uri.toString())));
|
|
198
199
|
if (!diffEditorModel) {
|
|
199
200
|
return;
|
|
200
201
|
}
|
|
201
202
|
this.diffEditor.setModel(diffEditorModel);
|
|
202
203
|
this.dropdown?.setSelection(labeledChange.label);
|
|
203
|
-
const position = ( new Position(getModifiedEndLineNumber(change), 1));
|
|
204
|
+
const position = ( (new Position(getModifiedEndLineNumber(change), 1)));
|
|
204
205
|
const lineHeight = this.editor.getOption(67 );
|
|
205
206
|
const editorHeight = this.editor.getLayoutInfo().height;
|
|
206
207
|
const editorHeightInLines = Math.floor(editorHeight / lineHeight);
|
|
@@ -233,16 +234,16 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
|
|
|
233
234
|
if (!this.shouldUseDropdown()) {
|
|
234
235
|
detail = this.model.changes.length > 1
|
|
235
236
|
? ( localizeWithPath(
|
|
236
|
-
|
|
237
|
-
|
|
237
|
+
_moduleId,
|
|
238
|
+
0,
|
|
238
239
|
"{0} - {1} of {2} changes",
|
|
239
240
|
label,
|
|
240
241
|
providerIndex + 1,
|
|
241
242
|
providerChanges.length
|
|
242
243
|
))
|
|
243
244
|
: ( localizeWithPath(
|
|
244
|
-
|
|
245
|
-
|
|
245
|
+
_moduleId,
|
|
246
|
+
1,
|
|
246
247
|
"{0} - {1} of {2} change",
|
|
247
248
|
label,
|
|
248
249
|
providerIndex + 1,
|
|
@@ -253,15 +254,15 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
|
|
|
253
254
|
else {
|
|
254
255
|
detail = this.model.changes.length > 1
|
|
255
256
|
? ( localizeWithPath(
|
|
256
|
-
|
|
257
|
-
|
|
257
|
+
_moduleId,
|
|
258
|
+
2,
|
|
258
259
|
"{0} of {1} changes",
|
|
259
260
|
providerIndex + 1,
|
|
260
261
|
providerChanges.length
|
|
261
262
|
))
|
|
262
263
|
: ( localizeWithPath(
|
|
263
|
-
|
|
264
|
-
|
|
264
|
+
_moduleId,
|
|
265
|
+
3,
|
|
265
266
|
"{0} of {1} change",
|
|
266
267
|
providerIndex + 1,
|
|
267
268
|
providerChanges.length
|
|
@@ -297,7 +298,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
|
|
|
297
298
|
shouldUseDropdown() {
|
|
298
299
|
let providersWithChangesCount = 0;
|
|
299
300
|
if (this.model.mapChanges.size > 1) {
|
|
300
|
-
const keys = Array.from(( this.model.mapChanges.keys()));
|
|
301
|
+
const keys = Array.from(( (this.model.mapChanges.keys())));
|
|
301
302
|
for (let i = 0; (i < keys.length) && (providersWithChangesCount <= 1); i++) {
|
|
302
303
|
if (this.model.mapChanges.get(keys[i]).length > 0) {
|
|
303
304
|
providersWithChangesCount++;
|
|
@@ -310,8 +311,8 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
|
|
|
310
311
|
if (!this._actionbarWidget) {
|
|
311
312
|
return;
|
|
312
313
|
}
|
|
313
|
-
const previous = this.instantiationService.createInstance(UIEditorAction, this.editor, ( new ShowPreviousChangeAction(this.editor)), ThemeIcon.asClassName(gotoPreviousLocation));
|
|
314
|
-
const next = this.instantiationService.createInstance(UIEditorAction, this.editor, ( new ShowNextChangeAction(this.editor)), ThemeIcon.asClassName(gotoNextLocation));
|
|
314
|
+
const previous = this.instantiationService.createInstance(UIEditorAction, this.editor, ( (new ShowPreviousChangeAction(this.editor))), ThemeIcon.asClassName(gotoPreviousLocation));
|
|
315
|
+
const next = this.instantiationService.createInstance(UIEditorAction, this.editor, ( (new ShowNextChangeAction(this.editor))), ThemeIcon.asClassName(gotoNextLocation));
|
|
315
316
|
this._disposables.add(previous);
|
|
316
317
|
this._disposables.add(next);
|
|
317
318
|
const actions = [];
|
|
@@ -323,21 +324,17 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
|
|
|
323
324
|
this._actionbarWidget.clear();
|
|
324
325
|
this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
|
|
325
326
|
this._actionbarWidget.push([next, previous], { label: false, icon: true });
|
|
326
|
-
this._actionbarWidget.push(( new Action('peekview.close', ( localizeWithPath(
|
|
327
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
328
|
-
'label.close',
|
|
329
|
-
"Close"
|
|
330
|
-
)), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose())), { label: false, icon: true });
|
|
327
|
+
this._actionbarWidget.push(( (new Action('peekview.close', ( localizeWithPath(_moduleId, 4, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
|
|
331
328
|
}
|
|
332
329
|
_fillHead(container) {
|
|
333
330
|
super._fillHead(container, true);
|
|
334
331
|
this.dropdownContainer = prepend(this._titleElement, $('.dropdown'));
|
|
335
|
-
this.dropdown = this.instantiationService.createInstance(SwitchQuickDiffViewItem, ( new SwitchQuickDiffBaseAction((event) => this.switchQuickDiff(event))), ( this.model.quickDiffs.map(quickDiffer => quickDiffer.label)), this.model.changes[this._index].label);
|
|
332
|
+
this.dropdown = this.instantiationService.createInstance(SwitchQuickDiffViewItem, ( (new SwitchQuickDiffBaseAction((event) => this.switchQuickDiff(event)))), ( (this.model.quickDiffs.map(quickDiffer => quickDiffer.label))), this.model.changes[this._index].label);
|
|
336
333
|
this.dropdown.render(this.dropdownContainer);
|
|
337
334
|
this.updateActions();
|
|
338
335
|
}
|
|
339
336
|
_getActionBarOptions() {
|
|
340
|
-
const actionRunner = ( new DiffActionRunner());
|
|
337
|
+
const actionRunner = ( (new DiffActionRunner()));
|
|
341
338
|
actionRunner.onDidRun(e => {
|
|
342
339
|
if (!(e.action instanceof UIEditorAction) && !e.error) {
|
|
343
340
|
this.dispose();
|
|
@@ -422,23 +419,19 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
|
|
|
422
419
|
this.menu?.dispose();
|
|
423
420
|
}
|
|
424
421
|
};
|
|
425
|
-
DirtyDiffWidget = ( __decorate([
|
|
426
|
-
( __param(2, IThemeService)),
|
|
427
|
-
( __param(3, IInstantiationService)),
|
|
428
|
-
( __param(4, IMenuService)),
|
|
429
|
-
( __param(5, IContextKeyService))
|
|
430
|
-
], DirtyDiffWidget));
|
|
422
|
+
DirtyDiffWidget = ( (__decorate([
|
|
423
|
+
( (__param(2, IThemeService))),
|
|
424
|
+
( (__param(3, IInstantiationService))),
|
|
425
|
+
( (__param(4, IMenuService))),
|
|
426
|
+
( (__param(5, IContextKeyService)))
|
|
427
|
+
], DirtyDiffWidget)));
|
|
431
428
|
class ShowPreviousChangeAction extends EditorAction {
|
|
432
429
|
constructor(outerEditor) {
|
|
433
430
|
super({
|
|
434
431
|
id: 'editor.action.dirtydiff.previous',
|
|
435
|
-
label: ( localizeWithPath(
|
|
436
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
437
|
-
'show previous change',
|
|
438
|
-
"Show Previous Change"
|
|
439
|
-
)),
|
|
432
|
+
label: ( localizeWithPath(_moduleId, 5, "Show Previous Change")),
|
|
440
433
|
alias: 'Show Previous Change',
|
|
441
|
-
precondition: ( TextCompareEditorActiveContext.toNegated()),
|
|
434
|
+
precondition: ( (TextCompareEditorActiveContext.toNegated())),
|
|
442
435
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 1024 | 512 | 61 , weight: 100 }
|
|
443
436
|
});
|
|
444
437
|
this.outerEditor = outerEditor;
|
|
@@ -463,13 +456,9 @@ class ShowNextChangeAction extends EditorAction {
|
|
|
463
456
|
constructor(outerEditor) {
|
|
464
457
|
super({
|
|
465
458
|
id: 'editor.action.dirtydiff.next',
|
|
466
|
-
label: ( localizeWithPath(
|
|
467
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
468
|
-
'show next change',
|
|
469
|
-
"Show Next Change"
|
|
470
|
-
)),
|
|
459
|
+
label: ( localizeWithPath(_moduleId, 6, "Show Next Change")),
|
|
471
460
|
alias: 'Show Next Change',
|
|
472
|
-
precondition: ( TextCompareEditorActiveContext.toNegated()),
|
|
461
|
+
precondition: ( (TextCompareEditorActiveContext.toNegated())),
|
|
473
462
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 512 | 61 , weight: 100 }
|
|
474
463
|
});
|
|
475
464
|
this.outerEditor = outerEditor;
|
|
@@ -494,11 +483,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
|
|
|
494
483
|
group: '7_change_nav',
|
|
495
484
|
command: {
|
|
496
485
|
id: 'editor.action.dirtydiff.next',
|
|
497
|
-
title: ( localizeWithPath(
|
|
498
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
499
|
-
{ key: 'miGotoNextChange', comment: ['&& denotes a mnemonic'] },
|
|
500
|
-
"Next &&Change"
|
|
501
|
-
))
|
|
486
|
+
title: ( localizeWithPath(_moduleId, 7, "Next &&Change"))
|
|
502
487
|
},
|
|
503
488
|
order: 1
|
|
504
489
|
});
|
|
@@ -506,11 +491,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
|
|
|
506
491
|
group: '7_change_nav',
|
|
507
492
|
command: {
|
|
508
493
|
id: 'editor.action.dirtydiff.previous',
|
|
509
|
-
title: ( localizeWithPath(
|
|
510
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
511
|
-
{ key: 'miGotoPreviousChange', comment: ['&& denotes a mnemonic'] },
|
|
512
|
-
"Previous &&Change"
|
|
513
|
-
))
|
|
494
|
+
title: ( localizeWithPath(_moduleId, 8, "Previous &&Change"))
|
|
514
495
|
},
|
|
515
496
|
order: 2
|
|
516
497
|
});
|
|
@@ -518,13 +499,9 @@ class GotoPreviousChangeAction extends EditorAction {
|
|
|
518
499
|
constructor() {
|
|
519
500
|
super({
|
|
520
501
|
id: 'workbench.action.editor.previousChange',
|
|
521
|
-
label: ( localizeWithPath(
|
|
522
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
523
|
-
'move to previous change',
|
|
524
|
-
"Go to Previous Change"
|
|
525
|
-
)),
|
|
502
|
+
label: ( localizeWithPath(_moduleId, 9, "Go to Previous Change")),
|
|
526
503
|
alias: 'Go to Previous Change',
|
|
527
|
-
precondition: ( TextCompareEditorActiveContext.toNegated()),
|
|
504
|
+
precondition: ( (TextCompareEditorActiveContext.toNegated())),
|
|
528
505
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 1024 | 512 | 63 , weight: 100 }
|
|
529
506
|
});
|
|
530
507
|
}
|
|
@@ -556,13 +533,9 @@ class GotoNextChangeAction extends EditorAction {
|
|
|
556
533
|
constructor() {
|
|
557
534
|
super({
|
|
558
535
|
id: 'workbench.action.editor.nextChange',
|
|
559
|
-
label: ( localizeWithPath(
|
|
560
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
561
|
-
'move to next change',
|
|
562
|
-
"Go to Next Change"
|
|
563
|
-
)),
|
|
536
|
+
label: ( localizeWithPath(_moduleId, 10, "Go to Next Change")),
|
|
564
537
|
alias: 'Go to Next Change',
|
|
565
|
-
precondition: ( TextCompareEditorActiveContext.toNegated()),
|
|
538
|
+
precondition: ( (TextCompareEditorActiveContext.toNegated())),
|
|
566
539
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 512 | 63 , weight: 100 }
|
|
567
540
|
});
|
|
568
541
|
}
|
|
@@ -590,7 +563,7 @@ class GotoNextChangeAction extends EditorAction {
|
|
|
590
563
|
}
|
|
591
564
|
}
|
|
592
565
|
function setPositionAndSelection(change, editor, accessibilityService, codeEditorService) {
|
|
593
|
-
const position = ( new Position(change.modifiedStartLineNumber, 1));
|
|
566
|
+
const position = ( (new Position(change.modifiedStartLineNumber, 1)));
|
|
594
567
|
editor.setPosition(position);
|
|
595
568
|
editor.revealPositionInCenter(position);
|
|
596
569
|
if (accessibilityService.isScreenReaderOptimized()) {
|
|
@@ -618,7 +591,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
|
|
|
618
591
|
weight: 100 + 50,
|
|
619
592
|
primary: 9 ,
|
|
620
593
|
secondary: [1024 | 9 ],
|
|
621
|
-
when: ( ContextKeyExpr.and(isDirtyDiffVisible)),
|
|
594
|
+
when: ( (ContextKeyExpr.and(isDirtyDiffVisible))),
|
|
622
595
|
handler: (accessor) => {
|
|
623
596
|
const outerEditor = getOuterEditorFromDiffEditor(accessor);
|
|
624
597
|
if (!outerEditor) {
|
|
@@ -648,7 +621,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
|
|
|
648
621
|
this.session = Disposable.None;
|
|
649
622
|
this.mouseDownInfo = null;
|
|
650
623
|
this.enabled = false;
|
|
651
|
-
this.gutterActionDisposables = ( new DisposableStore());
|
|
624
|
+
this.gutterActionDisposables = ( (new DisposableStore()));
|
|
652
625
|
this.enabled = !contextKeyService.getContextKeyValue('isInDiffEditor');
|
|
653
626
|
this.stylesheet = createStyleSheet(undefined, undefined, this._store);
|
|
654
627
|
if (this.enabled) {
|
|
@@ -705,7 +678,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
|
|
|
705
678
|
index = this.model.findNextClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
|
|
706
679
|
}
|
|
707
680
|
else {
|
|
708
|
-
const providerChanges = this.model.mapChanges.get(this.widget.provider) ?? ( this.model.mapChanges.values()).next().value;
|
|
681
|
+
const providerChanges = this.model.mapChanges.get(this.widget.provider) ?? ( (this.model.mapChanges.values())).next().value;
|
|
709
682
|
const mapIndex = providerChanges.findIndex(value => value === this.widget.index);
|
|
710
683
|
index = providerChanges[rot(mapIndex + 1, providerChanges.length)];
|
|
711
684
|
}
|
|
@@ -723,7 +696,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
|
|
|
723
696
|
index = this.model.findPreviousClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
|
|
724
697
|
}
|
|
725
698
|
else {
|
|
726
|
-
const providerChanges = this.model.mapChanges.get(this.widget.provider) ?? ( this.model.mapChanges.values()).next().value;
|
|
699
|
+
const providerChanges = this.model.mapChanges.get(this.widget.provider) ?? ( (this.model.mapChanges.values())).next().value;
|
|
727
700
|
const mapIndex = providerChanges.findIndex(value => value === this.widget.index);
|
|
728
701
|
index = providerChanges[rot(mapIndex - 1, providerChanges.length)];
|
|
729
702
|
}
|
|
@@ -761,10 +734,10 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
|
|
|
761
734
|
this.model = model;
|
|
762
735
|
this.widget = this.instantiationService.createInstance(DirtyDiffWidget, this.editor, model);
|
|
763
736
|
this.isDirtyDiffVisible.set(true);
|
|
764
|
-
const disposables = ( new DisposableStore());
|
|
737
|
+
const disposables = ( (new DisposableStore()));
|
|
765
738
|
disposables.add(Event.once(this.widget.onDidClose)(this.close, this));
|
|
766
|
-
const onDidModelChange = Event.chain(model.onDidChange, $ => ( $.filter(e => e.diff.length > 0)
|
|
767
|
-
.map(e => e.diff)));
|
|
739
|
+
const onDidModelChange = Event.chain(model.onDidChange, $ => ( ($.filter(e => e.diff.length > 0)
|
|
740
|
+
.map(e => e.diff))));
|
|
768
741
|
onDidModelChange(this.onDidModelChange, this, disposables);
|
|
769
742
|
disposables.add(this.widget);
|
|
770
743
|
disposables.add(toDisposable(() => {
|
|
@@ -860,26 +833,28 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
|
|
|
860
833
|
if (!model) {
|
|
861
834
|
return [];
|
|
862
835
|
}
|
|
863
|
-
return (
|
|
836
|
+
return (
|
|
837
|
+
(model.changes.map(change => change.change))
|
|
838
|
+
);
|
|
864
839
|
}
|
|
865
840
|
dispose() {
|
|
866
841
|
this.gutterActionDisposables.dispose();
|
|
867
842
|
super.dispose();
|
|
868
843
|
}
|
|
869
844
|
};
|
|
870
|
-
DirtyDiffController = DirtyDiffController_1 = ( __decorate([
|
|
871
|
-
( __param(1, IContextKeyService)),
|
|
872
|
-
( __param(2, IConfigurationService)),
|
|
873
|
-
( __param(3, IInstantiationService))
|
|
874
|
-
], DirtyDiffController));
|
|
845
|
+
DirtyDiffController = DirtyDiffController_1 = ( (__decorate([
|
|
846
|
+
( (__param(1, IContextKeyService))),
|
|
847
|
+
( (__param(2, IConfigurationService))),
|
|
848
|
+
( (__param(3, IInstantiationService)))
|
|
849
|
+
], DirtyDiffController)));
|
|
875
850
|
const editorGutterModifiedBackground = registerColor('editorGutter.modifiedBackground', {
|
|
876
851
|
dark: '#1B81A8',
|
|
877
852
|
light: '#2090D3',
|
|
878
853
|
hcDark: '#1B81A8',
|
|
879
854
|
hcLight: '#2090D3'
|
|
880
855
|
}, ( localizeWithPath(
|
|
881
|
-
|
|
882
|
-
|
|
856
|
+
_moduleId,
|
|
857
|
+
11,
|
|
883
858
|
"Editor gutter background color for lines that are modified."
|
|
884
859
|
)));
|
|
885
860
|
const editorGutterAddedBackground = registerColor('editorGutter.addedBackground', {
|
|
@@ -887,19 +862,15 @@ const editorGutterAddedBackground = registerColor('editorGutter.addedBackground'
|
|
|
887
862
|
light: '#48985D',
|
|
888
863
|
hcDark: '#487E02',
|
|
889
864
|
hcLight: '#48985D'
|
|
890
|
-
}, ( localizeWithPath(
|
|
891
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
892
|
-
'editorGutterAddedBackground',
|
|
893
|
-
"Editor gutter background color for lines that are added."
|
|
894
|
-
)));
|
|
865
|
+
}, ( localizeWithPath(_moduleId, 12, "Editor gutter background color for lines that are added.")));
|
|
895
866
|
const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', {
|
|
896
867
|
dark: editorErrorForeground,
|
|
897
868
|
light: editorErrorForeground,
|
|
898
869
|
hcDark: editorErrorForeground,
|
|
899
870
|
hcLight: editorErrorForeground
|
|
900
871
|
}, ( localizeWithPath(
|
|
901
|
-
|
|
902
|
-
|
|
872
|
+
_moduleId,
|
|
873
|
+
13,
|
|
903
874
|
"Editor gutter background color for lines that are deleted."
|
|
904
875
|
)));
|
|
905
876
|
const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBackground', {
|
|
@@ -908,8 +879,8 @@ const minimapGutterModifiedBackground = registerColor('minimapGutter.modifiedBac
|
|
|
908
879
|
hcDark: editorGutterModifiedBackground,
|
|
909
880
|
hcLight: editorGutterModifiedBackground
|
|
910
881
|
}, ( localizeWithPath(
|
|
911
|
-
|
|
912
|
-
|
|
882
|
+
_moduleId,
|
|
883
|
+
14,
|
|
913
884
|
"Minimap gutter background color for lines that are modified."
|
|
914
885
|
)));
|
|
915
886
|
const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackground', {
|
|
@@ -917,36 +888,20 @@ const minimapGutterAddedBackground = registerColor('minimapGutter.addedBackgroun
|
|
|
917
888
|
light: editorGutterAddedBackground,
|
|
918
889
|
hcDark: editorGutterAddedBackground,
|
|
919
890
|
hcLight: editorGutterAddedBackground
|
|
920
|
-
}, ( localizeWithPath(
|
|
921
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
922
|
-
'minimapGutterAddedBackground',
|
|
923
|
-
"Minimap gutter background color for lines that are added."
|
|
924
|
-
)));
|
|
891
|
+
}, ( localizeWithPath(_moduleId, 15, "Minimap gutter background color for lines that are added.")));
|
|
925
892
|
const minimapGutterDeletedBackground = registerColor('minimapGutter.deletedBackground', {
|
|
926
893
|
dark: editorGutterDeletedBackground,
|
|
927
894
|
light: editorGutterDeletedBackground,
|
|
928
895
|
hcDark: editorGutterDeletedBackground,
|
|
929
896
|
hcLight: editorGutterDeletedBackground
|
|
930
897
|
}, ( localizeWithPath(
|
|
931
|
-
|
|
932
|
-
|
|
898
|
+
_moduleId,
|
|
899
|
+
16,
|
|
933
900
|
"Minimap gutter background color for lines that are deleted."
|
|
934
901
|
)));
|
|
935
|
-
const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', { dark: ( transparent(editorGutterModifiedBackground, 0.6)), light: ( transparent(editorGutterModifiedBackground, 0.6)), hcDark: ( transparent(editorGutterModifiedBackground, 0.6)), hcLight: ( transparent(editorGutterModifiedBackground, 0.6)) }, ( localizeWithPath(
|
|
936
|
-
|
|
937
|
-
|
|
938
|
-
'Overview ruler marker color for modified content.'
|
|
939
|
-
)));
|
|
940
|
-
const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', { dark: ( transparent(editorGutterAddedBackground, 0.6)), light: ( transparent(editorGutterAddedBackground, 0.6)), hcDark: ( transparent(editorGutterAddedBackground, 0.6)), hcLight: ( transparent(editorGutterAddedBackground, 0.6)) }, ( localizeWithPath(
|
|
941
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
942
|
-
'overviewRulerAddedForeground',
|
|
943
|
-
'Overview ruler marker color for added content.'
|
|
944
|
-
)));
|
|
945
|
-
const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', { dark: ( transparent(editorGutterDeletedBackground, 0.6)), light: ( transparent(editorGutterDeletedBackground, 0.6)), hcDark: ( transparent(editorGutterDeletedBackground, 0.6)), hcLight: ( transparent(editorGutterDeletedBackground, 0.6)) }, ( localizeWithPath(
|
|
946
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
947
|
-
'overviewRulerDeletedForeground',
|
|
948
|
-
'Overview ruler marker color for deleted content.'
|
|
949
|
-
)));
|
|
902
|
+
const overviewRulerModifiedForeground = registerColor('editorOverviewRuler.modifiedForeground', { dark: ( (transparent(editorGutterModifiedBackground, 0.6))), light: ( (transparent(editorGutterModifiedBackground, 0.6))), hcDark: ( (transparent(editorGutterModifiedBackground, 0.6))), hcLight: ( (transparent(editorGutterModifiedBackground, 0.6))) }, ( localizeWithPath(_moduleId, 17, 'Overview ruler marker color for modified content.')));
|
|
903
|
+
const overviewRulerAddedForeground = registerColor('editorOverviewRuler.addedForeground', { dark: ( (transparent(editorGutterAddedBackground, 0.6))), light: ( (transparent(editorGutterAddedBackground, 0.6))), hcDark: ( (transparent(editorGutterAddedBackground, 0.6))), hcLight: ( (transparent(editorGutterAddedBackground, 0.6))) }, ( localizeWithPath(_moduleId, 18, 'Overview ruler marker color for added content.')));
|
|
904
|
+
const overviewRulerDeletedForeground = registerColor('editorOverviewRuler.deletedForeground', { dark: ( (transparent(editorGutterDeletedBackground, 0.6))), light: ( (transparent(editorGutterDeletedBackground, 0.6))), hcDark: ( (transparent(editorGutterDeletedBackground, 0.6))), hcLight: ( (transparent(editorGutterDeletedBackground, 0.6))) }, ( localizeWithPath(_moduleId, 19, 'Overview ruler marker color for deleted content.')));
|
|
950
905
|
let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends Disposable {
|
|
951
906
|
static createDecoration(className, tooltip, options) {
|
|
952
907
|
const decorationOptions = {
|
|
@@ -981,11 +936,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
|
|
|
981
936
|
const gutter = decorations === 'all' || decorations === 'gutter';
|
|
982
937
|
const overview = decorations === 'all' || decorations === 'overview';
|
|
983
938
|
const minimap = decorations === 'all' || decorations === 'minimap';
|
|
984
|
-
const diffAdded = ( localizeWithPath(
|
|
985
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
986
|
-
'diffAdded',
|
|
987
|
-
'Added lines'
|
|
988
|
-
));
|
|
939
|
+
const diffAdded = ( localizeWithPath(_moduleId, 20, 'Added lines'));
|
|
989
940
|
this.addedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-added', diffAdded, {
|
|
990
941
|
gutter,
|
|
991
942
|
overview: { active: overview, color: overviewRulerAddedForeground },
|
|
@@ -998,11 +949,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
|
|
|
998
949
|
minimap: { active: minimap, color: minimapGutterAddedBackground },
|
|
999
950
|
isWholeLine: true
|
|
1000
951
|
});
|
|
1001
|
-
const diffModified = ( localizeWithPath(
|
|
1002
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
1003
|
-
'diffModified',
|
|
1004
|
-
'Changed lines'
|
|
1005
|
-
));
|
|
952
|
+
const diffModified = ( localizeWithPath(_moduleId, 21, 'Changed lines'));
|
|
1006
953
|
this.modifiedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-modified', diffModified, {
|
|
1007
954
|
gutter,
|
|
1008
955
|
overview: { active: overview, color: overviewRulerModifiedForeground },
|
|
@@ -1015,11 +962,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
|
|
|
1015
962
|
minimap: { active: minimap, color: minimapGutterModifiedBackground },
|
|
1016
963
|
isWholeLine: true
|
|
1017
964
|
});
|
|
1018
|
-
this.deletedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-deleted', ( localizeWithPath(
|
|
1019
|
-
'vs/workbench/contrib/scm/browser/dirtydiffDecorator',
|
|
1020
|
-
'diffDeleted',
|
|
1021
|
-
'Removed lines'
|
|
1022
|
-
)), {
|
|
965
|
+
this.deletedOptions = DirtyDiffDecorator_1.createDecoration('dirty-diff-deleted', ( localizeWithPath(_moduleId, 22, 'Removed lines')), {
|
|
1023
966
|
gutter,
|
|
1024
967
|
overview: { active: overview, color: overviewRulerDeletedForeground },
|
|
1025
968
|
minimap: { active: minimap, color: minimapGutterDeletedBackground },
|
|
@@ -1037,7 +980,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
|
|
|
1037
980
|
return;
|
|
1038
981
|
}
|
|
1039
982
|
const pattern = this.configurationService.getValue('scm.diffDecorationsGutterPattern');
|
|
1040
|
-
const decorations = ( this.model.changes.map((labeledChange) => {
|
|
983
|
+
const decorations = ( (this.model.changes.map((labeledChange) => {
|
|
1041
984
|
const change = labeledChange.change;
|
|
1042
985
|
const changeType = getChangeType(change);
|
|
1043
986
|
const startLineNumber = change.modifiedStartLineNumber;
|
|
@@ -1068,7 +1011,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
|
|
|
1068
1011
|
options: pattern.modified ? this.modifiedPatternOptions : this.modifiedOptions
|
|
1069
1012
|
};
|
|
1070
1013
|
}
|
|
1071
|
-
}));
|
|
1014
|
+
})));
|
|
1072
1015
|
if (!this.decorationsCollection) {
|
|
1073
1016
|
this.decorationsCollection = this.codeEditor.createDecorationsCollection(decorations);
|
|
1074
1017
|
}
|
|
@@ -1085,9 +1028,9 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
|
|
|
1085
1028
|
this.decorationsCollection = undefined;
|
|
1086
1029
|
}
|
|
1087
1030
|
};
|
|
1088
|
-
DirtyDiffDecorator = DirtyDiffDecorator_1 = ( __decorate([
|
|
1089
|
-
( __param(3, IConfigurationService))
|
|
1090
|
-
], DirtyDiffDecorator));
|
|
1031
|
+
DirtyDiffDecorator = DirtyDiffDecorator_1 = ( (__decorate([
|
|
1032
|
+
( (__param(3, IConfigurationService)))
|
|
1033
|
+
], DirtyDiffDecorator)));
|
|
1091
1034
|
function compareChanges(a, b) {
|
|
1092
1035
|
let result = a.modifiedStartLineNumber - b.modifiedStartLineNumber;
|
|
1093
1036
|
if (result !== 0) {
|
|
@@ -1120,16 +1063,16 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
|
|
|
1120
1063
|
this.textModelResolverService = textModelResolverService;
|
|
1121
1064
|
this.progressService = progressService;
|
|
1122
1065
|
this._quickDiffs = [];
|
|
1123
|
-
this._originalModels = ( new Map());
|
|
1066
|
+
this._originalModels = ( (new Map()));
|
|
1124
1067
|
this._originalTextModels = [];
|
|
1125
|
-
this.diffDelayer = ( new ThrottledDelayer(200));
|
|
1126
|
-
this.repositoryDisposables = ( new Set());
|
|
1127
|
-
this.originalModelDisposables = this._register(( new DisposableStore()));
|
|
1068
|
+
this.diffDelayer = ( (new ThrottledDelayer(200)));
|
|
1069
|
+
this.repositoryDisposables = ( (new Set()));
|
|
1070
|
+
this.originalModelDisposables = this._register(( (new DisposableStore())));
|
|
1128
1071
|
this._disposed = false;
|
|
1129
|
-
this._onDidChange = ( new Emitter());
|
|
1072
|
+
this._onDidChange = ( (new Emitter()));
|
|
1130
1073
|
this.onDidChange = this._onDidChange.event;
|
|
1131
1074
|
this._changes = [];
|
|
1132
|
-
this._mapChanges = ( new Map());
|
|
1075
|
+
this._mapChanges = ( (new Map()));
|
|
1133
1076
|
this._model = textFileModel;
|
|
1134
1077
|
this._register(textFileModel.textEditorModel.onDidChangeContent(() => this.triggerDiff()));
|
|
1135
1078
|
this._register(Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsIgnoreTrimWhitespace') || e.affectsConfiguration('diffEditor.ignoreTrimWhitespace'))(this.triggerDiff, this));
|
|
@@ -1143,7 +1086,7 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
|
|
|
1143
1086
|
this._originalModels.clear();
|
|
1144
1087
|
this._originalTextModels = [];
|
|
1145
1088
|
this._quickDiffsPromise = undefined;
|
|
1146
|
-
this.setChanges([], ( new Map()));
|
|
1089
|
+
this.setChanges([], ( (new Map())));
|
|
1147
1090
|
this.triggerDiff();
|
|
1148
1091
|
}));
|
|
1149
1092
|
this._register(this.quickDiffService.onDidChangeQuickDiffProviders(() => this.triggerDiff()));
|
|
@@ -1153,7 +1096,7 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
|
|
|
1153
1096
|
return this._quickDiffs;
|
|
1154
1097
|
}
|
|
1155
1098
|
getDiffEditorModel(originalUri) {
|
|
1156
|
-
if (!( this._originalModels.has(originalUri))) {
|
|
1099
|
+
if (!( (this._originalModels.has(originalUri)))) {
|
|
1157
1100
|
return;
|
|
1158
1101
|
}
|
|
1159
1102
|
const original = this._originalModels.get(originalUri);
|
|
@@ -1163,7 +1106,7 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
|
|
|
1163
1106
|
};
|
|
1164
1107
|
}
|
|
1165
1108
|
onDidAddRepository(repository) {
|
|
1166
|
-
const disposables = ( new DisposableStore());
|
|
1109
|
+
const disposables = ( (new DisposableStore()));
|
|
1167
1110
|
this.repositoryDisposables.add(disposables);
|
|
1168
1111
|
disposables.add(toDisposable(() => this.repositoryDisposables.delete(disposables)));
|
|
1169
1112
|
const onDidChange = Event.any(repository.provider.onDidChange, repository.provider.onDidChangeResources);
|
|
@@ -1179,8 +1122,8 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
|
|
|
1179
1122
|
return this.diffDelayer
|
|
1180
1123
|
.trigger(() => this.diff())
|
|
1181
1124
|
.then((result) => {
|
|
1182
|
-
const originalModels = Array.from(( this._originalModels.values()));
|
|
1183
|
-
if (!result || this._disposed || this._model.isDisposed() || ( originalModels.some(originalModel => originalModel.isDisposed()))) {
|
|
1125
|
+
const originalModels = Array.from(( (this._originalModels.values())));
|
|
1126
|
+
if (!result || this._disposed || this._model.isDisposed() || ( (originalModels.some(originalModel => originalModel.isDisposed())))) {
|
|
1184
1127
|
return;
|
|
1185
1128
|
}
|
|
1186
1129
|
if (originalModels.every(originalModel => originalModel.textEditorModel.getValueLength() === 0)) {
|
|
@@ -1202,11 +1145,11 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
|
|
|
1202
1145
|
return this.progressService.withProgress({ location: 3 , delay: 250 }, async () => {
|
|
1203
1146
|
const originalURIs = await this.getQuickDiffsPromise();
|
|
1204
1147
|
if (this._disposed || this._model.isDisposed() || (originalURIs.length === 0)) {
|
|
1205
|
-
return Promise.resolve({ changes: [], mapChanges: ( new Map()) });
|
|
1148
|
+
return Promise.resolve({ changes: [], mapChanges: ( (new Map())) });
|
|
1206
1149
|
}
|
|
1207
1150
|
const filteredToDiffable = originalURIs.filter(quickDiff => this.editorWorkerService.canComputeDirtyDiff(quickDiff.originalResource, this._model.resource));
|
|
1208
1151
|
if (filteredToDiffable.length === 0) {
|
|
1209
|
-
return Promise.resolve({ changes: [], mapChanges: ( new Map()) });
|
|
1152
|
+
return Promise.resolve({ changes: [], mapChanges: ( (new Map())) });
|
|
1210
1153
|
}
|
|
1211
1154
|
const ignoreTrimWhitespaceSetting = this.configurationService.getValue('scm.diffDecorationsIgnoreTrimWhitespace');
|
|
1212
1155
|
const ignoreTrimWhitespace = ignoreTrimWhitespaceSetting === 'inherit'
|
|
@@ -1224,10 +1167,10 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
|
|
|
1224
1167
|
}
|
|
1225
1168
|
}
|
|
1226
1169
|
const sorted = allDiffs.sort((a, b) => compareChanges(a.change, b.change));
|
|
1227
|
-
const map = ( new Map());
|
|
1170
|
+
const map = ( (new Map()));
|
|
1228
1171
|
for (let i = 0; i < sorted.length; i++) {
|
|
1229
1172
|
const label = sorted[i].label;
|
|
1230
|
-
if (!( map.has(label))) {
|
|
1173
|
+
if (!( (map.has(label)))) {
|
|
1231
1174
|
map.set(label, []);
|
|
1232
1175
|
}
|
|
1233
1176
|
map.get(label).push(i);
|
|
@@ -1249,21 +1192,21 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
|
|
|
1249
1192
|
this._originalTextModels = [];
|
|
1250
1193
|
return [];
|
|
1251
1194
|
}
|
|
1252
|
-
if (equals(this._quickDiffs, quickDiffs, (a, b) => ( a.originalResource.toString()) === ( b.originalResource.toString()) && a.label === b.label)) {
|
|
1195
|
+
if (equals(this._quickDiffs, quickDiffs, (a, b) => ( (a.originalResource.toString())) === ( (b.originalResource.toString())) && a.label === b.label)) {
|
|
1253
1196
|
return quickDiffs;
|
|
1254
1197
|
}
|
|
1255
1198
|
this.originalModelDisposables.clear();
|
|
1256
1199
|
this._originalModels.clear();
|
|
1257
1200
|
this._originalTextModels = [];
|
|
1258
1201
|
this._quickDiffs = quickDiffs;
|
|
1259
|
-
return (await Promise.all(( quickDiffs.map(async (quickDiff) => {
|
|
1202
|
+
return (await Promise.all(( (quickDiffs.map(async (quickDiff) => {
|
|
1260
1203
|
try {
|
|
1261
1204
|
const ref = await this.textModelResolverService.createModelReference(quickDiff.originalResource);
|
|
1262
1205
|
if (this._disposed) {
|
|
1263
1206
|
ref.dispose();
|
|
1264
1207
|
return [];
|
|
1265
1208
|
}
|
|
1266
|
-
this._originalModels.set(( quickDiff.originalResource.toString()), ref.object);
|
|
1209
|
+
this._originalModels.set(( (quickDiff.originalResource.toString())), ref.object);
|
|
1267
1210
|
this._originalTextModels.push(ref.object.textEditorModel);
|
|
1268
1211
|
if (isTextFileEditorModel(ref.object)) {
|
|
1269
1212
|
const encoding = this._model.getEncoding();
|
|
@@ -1278,7 +1221,7 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
|
|
|
1278
1221
|
catch (error) {
|
|
1279
1222
|
return [];
|
|
1280
1223
|
}
|
|
1281
|
-
})))).flat();
|
|
1224
|
+
}))))).flat();
|
|
1282
1225
|
});
|
|
1283
1226
|
return this._quickDiffsPromise.finally(() => {
|
|
1284
1227
|
this._quickDiffsPromise = undefined;
|
|
@@ -1354,14 +1297,14 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
|
|
|
1354
1297
|
this.repositoryDisposables.clear();
|
|
1355
1298
|
}
|
|
1356
1299
|
};
|
|
1357
|
-
DirtyDiffModel = ( __decorate([
|
|
1358
|
-
( __param(1, ISCMService)),
|
|
1359
|
-
( __param(2, IQuickDiffService)),
|
|
1360
|
-
( __param(3, IEditorWorkerService)),
|
|
1361
|
-
( __param(4, IConfigurationService)),
|
|
1362
|
-
( __param(5, ITextModelService)),
|
|
1363
|
-
( __param(6, IProgressService))
|
|
1364
|
-
], DirtyDiffModel));
|
|
1300
|
+
DirtyDiffModel = ( (__decorate([
|
|
1301
|
+
( (__param(1, ISCMService))),
|
|
1302
|
+
( (__param(2, IQuickDiffService))),
|
|
1303
|
+
( (__param(3, IEditorWorkerService))),
|
|
1304
|
+
( (__param(4, IConfigurationService))),
|
|
1305
|
+
( (__param(5, ITextModelService))),
|
|
1306
|
+
( (__param(6, IProgressService)))
|
|
1307
|
+
], DirtyDiffModel)));
|
|
1365
1308
|
class DirtyDiffItem {
|
|
1366
1309
|
constructor(model, decorator) {
|
|
1367
1310
|
this.model = model;
|
|
@@ -1381,8 +1324,8 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
|
|
|
1381
1324
|
this.textFileService = textFileService;
|
|
1382
1325
|
this.enabled = false;
|
|
1383
1326
|
this.viewState = { width: 3, visibility: 'always' };
|
|
1384
|
-
this.items = ( new ResourceMap());
|
|
1385
|
-
this.transientDisposables = this._register(( new DisposableStore()));
|
|
1327
|
+
this.items = ( (new ResourceMap()));
|
|
1328
|
+
this.transientDisposables = this._register(( (new DisposableStore())));
|
|
1386
1329
|
this.stylesheet = createStyleSheet(undefined, undefined, this._store);
|
|
1387
1330
|
const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
|
|
1388
1331
|
this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
|
|
@@ -1450,7 +1393,7 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
|
|
|
1450
1393
|
}
|
|
1451
1394
|
this.transientDisposables.clear();
|
|
1452
1395
|
for (const [, dirtyDiff] of this.items) {
|
|
1453
|
-
dispose(( dirtyDiff.values()));
|
|
1396
|
+
dispose(( (dirtyDiff.values())));
|
|
1454
1397
|
}
|
|
1455
1398
|
this.items.clear();
|
|
1456
1399
|
this.enabled = false;
|
|
@@ -1463,28 +1406,28 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
|
|
|
1463
1406
|
if (controller) {
|
|
1464
1407
|
controller.modelRegistry = this;
|
|
1465
1408
|
}
|
|
1466
|
-
if (textModel && (!( this.items.has(textModel.uri)) || !( this.items.get(textModel.uri).has(editor.getId())))) {
|
|
1409
|
+
if (textModel && (!( (this.items.has(textModel.uri))) || !( (this.items.get(textModel.uri).has(editor.getId()))))) {
|
|
1467
1410
|
const textFileModel = this.textFileService.files.get(textModel.uri);
|
|
1468
1411
|
if (textFileModel?.isResolved()) {
|
|
1469
1412
|
const dirtyDiffModel = this.instantiationService.createInstance(DirtyDiffModel, textFileModel);
|
|
1470
|
-
const decorator = ( new DirtyDiffDecorator(
|
|
1413
|
+
const decorator = ( (new DirtyDiffDecorator(
|
|
1471
1414
|
textFileModel.textEditorModel,
|
|
1472
1415
|
editor,
|
|
1473
1416
|
dirtyDiffModel,
|
|
1474
1417
|
this.configurationService
|
|
1475
|
-
));
|
|
1476
|
-
if (!( this.items.has(textModel.uri))) {
|
|
1477
|
-
this.items.set(textModel.uri, ( new Map()));
|
|
1418
|
+
)));
|
|
1419
|
+
if (!( (this.items.has(textModel.uri)))) {
|
|
1420
|
+
this.items.set(textModel.uri, ( (new Map())));
|
|
1478
1421
|
}
|
|
1479
|
-
this.items.get(textModel.uri)?.set(editor.getId(), ( new DirtyDiffItem(dirtyDiffModel, decorator)));
|
|
1422
|
+
this.items.get(textModel.uri)?.set(editor.getId(), ( (new DirtyDiffItem(dirtyDiffModel, decorator))));
|
|
1480
1423
|
}
|
|
1481
1424
|
}
|
|
1482
1425
|
}
|
|
1483
1426
|
}
|
|
1484
1427
|
for (const [uri, item] of this.items) {
|
|
1485
|
-
for (const editorId of ( item.keys())) {
|
|
1486
|
-
if (!this.editorService.visibleTextEditorControls.find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === ( uri.toString()) && editor.getId() === editorId)) {
|
|
1487
|
-
if (( item.has(editorId))) {
|
|
1428
|
+
for (const editorId of ( (item.keys()))) {
|
|
1429
|
+
if (!this.editorService.visibleTextEditorControls.find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === ( (uri.toString())) && editor.getId() === editorId)) {
|
|
1430
|
+
if (( (item.has(editorId)))) {
|
|
1488
1431
|
const dirtyDiffItem = item.get(editorId);
|
|
1489
1432
|
dirtyDiffItem?.dispose();
|
|
1490
1433
|
item.delete(editorId);
|
|
@@ -1504,11 +1447,11 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
|
|
|
1504
1447
|
super.dispose();
|
|
1505
1448
|
}
|
|
1506
1449
|
};
|
|
1507
|
-
DirtyDiffWorkbenchController = ( __decorate([
|
|
1508
|
-
( __param(0, IEditorService)),
|
|
1509
|
-
( __param(1, IInstantiationService)),
|
|
1510
|
-
( __param(2, IConfigurationService)),
|
|
1511
|
-
( __param(3, ITextFileService))
|
|
1512
|
-
], DirtyDiffWorkbenchController));
|
|
1450
|
+
DirtyDiffWorkbenchController = ( (__decorate([
|
|
1451
|
+
( (__param(0, IEditorService))),
|
|
1452
|
+
( (__param(1, IInstantiationService))),
|
|
1453
|
+
( (__param(2, IConfigurationService))),
|
|
1454
|
+
( (__param(3, ITextFileService)))
|
|
1455
|
+
], DirtyDiffWorkbenchController)));
|
|
1513
1456
|
registerEditorContribution(DirtyDiffController.ID, DirtyDiffController, 1 );
|
|
1514
1457
|
export { DirtyDiffController, DirtyDiffModel, DirtyDiffWorkbenchController, GotoNextChangeAction, GotoPreviousChangeAction, ShowNextChangeAction, ShowPreviousChangeAction, getOriginalResource, isDirtyDiffVisible };
|