@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
|
@@ -17,6 +17,7 @@ import { DocumentLineRangeMap, LineRangeMapping, DocumentRangeMap } from './mapp
|
|
|
17
17
|
import { TextModelDiffs } from './textModelDiffs.js';
|
|
18
18
|
import { leftJoin } from '../utils.js';
|
|
19
19
|
import { ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateKind } from './modifiedBaseRange.js';
|
|
20
|
+
const _moduleId = "vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
|
|
20
21
|
let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
21
22
|
constructor(base, input1, input2, resultTextModel, diffComputer, options, telemetry, languageService, undoRedoService) {
|
|
22
23
|
super();
|
|
@@ -29,18 +30,18 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
|
29
30
|
this.telemetry = telemetry;
|
|
30
31
|
this.languageService = languageService;
|
|
31
32
|
this.undoRedoService = undoRedoService;
|
|
32
|
-
this.input1TextModelDiffs = this._register(( new TextModelDiffs(this.base, this.input1.textModel, this.diffComputer)));
|
|
33
|
-
this.input2TextModelDiffs = this._register(( new TextModelDiffs(this.base, this.input2.textModel, this.diffComputer)));
|
|
34
|
-
this.resultTextModelDiffs = this._register(( new TextModelDiffs(this.base, this.resultTextModel, this.diffComputer)));
|
|
33
|
+
this.input1TextModelDiffs = this._register(( (new TextModelDiffs(this.base, this.input1.textModel, this.diffComputer))));
|
|
34
|
+
this.input2TextModelDiffs = this._register(( (new TextModelDiffs(this.base, this.input2.textModel, this.diffComputer))));
|
|
35
|
+
this.resultTextModelDiffs = this._register(( (new TextModelDiffs(this.base, this.resultTextModel, this.diffComputer))));
|
|
35
36
|
this.modifiedBaseRanges = derived(this, (reader) => {
|
|
36
37
|
const input1Diffs = this.input1TextModelDiffs.diffs.read(reader);
|
|
37
38
|
const input2Diffs = this.input2TextModelDiffs.diffs.read(reader);
|
|
38
39
|
return ModifiedBaseRange.fromDiffs(input1Diffs, input2Diffs, this.base, this.input1.textModel, this.input2.textModel);
|
|
39
40
|
});
|
|
40
41
|
this.modifiedBaseRangeResultStates = derived(this, reader => {
|
|
41
|
-
const map = ( new Map((
|
|
42
|
-
s, ( new ModifiedBaseRangeData(s))
|
|
43
|
-
]))));
|
|
42
|
+
const map = ( (new Map( (this.modifiedBaseRanges.read(reader).map((s) => [
|
|
43
|
+
s, ( (new ModifiedBaseRangeData(s)))
|
|
44
|
+
])))));
|
|
44
45
|
return map;
|
|
45
46
|
});
|
|
46
47
|
this.resultSnapshot = this.resultTextModel.createSnapshot();
|
|
@@ -56,36 +57,41 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
|
56
57
|
});
|
|
57
58
|
this.resultInput2Mapping = derived(this, reader => this.input2ResultMapping.read(reader).reverse());
|
|
58
59
|
this.baseResultMapping = derived(this, reader => {
|
|
59
|
-
const map = ( new DocumentLineRangeMap(this.baseResultDiffs.read(reader), -1));
|
|
60
|
-
return (
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
60
|
+
const map = ( (new DocumentLineRangeMap(this.baseResultDiffs.read(reader), -1)));
|
|
61
|
+
return (
|
|
62
|
+
(new DocumentLineRangeMap(
|
|
63
|
+
(map.lineRangeMappings.map((m) => m.inputRange.isEmpty || m.outputRange.isEmpty
|
|
64
|
+
? ( (new
|
|
65
|
+
LineRangeMapping(m.inputRange.deltaStart(-1), m.outputRange.deltaStart(-1))))
|
|
66
|
+
: m)),
|
|
67
|
+
map.inputLineCount
|
|
68
|
+
))
|
|
69
|
+
);
|
|
64
70
|
});
|
|
65
71
|
this.resultBaseMapping = derived(this, reader => this.baseResultMapping.read(reader).reverse());
|
|
66
72
|
this.diffComputingState = derived(this, reader => {
|
|
67
|
-
const states = ( [
|
|
73
|
+
const states = ( ([
|
|
68
74
|
this.input1TextModelDiffs,
|
|
69
75
|
this.input2TextModelDiffs,
|
|
70
76
|
this.resultTextModelDiffs,
|
|
71
|
-
].map((s) => s.state.read(reader)));
|
|
72
|
-
if (( states.some((s) => s === 1 ))) {
|
|
77
|
+
].map((s) => s.state.read(reader))));
|
|
78
|
+
if (( (states.some((s) => s === 1 )))) {
|
|
73
79
|
return 1 ;
|
|
74
80
|
}
|
|
75
|
-
if (( states.some((s) => s === 3 ))) {
|
|
81
|
+
if (( (states.some((s) => s === 3 )))) {
|
|
76
82
|
return 3 ;
|
|
77
83
|
}
|
|
78
84
|
return 2 ;
|
|
79
85
|
});
|
|
80
86
|
this.inputDiffComputingState = derived(this, reader => {
|
|
81
|
-
const states = ( [
|
|
87
|
+
const states = ( ([
|
|
82
88
|
this.input1TextModelDiffs,
|
|
83
89
|
this.input2TextModelDiffs,
|
|
84
|
-
].map((s) => s.state.read(reader)));
|
|
85
|
-
if (( states.some((s) => s === 1 ))) {
|
|
90
|
+
].map((s) => s.state.read(reader))));
|
|
91
|
+
if (( (states.some((s) => s === 1 )))) {
|
|
86
92
|
return 1 ;
|
|
87
93
|
}
|
|
88
|
-
if (( states.some((s) => s === 3 ))) {
|
|
94
|
+
if (( (states.some((s) => s === 3 )))) {
|
|
89
95
|
return 3 ;
|
|
90
96
|
}
|
|
91
97
|
return 2 ;
|
|
@@ -103,7 +109,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
|
103
109
|
}
|
|
104
110
|
return unhandledCount;
|
|
105
111
|
});
|
|
106
|
-
this.hasUnhandledConflicts = ( this.unhandledConflictsCount.map(value => value > 0));
|
|
112
|
+
this.hasUnhandledConflicts = ( (this.unhandledConflictsCount.map(value => value > 0)));
|
|
107
113
|
this._register(keepObserved(this.modifiedBaseRangeResultStates));
|
|
108
114
|
this._register(keepObserved(this.input1ResultMapping));
|
|
109
115
|
this._register(keepObserved(this.input2ResultMapping));
|
|
@@ -178,7 +184,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
|
178
184
|
state.handledInput2.set(handled, tx);
|
|
179
185
|
}
|
|
180
186
|
this.resultTextModel.pushEditOperations(null, [{
|
|
181
|
-
range: ( new Range(1, 1, Number.MAX_SAFE_INTEGER, 1)),
|
|
187
|
+
range: ( (new Range(1, 1, Number.MAX_SAFE_INTEGER, 1))),
|
|
182
188
|
text: this.computeAutoMergedResult()
|
|
183
189
|
}], () => null);
|
|
184
190
|
});
|
|
@@ -215,35 +221,42 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
|
215
221
|
return resultLines.join(this.resultTextModel.getEOL());
|
|
216
222
|
}
|
|
217
223
|
hasBaseRange(baseRange) {
|
|
218
|
-
return (
|
|
224
|
+
return (
|
|
225
|
+
(this.modifiedBaseRangeResultStates.get().has(baseRange))
|
|
226
|
+
);
|
|
219
227
|
}
|
|
220
228
|
get isApplyingEditInResult() { return this.resultTextModelDiffs.isApplyingChange; }
|
|
221
229
|
getInputResultMapping(inputLinesDiffs, resultDiffs, inputLineCount) {
|
|
222
230
|
const map = DocumentLineRangeMap.betweenOutputs(inputLinesDiffs, resultDiffs, inputLineCount);
|
|
223
|
-
return (
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
231
|
+
return (
|
|
232
|
+
(new DocumentLineRangeMap(
|
|
233
|
+
(map.lineRangeMappings.map((m) => m.inputRange.isEmpty || m.outputRange.isEmpty
|
|
234
|
+
? ( (new
|
|
235
|
+
LineRangeMapping(m.inputRange.deltaStart(-1), m.outputRange.deltaStart(-1))))
|
|
236
|
+
: m)),
|
|
237
|
+
map.inputLineCount
|
|
238
|
+
))
|
|
239
|
+
);
|
|
227
240
|
}
|
|
228
241
|
translateInputRangeToBase(input, range) {
|
|
229
242
|
const baseInputDiffs = input === 1 ? this.baseInput1Diffs.get() : this.baseInput2Diffs.get();
|
|
230
|
-
const map = ( new DocumentRangeMap(baseInputDiffs.flatMap(d => d.rangeMappings), 0)).reverse();
|
|
243
|
+
const map = ( (new DocumentRangeMap(baseInputDiffs.flatMap(d => d.rangeMappings), 0))).reverse();
|
|
231
244
|
return map.projectRange(range).outputRange;
|
|
232
245
|
}
|
|
233
246
|
translateBaseRangeToInput(input, range) {
|
|
234
247
|
const baseInputDiffs = input === 1 ? this.baseInput1Diffs.get() : this.baseInput2Diffs.get();
|
|
235
|
-
const map = ( new DocumentRangeMap(baseInputDiffs.flatMap(d => d.rangeMappings), 0));
|
|
248
|
+
const map = ( (new DocumentRangeMap(baseInputDiffs.flatMap(d => d.rangeMappings), 0)));
|
|
236
249
|
return map.projectRange(range).outputRange;
|
|
237
250
|
}
|
|
238
251
|
getLineRangeInResult(baseRange, reader) {
|
|
239
252
|
return this.resultTextModelDiffs.getResultLineRange(baseRange, reader);
|
|
240
253
|
}
|
|
241
254
|
translateResultRangeToBase(range) {
|
|
242
|
-
const map = ( new DocumentRangeMap(this.baseResultDiffs.get().flatMap(d => d.rangeMappings), 0)).reverse();
|
|
255
|
+
const map = ( (new DocumentRangeMap(this.baseResultDiffs.get().flatMap(d => d.rangeMappings), 0))).reverse();
|
|
243
256
|
return map.projectRange(range).outputRange;
|
|
244
257
|
}
|
|
245
258
|
translateBaseRangeToResult(range) {
|
|
246
|
-
const map = ( new DocumentRangeMap(this.baseResultDiffs.get().flatMap(d => d.rangeMappings), 0));
|
|
259
|
+
const map = ( (new DocumentRangeMap(this.baseResultDiffs.get().flatMap(d => d.rangeMappings), 0)));
|
|
247
260
|
return map.projectRange(range).outputRange;
|
|
248
261
|
}
|
|
249
262
|
findModifiedBaseRangesInRange(rangeInBase) {
|
|
@@ -273,9 +286,9 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
|
273
286
|
if (conflictingDiffs.length === 0) {
|
|
274
287
|
return ModifiedBaseRangeState.base;
|
|
275
288
|
}
|
|
276
|
-
const conflictingEdits = ( conflictingDiffs.map((d) => d.getLineEdit()));
|
|
289
|
+
const conflictingEdits = ( (conflictingDiffs.map((d) => d.getLineEdit())));
|
|
277
290
|
function editsAgreeWithDiffs(diffs) {
|
|
278
|
-
return equals(conflictingEdits, ( diffs.map((d) => d.getLineEdit())), (a, b) => a.equals(b));
|
|
291
|
+
return equals(conflictingEdits, ( (diffs.map((d) => d.getLineEdit()))), (a, b) => a.equals(b));
|
|
279
292
|
}
|
|
280
293
|
if (editsAgreeWithDiffs(baseRange.input1Diffs)) {
|
|
281
294
|
return ModifiedBaseRangeState.base.withInputValue(1, true);
|
|
@@ -304,20 +317,20 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
|
304
317
|
getState(baseRange) {
|
|
305
318
|
const existingState = this.modifiedBaseRangeResultStates.get().get(baseRange);
|
|
306
319
|
if (!existingState) {
|
|
307
|
-
throw new BugIndicatingError('object must be from this instance');
|
|
320
|
+
throw ( (new BugIndicatingError('object must be from this instance')));
|
|
308
321
|
}
|
|
309
322
|
return existingState.accepted;
|
|
310
323
|
}
|
|
311
324
|
setState(baseRange, state, _markInputAsHandled, tx, _pushStackElement = false) {
|
|
312
325
|
if (!this.isUpToDate.get()) {
|
|
313
|
-
throw new BugIndicatingError('Cannot set state while updating');
|
|
326
|
+
throw ( (new BugIndicatingError('Cannot set state while updating')));
|
|
314
327
|
}
|
|
315
328
|
const existingState = this.modifiedBaseRangeResultStates.get().get(baseRange);
|
|
316
329
|
if (!existingState) {
|
|
317
|
-
throw new BugIndicatingError('object must be from this instance');
|
|
330
|
+
throw ( (new BugIndicatingError('object must be from this instance')));
|
|
318
331
|
}
|
|
319
332
|
const conflictingDiffs = this.resultTextModelDiffs.findTouchingDiffs(baseRange.baseRange);
|
|
320
|
-
const group = ( new UndoRedoGroup());
|
|
333
|
+
const group = ( (new UndoRedoGroup()));
|
|
321
334
|
if (conflictingDiffs) {
|
|
322
335
|
this.resultTextModelDiffs.removeDiffs(conflictingDiffs, tx, group);
|
|
323
336
|
}
|
|
@@ -328,7 +341,13 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
|
328
341
|
const input1Handled = existingState.handledInput1.get();
|
|
329
342
|
const input2Handled = existingState.handledInput2.get();
|
|
330
343
|
if (!input1Handled || !input2Handled) {
|
|
331
|
-
this.undoRedoService.pushElement(( new MarkAsHandledUndoRedoElement(
|
|
344
|
+
this.undoRedoService.pushElement(( (new MarkAsHandledUndoRedoElement(
|
|
345
|
+
this.resultTextModel.uri,
|
|
346
|
+
(new WeakRef(this)),
|
|
347
|
+
(new WeakRef(existingState)),
|
|
348
|
+
input1Handled,
|
|
349
|
+
input2Handled
|
|
350
|
+
))), group);
|
|
332
351
|
}
|
|
333
352
|
if (edit) {
|
|
334
353
|
this.resultTextModel.pushStackElement();
|
|
@@ -361,17 +380,13 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
|
361
380
|
if (state.handled.get() === handled) {
|
|
362
381
|
return;
|
|
363
382
|
}
|
|
364
|
-
const dataRef = ( new WeakRef(ModifiedBaseRangeData));
|
|
365
|
-
const modelRef = ( new WeakRef(this));
|
|
383
|
+
const dataRef = ( (new WeakRef(ModifiedBaseRangeData)));
|
|
384
|
+
const modelRef = ( (new WeakRef(this)));
|
|
366
385
|
this.undoRedoService.pushElement({
|
|
367
386
|
type: 0 ,
|
|
368
387
|
resource: this.resultTextModel.uri,
|
|
369
388
|
code: 'setInputHandled',
|
|
370
|
-
label: ( localizeWithPath(
|
|
371
|
-
'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel',
|
|
372
|
-
'setInputHandled',
|
|
373
|
-
"Set Input Handled"
|
|
374
|
-
)),
|
|
389
|
+
label: ( localizeWithPath(_moduleId, 0, "Set Input Handled")),
|
|
375
390
|
redo() {
|
|
376
391
|
const model = modelRef.deref();
|
|
377
392
|
const data = dataRef.deref();
|
|
@@ -548,10 +563,10 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
|
|
|
548
563
|
});
|
|
549
564
|
}
|
|
550
565
|
};
|
|
551
|
-
MergeEditorModel = ( __decorate([
|
|
552
|
-
( __param(7, ILanguageService)),
|
|
553
|
-
( __param(8, IUndoRedoService))
|
|
554
|
-
], MergeEditorModel));
|
|
566
|
+
MergeEditorModel = ( (__decorate([
|
|
567
|
+
( (__param(7, ILanguageService))),
|
|
568
|
+
( (__param(8, IUndoRedoService)))
|
|
569
|
+
], MergeEditorModel)));
|
|
555
570
|
function arrayCount(array, predicate) {
|
|
556
571
|
let count = 0;
|
|
557
572
|
for (const value of array) {
|
|
@@ -580,11 +595,7 @@ class MarkAsHandledUndoRedoElement {
|
|
|
580
595
|
this.input1Handled = input1Handled;
|
|
581
596
|
this.input2Handled = input2Handled;
|
|
582
597
|
this.code = 'undoMarkAsHandled';
|
|
583
|
-
this.label = ( localizeWithPath(
|
|
584
|
-
'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel',
|
|
585
|
-
'undoMarkAsHandled',
|
|
586
|
-
'Undo Mark As Handled'
|
|
587
|
-
));
|
|
598
|
+
this.label = ( localizeWithPath(_moduleId, 1, 'Undo Mark As Handled'));
|
|
588
599
|
this.type = 0 ;
|
|
589
600
|
}
|
|
590
601
|
redo() {
|
|
@@ -39,7 +39,7 @@ class ModifiedBaseRange {
|
|
|
39
39
|
this.dumbInput1LineRangeEdit = null;
|
|
40
40
|
this.dumbInput2LineRangeEdit = null;
|
|
41
41
|
if (this.input1Diffs.length === 0 && this.input2Diffs.length === 0) {
|
|
42
|
-
throw new BugIndicatingError('must have at least one diff');
|
|
42
|
+
throw ( new BugIndicatingError('must have at least one diff'));
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
getInputRange(inputNumber) {
|
|
@@ -80,7 +80,7 @@ class ModifiedBaseRange {
|
|
|
80
80
|
return { edit: diffs[0].diff.getLineEdit(), effectiveState: ModifiedBaseRangeState.base.withInputValue(diffs[0].inputNumber, true, false) };
|
|
81
81
|
}
|
|
82
82
|
if (state.kind !== ModifiedBaseRangeStateKind.both) {
|
|
83
|
-
throw new BugIndicatingError();
|
|
83
|
+
throw ( new BugIndicatingError());
|
|
84
84
|
}
|
|
85
85
|
const smartCombinedEdit = state.smartCombination ? this.smartCombineInputs(state.firstInput) : this.dumbCombineInputs(state.firstInput);
|
|
86
86
|
if (smartCombinedEdit) {
|
|
@@ -77,7 +77,7 @@ class TextModelDiffs extends Disposable {
|
|
|
77
77
|
}
|
|
78
78
|
ensureUpToDate() {
|
|
79
79
|
if (this.state.get() !== 2 ) {
|
|
80
|
-
throw new BugIndicatingError('Cannot remove diffs when the model is not up to date');
|
|
80
|
+
throw ( new BugIndicatingError('Cannot remove diffs when the model is not up to date'));
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
removeDiffs(diffToRemoves, transaction, group) {
|
|
@@ -89,7 +89,7 @@ class TextModelDiffs extends Disposable {
|
|
|
89
89
|
const len = diffs.length;
|
|
90
90
|
diffs = diffs.filter((d) => d !== diffToRemove);
|
|
91
91
|
if (len === diffs.length) {
|
|
92
|
-
throw new BugIndicatingError();
|
|
92
|
+
throw ( new BugIndicatingError());
|
|
93
93
|
}
|
|
94
94
|
this._barrier.runExclusivelyOrThrow(() => {
|
|
95
95
|
const edits = diffToRemove.getReverseLineEdit().toEdits(this.textModel.getLineCount());
|
|
@@ -109,7 +109,7 @@ class TextModelDiffs extends Disposable {
|
|
|
109
109
|
const newDiffs = ( new Array());
|
|
110
110
|
for (const diff of this.diffs.get()) {
|
|
111
111
|
if (diff.inputRange.touches(edit.range)) {
|
|
112
|
-
throw new BugIndicatingError('Edit must be conflict free.');
|
|
112
|
+
throw ( new BugIndicatingError('Edit must be conflict free.'));
|
|
113
113
|
}
|
|
114
114
|
else if (diff.inputRange.isAfter(edit.range)) {
|
|
115
115
|
if (!firstAfter) {
|
|
@@ -1,64 +1,33 @@
|
|
|
1
1
|
import { localizeWithPath } from '../../../../nls.js';
|
|
2
2
|
import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
|
|
3
|
-
const
|
|
4
|
-
'
|
|
5
|
-
|
|
6
|
-
'The editor is a merge editor'
|
|
7
|
-
)) }));
|
|
8
|
-
const ctxIsMergeResultEditor = ( new RawContextKey(
|
|
3
|
+
const _moduleId = "vs/workbench/contrib/mergeEditor/common/mergeEditor";
|
|
4
|
+
const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localizeWithPath(_moduleId, 0, 'The editor is a merge editor')) })));
|
|
5
|
+
const ctxIsMergeResultEditor = ( (new RawContextKey(
|
|
9
6
|
'isMergeResultEditor',
|
|
10
7
|
false,
|
|
11
|
-
{ type: 'boolean', description: ( localizeWithPath(
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
'The editor is a the result editor of a merge editor.'
|
|
15
|
-
)) }
|
|
16
|
-
));
|
|
17
|
-
const ctxMergeEditorLayout = ( new RawContextKey(
|
|
8
|
+
{ type: 'boolean', description: ( localizeWithPath(_moduleId, 1, 'The editor is a the result editor of a merge editor.')) }
|
|
9
|
+
)));
|
|
10
|
+
const ctxMergeEditorLayout = ( (new RawContextKey(
|
|
18
11
|
'mergeEditorLayout',
|
|
19
12
|
'mixed',
|
|
20
|
-
{ type: 'string', description: ( localizeWithPath(
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
'The layout mode of a merge editor'
|
|
24
|
-
)) }
|
|
25
|
-
));
|
|
26
|
-
const ctxMergeEditorShowBase = ( new RawContextKey(
|
|
13
|
+
{ type: 'string', description: ( localizeWithPath(_moduleId, 2, 'The layout mode of a merge editor')) }
|
|
14
|
+
)));
|
|
15
|
+
const ctxMergeEditorShowBase = ( (new RawContextKey(
|
|
27
16
|
'mergeEditorShowBase',
|
|
28
17
|
false,
|
|
29
|
-
{ type: 'boolean', description: ( localizeWithPath(
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
'If the merge editor shows the base version'
|
|
33
|
-
)) }
|
|
34
|
-
));
|
|
35
|
-
const ctxMergeEditorShowBaseAtTop = ( new RawContextKey(
|
|
18
|
+
{ type: 'boolean', description: ( localizeWithPath(_moduleId, 3, 'If the merge editor shows the base version')) }
|
|
19
|
+
)));
|
|
20
|
+
const ctxMergeEditorShowBaseAtTop = ( (new RawContextKey(
|
|
36
21
|
'mergeEditorShowBaseAtTop',
|
|
37
22
|
false,
|
|
38
|
-
{ type: 'boolean', description: ( localizeWithPath(
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
'If base should be shown at the top'
|
|
42
|
-
)) }
|
|
43
|
-
));
|
|
44
|
-
const ctxMergeEditorShowNonConflictingChanges = ( new RawContextKey(
|
|
23
|
+
{ type: 'boolean', description: ( localizeWithPath(_moduleId, 4, 'If base should be shown at the top')) }
|
|
24
|
+
)));
|
|
25
|
+
const ctxMergeEditorShowNonConflictingChanges = ( (new RawContextKey(
|
|
45
26
|
'mergeEditorShowNonConflictingChanges',
|
|
46
27
|
false,
|
|
47
|
-
{ type: 'boolean', description: ( localizeWithPath(
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
)) }
|
|
52
|
-
));
|
|
53
|
-
const ctxMergeBaseUri = ( new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localizeWithPath(
|
|
54
|
-
'vs/workbench/contrib/mergeEditor/common/mergeEditor',
|
|
55
|
-
'baseUri',
|
|
56
|
-
'The uri of the baser of a merge editor'
|
|
57
|
-
)) }));
|
|
58
|
-
const ctxMergeResultUri = ( new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localizeWithPath(
|
|
59
|
-
'vs/workbench/contrib/mergeEditor/common/mergeEditor',
|
|
60
|
-
'resultUri',
|
|
61
|
-
'The uri of the result of a merge editor'
|
|
62
|
-
)) }));
|
|
28
|
+
{ type: 'boolean', description: ( localizeWithPath(_moduleId, 5, 'If the merge editor shows non-conflicting changes')) }
|
|
29
|
+
)));
|
|
30
|
+
const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localizeWithPath(_moduleId, 6, 'The uri of the baser of a merge editor')) })));
|
|
31
|
+
const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localizeWithPath(_moduleId, 7, 'The uri of the result of a merge editor')) })));
|
|
63
32
|
const StorageCloseWithConflicts = 'mergeEditorCloseWithConflicts';
|
|
64
33
|
export { StorageCloseWithConflicts, ctxIsMergeEditor, ctxIsMergeResultEditor, ctxMergeBaseUri, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, ctxMergeResultUri };
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { Codicon } from '../../../../base/common/codicons.js';
|
|
2
2
|
import { localizeWithPath } from '../../../../nls.js';
|
|
3
3
|
import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
|
|
4
|
-
const
|
|
5
|
-
'
|
|
6
|
-
'multiDiffEditorLabelIcon',
|
|
7
|
-
'Icon of the multi diff editor label.'
|
|
8
|
-
)));
|
|
4
|
+
const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/icons.contribution";
|
|
5
|
+
const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localizeWithPath(_moduleId, 0, 'Icon of the multi diff editor label.')));
|
|
9
6
|
export { MultiDiffEditorIcon };
|
|
@@ -27,19 +27,27 @@ import { RegisteredEditorPriority } from '../../../services/editor/common/editor
|
|
|
27
27
|
import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
|
|
28
28
|
import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
|
|
29
29
|
var MultiDiffEditorInput_1;
|
|
30
|
+
const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput";
|
|
30
31
|
let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
|
|
31
32
|
static { MultiDiffEditorInput_1 = this; }
|
|
32
33
|
static fromResourceMultiDiffEditorInput(input, instantiationService) {
|
|
33
34
|
if (!input.multiDiffSource && !input.resources) {
|
|
34
|
-
throw new BugIndicatingError('MultiDiffEditorInput requires either multiDiffSource or resources');
|
|
35
|
+
throw ( (new BugIndicatingError('MultiDiffEditorInput requires either multiDiffSource or resources')));
|
|
35
36
|
}
|
|
36
|
-
const multiDiffSource = input.multiDiffSource ?? ( URI.parse(
|
|
37
|
+
const multiDiffSource = input.multiDiffSource ?? ( (URI.parse(
|
|
38
|
+
`multi-diff-editor:${( (( (new Date())).getMilliseconds().toString())) + ( (Math.random().toString()))}`
|
|
39
|
+
)));
|
|
37
40
|
return instantiationService.createInstance(MultiDiffEditorInput_1, multiDiffSource, input.label, input.resources?.map(resource => {
|
|
38
|
-
return (
|
|
41
|
+
return (
|
|
42
|
+
(new MultiDiffEditorItem(resource.original.resource, resource.modified.resource))
|
|
43
|
+
);
|
|
39
44
|
}), input.isTransient ?? false);
|
|
40
45
|
}
|
|
41
46
|
static fromSerialized(data, instantiationService) {
|
|
42
|
-
return instantiationService.createInstance(MultiDiffEditorInput_1, ( URI.parse(data.multiDiffSourceUri)), data.label, data.resources?.map(resource => ( new MultiDiffEditorItem(
|
|
47
|
+
return instantiationService.createInstance(MultiDiffEditorInput_1, ( (URI.parse(data.multiDiffSourceUri))), data.label, data.resources?.map(resource => ( (new MultiDiffEditorItem(
|
|
48
|
+
resource.originalUri ? ( (URI.parse(resource.originalUri))) : undefined,
|
|
49
|
+
resource.modifiedUri ? ( (URI.parse(resource.modifiedUri))) : undefined
|
|
50
|
+
)))), false);
|
|
43
51
|
}
|
|
44
52
|
static { this.ID = 'workbench.input.multiDiffEditor'; }
|
|
45
53
|
get resource() { return this.multiDiffSource; }
|
|
@@ -60,30 +68,30 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
|
|
|
60
68
|
this._multiDiffSourceResolverService = _multiDiffSourceResolverService;
|
|
61
69
|
this._textFileService = _textFileService;
|
|
62
70
|
this._name = '';
|
|
63
|
-
this._viewModel = ( new LazyStatefulPromise(async () => {
|
|
71
|
+
this._viewModel = ( (new LazyStatefulPromise(async () => {
|
|
64
72
|
const model = await this._createModel();
|
|
65
73
|
this._register(model);
|
|
66
|
-
const vm = ( new MultiDiffEditorViewModel(model, this._instantiationService));
|
|
74
|
+
const vm = ( (new MultiDiffEditorViewModel(model, this._instantiationService)));
|
|
67
75
|
this._register(vm);
|
|
68
76
|
await raceTimeout(vm.waitForDiffs(), 1000);
|
|
69
77
|
return vm;
|
|
70
|
-
}));
|
|
71
|
-
this._resolvedSource = ( new ObservableLazyPromise(async () => {
|
|
78
|
+
})));
|
|
79
|
+
this._resolvedSource = ( (new ObservableLazyPromise(async () => {
|
|
72
80
|
const source = this.initialResources
|
|
73
|
-
? ( new ConstResolvedMultiDiffSource(this.initialResources))
|
|
81
|
+
? ( (new ConstResolvedMultiDiffSource(this.initialResources)))
|
|
74
82
|
: await this._multiDiffSourceResolverService.resolve(this.multiDiffSource);
|
|
75
83
|
return {
|
|
76
84
|
source,
|
|
77
85
|
resources: source ? observableFromEvent(source.onDidChange, () => source.resources) : constObservable([]),
|
|
78
86
|
};
|
|
79
|
-
}));
|
|
87
|
+
})));
|
|
80
88
|
this._resources = derived(this, reader => this._resolvedSource.cachedPromiseResult.read(reader)?.data?.resources.read(reader));
|
|
81
|
-
this._isDirtyObservables = mapObservableArrayCached(this, ( this._resources.map(r => r || [])), res => {
|
|
89
|
+
this._isDirtyObservables = mapObservableArrayCached(this, ( (this._resources.map(r => r || []))), res => {
|
|
82
90
|
const isModifiedDirty = res.modified ? isUriDirty(this._textFileService, res.modified) : constObservable(false);
|
|
83
91
|
const isOriginalDirty = res.original ? isUriDirty(this._textFileService, res.original) : constObservable(false);
|
|
84
92
|
return derived(reader => isModifiedDirty.read(reader) || isOriginalDirty.read(reader));
|
|
85
93
|
}, i => JSON.stringify([i.modified?.toString(), i.original?.toString()]));
|
|
86
|
-
this._isDirtyObservable = derived(this, reader => ( this._isDirtyObservables.read(reader).some(isDirty => isDirty.read(reader))))
|
|
94
|
+
this._isDirtyObservable = derived(this, reader => ( (this._isDirtyObservables.read(reader).some(isDirty => isDirty.read(reader)))))
|
|
87
95
|
.keepObserved(this._store);
|
|
88
96
|
this.onDidChangeDirty = Event.fromObservableLight(this._isDirtyObservable);
|
|
89
97
|
this.closeHandler = {
|
|
@@ -96,22 +104,15 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
|
|
|
96
104
|
};
|
|
97
105
|
this._register(autorun((reader) => {
|
|
98
106
|
const resources = this._resources.read(reader) ?? [];
|
|
99
|
-
const label = this.label ?? ( localizeWithPath(
|
|
100
|
-
|
|
101
|
-
'name',
|
|
102
|
-
"Multi Diff Editor"
|
|
103
|
-
));
|
|
104
|
-
this._name = label + ( localizeWithPath('vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput', {
|
|
105
|
-
key: 'files',
|
|
106
|
-
comment: ['the number of files being shown']
|
|
107
|
-
}, " ({0} files)", resources?.length ?? 0));
|
|
107
|
+
const label = this.label ?? ( localizeWithPath(_moduleId, 0, "Multi Diff Editor"));
|
|
108
|
+
this._name = label + ( localizeWithPath(_moduleId, 1, " ({0} files)", resources?.length ?? 0));
|
|
108
109
|
this._onDidChangeLabel.fire();
|
|
109
110
|
}));
|
|
110
111
|
}
|
|
111
112
|
serialize() {
|
|
112
113
|
return {
|
|
113
114
|
label: this.label,
|
|
114
|
-
multiDiffSourceUri: ( this.multiDiffSource.toString()),
|
|
115
|
+
multiDiffSourceUri: ( (this.multiDiffSource.toString())),
|
|
115
116
|
resources: this.initialResources?.map(resource => ({
|
|
116
117
|
originalUri: resource.original?.toString(),
|
|
117
118
|
modifiedUri: resource.modified?.toString(),
|
|
@@ -136,11 +137,11 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
|
|
|
136
137
|
async _createModel() {
|
|
137
138
|
const source = await this._resolvedSource.getPromise();
|
|
138
139
|
const textResourceConfigurationService = this._textResourceConfigurationService;
|
|
139
|
-
const garbage = ( new DisposableStore());
|
|
140
|
+
const garbage = ( (new DisposableStore()));
|
|
140
141
|
const documentsWithPromises = mapObservableArrayCached(undefined, source.resources, async (r, store) => {
|
|
141
142
|
let original;
|
|
142
143
|
let modified;
|
|
143
|
-
const store2 = ( new DisposableStore());
|
|
144
|
+
const store2 = ( (new DisposableStore()));
|
|
144
145
|
store.add(toDisposable(() => {
|
|
145
146
|
garbage.add(store2);
|
|
146
147
|
}));
|
|
@@ -162,24 +163,26 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
|
|
|
162
163
|
return undefined;
|
|
163
164
|
}
|
|
164
165
|
const uri = (r.modified ?? r.original);
|
|
165
|
-
return (
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
166
|
+
return (
|
|
167
|
+
(new ConstLazyPromise({
|
|
168
|
+
original: original?.object.textEditorModel,
|
|
169
|
+
modified: modified?.object.textEditorModel,
|
|
170
|
+
get options() {
|
|
171
|
+
return {
|
|
172
|
+
...getReadonlyConfiguration(modified?.object.isReadonly() ?? true),
|
|
173
|
+
...computeOptions(textResourceConfigurationService.getValue(uri)),
|
|
174
|
+
};
|
|
175
|
+
},
|
|
176
|
+
onOptionsDidChange: h => this._textResourceConfigurationService.onDidChangeConfiguration(e => {
|
|
177
|
+
if (e.affectsConfiguration(uri, 'editor') || e.affectsConfiguration(uri, 'diffEditor')) {
|
|
178
|
+
h();
|
|
179
|
+
}
|
|
180
|
+
}),
|
|
181
|
+
}))
|
|
182
|
+
);
|
|
180
183
|
}, i => JSON.stringify([i.modified?.toString(), i.original?.toString()]));
|
|
181
184
|
let documents = [];
|
|
182
|
-
const documentChangeEmitter = ( new Emitter());
|
|
185
|
+
const documentChangeEmitter = ( (new Emitter()));
|
|
183
186
|
const p = Event.toPromise(documentChangeEmitter.event);
|
|
184
187
|
const a = autorun(async (reader) => {
|
|
185
188
|
const docsPromises = documentsWithPromises.read(reader);
|
|
@@ -204,7 +207,7 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
|
|
|
204
207
|
return true;
|
|
205
208
|
}
|
|
206
209
|
if (otherInput instanceof MultiDiffEditorInput_1) {
|
|
207
|
-
return ( this.multiDiffSource.toString()) === ( otherInput.multiDiffSource.toString());
|
|
210
|
+
return ( (this.multiDiffSource.toString())) === ( (otherInput.multiDiffSource.toString()));
|
|
208
211
|
}
|
|
209
212
|
return false;
|
|
210
213
|
}
|
|
@@ -219,27 +222,27 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
|
|
|
219
222
|
async doSaveOrRevert(mode, group, options) {
|
|
220
223
|
const items = this._viewModel.currentValue?.items.get();
|
|
221
224
|
if (items) {
|
|
222
|
-
await Promise.all(( items.map(async (item) => {
|
|
225
|
+
await Promise.all(( (items.map(async (item) => {
|
|
223
226
|
const model = item.diffEditorViewModel.model;
|
|
224
227
|
const handleOriginal = model.original.uri.scheme !== Schemas.untitled && this._textFileService.isDirty(model.original.uri);
|
|
225
228
|
await Promise.all([
|
|
226
229
|
handleOriginal ? mode === 'save' ? this._textFileService.save(model.original.uri, options) : this._textFileService.revert(model.original.uri, options) : Promise.resolve(),
|
|
227
230
|
mode === 'save' ? this._textFileService.save(model.modified.uri, options) : this._textFileService.revert(model.modified.uri, options),
|
|
228
231
|
]);
|
|
229
|
-
})));
|
|
232
|
+
}))));
|
|
230
233
|
}
|
|
231
234
|
return undefined;
|
|
232
235
|
}
|
|
233
236
|
};
|
|
234
|
-
MultiDiffEditorInput = MultiDiffEditorInput_1 = ( __decorate([
|
|
235
|
-
( __param(4, ITextModelService)),
|
|
236
|
-
( __param(5, ITextResourceConfigurationService)),
|
|
237
|
-
( __param(6, IInstantiationService)),
|
|
238
|
-
( __param(7, IMultiDiffSourceResolverService)),
|
|
239
|
-
( __param(8, ITextFileService))
|
|
240
|
-
], MultiDiffEditorInput));
|
|
237
|
+
MultiDiffEditorInput = MultiDiffEditorInput_1 = ( (__decorate([
|
|
238
|
+
( (__param(4, ITextModelService))),
|
|
239
|
+
( (__param(5, ITextResourceConfigurationService))),
|
|
240
|
+
( (__param(6, IInstantiationService))),
|
|
241
|
+
( (__param(7, IMultiDiffSourceResolverService))),
|
|
242
|
+
( (__param(8, ITextFileService)))
|
|
243
|
+
], MultiDiffEditorInput)));
|
|
241
244
|
function isUriDirty(textFileService, uri) {
|
|
242
|
-
return observableFromEvent(Event.filter(textFileService.files.onDidChangeDirty, e => ( e.resource.toString()) === ( uri.toString())), () => textFileService.isDirty(uri));
|
|
245
|
+
return observableFromEvent(Event.filter(textFileService.files.onDidChangeDirty, e => ( (e.resource.toString())) === ( (uri.toString()))), () => textFileService.isDirty(uri));
|
|
243
246
|
}
|
|
244
247
|
function getReadonlyConfiguration(isReadonly) {
|
|
245
248
|
return {
|
|
@@ -277,10 +280,10 @@ let MultiDiffEditorResolverContribution = class MultiDiffEditorResolverContribut
|
|
|
277
280
|
}));
|
|
278
281
|
}
|
|
279
282
|
};
|
|
280
|
-
MultiDiffEditorResolverContribution = ( __decorate([
|
|
281
|
-
( __param(0, IEditorResolverService)),
|
|
282
|
-
( __param(1, IInstantiationService))
|
|
283
|
-
], MultiDiffEditorResolverContribution));
|
|
283
|
+
MultiDiffEditorResolverContribution = ( (__decorate([
|
|
284
|
+
( (__param(0, IEditorResolverService))),
|
|
285
|
+
( (__param(1, IInstantiationService)))
|
|
286
|
+
], MultiDiffEditorResolverContribution)));
|
|
284
287
|
class MultiDiffEditorSerializer {
|
|
285
288
|
canSerialize(editor) {
|
|
286
289
|
return editor instanceof MultiDiffEditorInput && !editor.isTransient;
|
package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js
CHANGED
|
@@ -12,7 +12,7 @@ class MultiDiffEditorItem {
|
|
|
12
12
|
this.original = original;
|
|
13
13
|
this.modified = modified;
|
|
14
14
|
if (!original && !modified) {
|
|
15
|
-
throw new BugIndicatingError('Invalid arguments');
|
|
15
|
+
throw ( new BugIndicatingError('Invalid arguments'));
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -22,7 +22,7 @@ class MultiDiffSourceResolverService {
|
|
|
22
22
|
}
|
|
23
23
|
registerResolver(resolver) {
|
|
24
24
|
if (( this._resolvers.has(resolver))) {
|
|
25
|
-
throw new BugIndicatingError('Duplicate resolver');
|
|
25
|
+
throw ( new BugIndicatingError('Duplicate resolver'));
|
|
26
26
|
}
|
|
27
27
|
this._resolvers.add(resolver);
|
|
28
28
|
return toDisposable(() => this._resolvers.delete(resolver));
|