@codingame/monaco-vscode-api 4.5.0 → 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/editor.api.d.ts +8 -0
- package/extensions.js +10 -2
- package/localExtensionHost.d.ts +41 -0
- package/package.json +10 -8
- package/service-override/accessibility.d.ts +5 -0
- package/service-override/ai.d.ts +5 -0
- package/service-override/authentication.d.ts +5 -0
- package/service-override/base.d.ts +5 -0
- package/service-override/bulkEdit.d.ts +5 -0
- package/service-override/chat.d.ts +5 -0
- package/service-override/comments.d.ts +5 -0
- package/service-override/configuration.d.ts +31 -0
- package/service-override/debug.d.ts +5 -0
- package/service-override/dialogs.d.ts +12 -0
- package/service-override/editSessions.d.ts +5 -0
- package/service-override/editor.d.ts +10 -0
- package/service-override/emmet.d.ts +5 -0
- package/service-override/environment.d.ts +10 -0
- package/service-override/explorer.d.ts +5 -0
- package/service-override/extensionGallery.d.ts +12 -0
- package/service-override/extensions.d.ts +43 -0
- package/service-override/files.d.ts +164 -0
- package/service-override/host.d.ts +5 -0
- package/service-override/interactive.d.ts +5 -0
- package/service-override/issue.d.ts +5 -0
- package/service-override/keybindings.d.ts +21 -0
- package/service-override/languageDetectionWorker.d.ts +5 -0
- package/service-override/languages.d.ts +6 -0
- package/service-override/layout.d.ts +128 -0
- package/service-override/lifecycle.d.ts +5 -0
- package/service-override/localization.d.ts +14 -0
- package/service-override/log.d.ts +14 -0
- package/service-override/markers.d.ts +5 -0
- package/service-override/model.d.ts +5 -0
- package/service-override/monarch.d.ts +5 -0
- package/service-override/multiDiffEditor.d.ts +5 -0
- package/service-override/notebook.d.ts +5 -0
- package/service-override/notifications.d.ts +5 -0
- package/service-override/outline.d.ts +5 -0
- package/service-override/output.d.ts +10 -0
- package/service-override/performance.d.ts +5 -0
- package/service-override/preferences.d.ts +5 -0
- package/service-override/quickaccess.d.ts +11 -0
- package/service-override/relauncher.d.ts +5 -0
- package/service-override/remoteAgent.d.ts +12 -0
- package/service-override/scm.d.ts +5 -0
- package/service-override/search.d.ts +12 -0
- package/service-override/secretStorage.d.ts +5 -0
- package/service-override/share.d.ts +5 -0
- package/service-override/snippets.d.ts +9 -0
- package/service-override/speech.d.ts +5 -0
- package/service-override/storage.d.ts +66 -0
- package/service-override/survey.d.ts +5 -0
- package/service-override/task.d.ts +5 -0
- package/service-override/terminal.d.ts +71 -0
- package/service-override/testing.d.ts +5 -0
- package/service-override/textmate.d.ts +6 -0
- package/service-override/theme.d.ts +7 -0
- package/service-override/timeline.d.ts +5 -0
- package/service-override/update.d.ts +5 -0
- package/service-override/userDataSync.d.ts +5 -0
- package/service-override/viewBanner.d.ts +6 -0
- package/service-override/viewCommon.d.ts +6 -0
- package/service-override/viewStatusBar.d.ts +6 -0
- package/service-override/viewTitleBar.d.ts +5 -0
- package/service-override/views.d.ts +47 -0
- package/service-override/walkthrough.d.ts +5 -0
- package/service-override/welcome.d.ts +5 -0
- package/service-override/workbench.d.ts +18 -0
- package/service-override/workingCopy.d.ts +5 -0
- package/service-override/workspaceTrust.d.ts +5 -0
- 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.d.ts +17 -0
- 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.d.ts +62 -0
- 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.d.ts +73 -0
- 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.d.ts +43 -0
- package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +23 -16
- package/vscode/src/vs/platform/files/browser/indexedDBFileSystemProvider.d.ts +48 -0
- package/vscode/src/vs/platform/files/common/files.js +41 -58
- package/vscode/src/vs/platform/files/common/inMemoryFilesystemProvider.d.ts +59 -0
- 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/remote/common/remoteExtensionsScanner.service.d.ts +13 -0
- 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/dnd.d.ts +14 -0
- 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/activitybar/activitybarPart.d.ts +61 -0
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +23 -56
- package/vscode/src/vs/workbench/browser/parts/banner/bannerPart.d.ts +46 -0
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.d.ts +21 -0
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +72 -115
- package/vscode/src/vs/workbench/browser/parts/compositePart.d.ts +89 -0
- 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/paneCompositeBar.d.ts +108 -0
- package/vscode/src/vs/workbench/browser/parts/paneCompositePart.d.ts +138 -0
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +58 -196
- package/vscode/src/vs/workbench/browser/parts/panel/panelPart.d.ts +35 -0
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.d.ts +48 -0
- 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/browser/workbench.d.ts +10 -0
- 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/terminal.d.ts +795 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.service.d.ts +149 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.d.ts +48 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +19 -26
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalStatusList.d.ts +25 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.d.ts +8 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.d.ts +168 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts +55 -0
- package/vscode/src/vs/workbench/contrib/terminal/common/environmentVariable.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.d.ts +238 -0
- 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/activity/browser/activityService.d.ts +28 -0
- 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.d.ts +53 -0
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.js +3 -6
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.service.d.ts +106 -0
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +40 -57
- package/vscode/src/vs/workbench/services/extensions/browser/extensionService.d.ts +45 -0
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.d.ts +11 -0
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts +162 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.d.ts +18 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.js +1 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManagers.d.ts +39 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostProxy.d.ts +17 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.service.d.ts +20 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.d.ts +45 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensions.js +6 -2
- package/vscode/src/vs/workbench/services/extensions/common/extensionsProposedApi.d.ts +17 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +176 -223
- package/vscode/src/vs/workbench/services/extensions/common/rpcProtocol.d.ts +6 -0
- 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.d.ts +50 -0
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +30 -42
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.service.d.ts +40 -0
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.d.ts +185 -0
- 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/storage/browser/storageService.d.ts +41 -0
- package/vscode/src/vs/workbench/services/textMate/browser/textMateTokenizationFeature.service.d.ts +11 -0
- 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/userData/browser/userDataInit.d.ts +11 -0
- package/vscode/src/vs/workbench/services/userData/browser/userDataInit.service.d.ts +9 -0
- 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
|
@@ -9,6 +9,7 @@ import { registerSingleton } from '../../instantiation/common/extensions.js';
|
|
|
9
9
|
import { INotificationService } from '../../notification/common/notification.service.js';
|
|
10
10
|
import { ResourceEditStackSnapshot, UndoRedoGroup, UndoRedoSource } from './undoRedo.js';
|
|
11
11
|
import { IUndoRedoService } from './undoRedo.service.js';
|
|
12
|
+
const _moduleId = "vs/platform/undoRedo/common/undoRedoService";
|
|
12
13
|
function getResourceLabel(resource) {
|
|
13
14
|
return resource.scheme === Schemas.file ? resource.fsPath : resource.path;
|
|
14
15
|
}
|
|
@@ -45,7 +46,7 @@ class ResourceReasonPair {
|
|
|
45
46
|
}
|
|
46
47
|
class RemovedResources {
|
|
47
48
|
constructor() {
|
|
48
|
-
this.elements = ( new Map());
|
|
49
|
+
this.elements = ( (new Map()));
|
|
49
50
|
}
|
|
50
51
|
createMessage() {
|
|
51
52
|
const externalRemoval = [];
|
|
@@ -59,16 +60,16 @@ class RemovedResources {
|
|
|
59
60
|
const messages = [];
|
|
60
61
|
if (externalRemoval.length > 0) {
|
|
61
62
|
messages.push(( localizeWithPath(
|
|
62
|
-
|
|
63
|
-
|
|
63
|
+
_moduleId,
|
|
64
|
+
0,
|
|
64
65
|
"The following files have been closed and modified on disk: {0}.",
|
|
65
66
|
externalRemoval.join(', ')
|
|
66
67
|
)));
|
|
67
68
|
}
|
|
68
69
|
if (noParallelUniverses.length > 0) {
|
|
69
70
|
messages.push(( localizeWithPath(
|
|
70
|
-
|
|
71
|
-
|
|
71
|
+
_moduleId,
|
|
72
|
+
1,
|
|
72
73
|
"The following files have been modified in an incompatible way: {0}.",
|
|
73
74
|
noParallelUniverses.join(', ')
|
|
74
75
|
)));
|
|
@@ -79,7 +80,9 @@ class RemovedResources {
|
|
|
79
80
|
return this.elements.size;
|
|
80
81
|
}
|
|
81
82
|
has(strResource) {
|
|
82
|
-
return (
|
|
83
|
+
return (
|
|
84
|
+
(this.elements.has(strResource))
|
|
85
|
+
);
|
|
83
86
|
}
|
|
84
87
|
set(strResource, value) {
|
|
85
88
|
this.elements.set(strResource, value);
|
|
@@ -109,10 +112,10 @@ class WorkspaceStackElement {
|
|
|
109
112
|
}
|
|
110
113
|
removeResource(resourceLabel, strResource, reason) {
|
|
111
114
|
if (!this.removedResources) {
|
|
112
|
-
this.removedResources = ( new RemovedResources());
|
|
115
|
+
this.removedResources = ( (new RemovedResources()));
|
|
113
116
|
}
|
|
114
|
-
if (!( this.removedResources.has(strResource))) {
|
|
115
|
-
this.removedResources.set(strResource, ( new ResourceReasonPair(resourceLabel, reason)));
|
|
117
|
+
if (!( (this.removedResources.has(strResource)))) {
|
|
118
|
+
this.removedResources.set(strResource, ( (new ResourceReasonPair(resourceLabel, reason))));
|
|
116
119
|
}
|
|
117
120
|
}
|
|
118
121
|
setValid(resourceLabel, strResource, isValid) {
|
|
@@ -126,10 +129,10 @@ class WorkspaceStackElement {
|
|
|
126
129
|
}
|
|
127
130
|
else {
|
|
128
131
|
if (!this.invalidatedResources) {
|
|
129
|
-
this.invalidatedResources = ( new RemovedResources());
|
|
132
|
+
this.invalidatedResources = ( (new RemovedResources()));
|
|
130
133
|
}
|
|
131
|
-
if (!( this.invalidatedResources.has(strResource))) {
|
|
132
|
-
this.invalidatedResources.set(strResource, ( new ResourceReasonPair(resourceLabel, 0 )));
|
|
134
|
+
if (!( (this.invalidatedResources.has(strResource)))) {
|
|
135
|
+
this.invalidatedResources.set(strResource, ( (new ResourceReasonPair(resourceLabel, 0 ))));
|
|
133
136
|
}
|
|
134
137
|
}
|
|
135
138
|
}
|
|
@@ -231,7 +234,9 @@ class ResourceEditStack {
|
|
|
231
234
|
for (let i = this._future.length - 1; i >= 0; i--) {
|
|
232
235
|
elements.push(this._future[i].id);
|
|
233
236
|
}
|
|
234
|
-
return (
|
|
237
|
+
return (
|
|
238
|
+
(new ResourceEditStackSnapshot(resource, elements))
|
|
239
|
+
);
|
|
235
240
|
}
|
|
236
241
|
restoreSnapshot(snapshot) {
|
|
237
242
|
const snapshotLength = snapshot.elements.length;
|
|
@@ -305,7 +310,7 @@ class ResourceEditStack {
|
|
|
305
310
|
splitPastWorkspaceElement(toRemove, individualMap) {
|
|
306
311
|
for (let j = this._past.length - 1; j >= 0; j--) {
|
|
307
312
|
if (this._past[j] === toRemove) {
|
|
308
|
-
if (( individualMap.has(this.strResource))) {
|
|
313
|
+
if (( (individualMap.has(this.strResource)))) {
|
|
309
314
|
this._past[j] = individualMap.get(this.strResource);
|
|
310
315
|
}
|
|
311
316
|
else {
|
|
@@ -319,7 +324,7 @@ class ResourceEditStack {
|
|
|
319
324
|
splitFutureWorkspaceElement(toRemove, individualMap) {
|
|
320
325
|
for (let j = this._future.length - 1; j >= 0; j--) {
|
|
321
326
|
if (this._future[j] === toRemove) {
|
|
322
|
-
if (( individualMap.has(this.strResource))) {
|
|
327
|
+
if (( (individualMap.has(this.strResource)))) {
|
|
323
328
|
this._future[j] = individualMap.get(this.strResource);
|
|
324
329
|
}
|
|
325
330
|
else {
|
|
@@ -358,13 +363,13 @@ class EditStackSnapshot {
|
|
|
358
363
|
return true;
|
|
359
364
|
}
|
|
360
365
|
}
|
|
361
|
-
const missingEditStack = ( new ResourceEditStack('', ''));
|
|
366
|
+
const missingEditStack = ( (new ResourceEditStack('', '')));
|
|
362
367
|
missingEditStack.locked = true;
|
|
363
368
|
let UndoRedoService = class UndoRedoService {
|
|
364
369
|
constructor(_dialogService, _notificationService) {
|
|
365
370
|
this._dialogService = _dialogService;
|
|
366
371
|
this._notificationService = _notificationService;
|
|
367
|
-
this._editStacks = ( new Map());
|
|
372
|
+
this._editStacks = ( (new Map()));
|
|
368
373
|
this._uriComparisonKeyComputers = [];
|
|
369
374
|
}
|
|
370
375
|
registerUriComparisonKeyComputer(scheme, uriComparisonKeyComputer) {
|
|
@@ -386,14 +391,16 @@ let UndoRedoService = class UndoRedoService {
|
|
|
386
391
|
return uriComparisonKeyComputer[1].getComparisonKey(resource);
|
|
387
392
|
}
|
|
388
393
|
}
|
|
389
|
-
return (
|
|
394
|
+
return (
|
|
395
|
+
(resource.toString())
|
|
396
|
+
);
|
|
390
397
|
}
|
|
391
398
|
_print(label) {
|
|
392
399
|
console.log(`------------------------------------`);
|
|
393
400
|
console.log(`AFTER ${label}: `);
|
|
394
401
|
const str = [];
|
|
395
402
|
for (const element of this._editStacks) {
|
|
396
|
-
str.push(( element[1].toString()));
|
|
403
|
+
str.push(( (element[1].toString())));
|
|
397
404
|
}
|
|
398
405
|
console.log(str.join('\n'));
|
|
399
406
|
}
|
|
@@ -401,7 +408,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
401
408
|
if (element.type === 0 ) {
|
|
402
409
|
const resourceLabel = getResourceLabel(element.resource);
|
|
403
410
|
const strResource = this.getUriComparisonKey(element.resource);
|
|
404
|
-
this._pushElement(( new ResourceStackElement(
|
|
411
|
+
this._pushElement(( (new ResourceStackElement(
|
|
405
412
|
element,
|
|
406
413
|
resourceLabel,
|
|
407
414
|
strResource,
|
|
@@ -409,16 +416,16 @@ let UndoRedoService = class UndoRedoService {
|
|
|
409
416
|
group.nextOrder(),
|
|
410
417
|
source.id,
|
|
411
418
|
source.nextOrder()
|
|
412
|
-
)));
|
|
419
|
+
))));
|
|
413
420
|
}
|
|
414
421
|
else {
|
|
415
|
-
const seen = ( new Set());
|
|
422
|
+
const seen = ( (new Set()));
|
|
416
423
|
const resourceLabels = [];
|
|
417
424
|
const strResources = [];
|
|
418
425
|
for (const resource of element.resources) {
|
|
419
426
|
const resourceLabel = getResourceLabel(resource);
|
|
420
427
|
const strResource = this.getUriComparisonKey(resource);
|
|
421
|
-
if (( seen.has(strResource))) {
|
|
428
|
+
if (( (seen.has(strResource)))) {
|
|
422
429
|
continue;
|
|
423
430
|
}
|
|
424
431
|
seen.add(strResource);
|
|
@@ -426,7 +433,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
426
433
|
strResources.push(strResource);
|
|
427
434
|
}
|
|
428
435
|
if (resourceLabels.length === 1) {
|
|
429
|
-
this._pushElement(( new ResourceStackElement(
|
|
436
|
+
this._pushElement(( (new ResourceStackElement(
|
|
430
437
|
element,
|
|
431
438
|
resourceLabels[0],
|
|
432
439
|
strResources[0],
|
|
@@ -434,10 +441,10 @@ let UndoRedoService = class UndoRedoService {
|
|
|
434
441
|
group.nextOrder(),
|
|
435
442
|
source.id,
|
|
436
443
|
source.nextOrder()
|
|
437
|
-
)));
|
|
444
|
+
))));
|
|
438
445
|
}
|
|
439
446
|
else {
|
|
440
|
-
this._pushElement(( new WorkspaceStackElement(
|
|
447
|
+
this._pushElement(( (new WorkspaceStackElement(
|
|
441
448
|
element,
|
|
442
449
|
resourceLabels,
|
|
443
450
|
strResources,
|
|
@@ -445,7 +452,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
445
452
|
group.nextOrder(),
|
|
446
453
|
source.id,
|
|
447
454
|
source.nextOrder()
|
|
448
|
-
)));
|
|
455
|
+
))));
|
|
449
456
|
}
|
|
450
457
|
}
|
|
451
458
|
}
|
|
@@ -454,11 +461,11 @@ let UndoRedoService = class UndoRedoService {
|
|
|
454
461
|
const resourceLabel = element.resourceLabels[i];
|
|
455
462
|
const strResource = element.strResources[i];
|
|
456
463
|
let editStack;
|
|
457
|
-
if (( this._editStacks.has(strResource))) {
|
|
464
|
+
if (( (this._editStacks.has(strResource)))) {
|
|
458
465
|
editStack = this._editStacks.get(strResource);
|
|
459
466
|
}
|
|
460
467
|
else {
|
|
461
|
-
editStack = ( new ResourceEditStack(resourceLabel, strResource));
|
|
468
|
+
editStack = ( (new ResourceEditStack(resourceLabel, strResource)));
|
|
462
469
|
this._editStacks.set(strResource, editStack);
|
|
463
470
|
}
|
|
464
471
|
editStack.pushElement(element);
|
|
@@ -466,7 +473,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
466
473
|
}
|
|
467
474
|
getLastElement(resource) {
|
|
468
475
|
const strResource = this.getUriComparisonKey(resource);
|
|
469
|
-
if (( this._editStacks.has(strResource))) {
|
|
476
|
+
if (( (this._editStacks.has(strResource)))) {
|
|
470
477
|
const editStack = this._editStacks.get(strResource);
|
|
471
478
|
if (editStack.hasFutureElements()) {
|
|
472
479
|
return null;
|
|
@@ -478,15 +485,15 @@ let UndoRedoService = class UndoRedoService {
|
|
|
478
485
|
}
|
|
479
486
|
_splitPastWorkspaceElement(toRemove, ignoreResources) {
|
|
480
487
|
const individualArr = toRemove.actual.split();
|
|
481
|
-
const individualMap = ( new Map());
|
|
488
|
+
const individualMap = ( (new Map()));
|
|
482
489
|
for (const _element of individualArr) {
|
|
483
490
|
const resourceLabel = getResourceLabel(_element.resource);
|
|
484
491
|
const strResource = this.getUriComparisonKey(_element.resource);
|
|
485
|
-
const element = ( new ResourceStackElement(_element, resourceLabel, strResource, 0, 0, 0, 0));
|
|
492
|
+
const element = ( (new ResourceStackElement(_element, resourceLabel, strResource, 0, 0, 0, 0)));
|
|
486
493
|
individualMap.set(element.strResource, element);
|
|
487
494
|
}
|
|
488
495
|
for (const strResource of toRemove.strResources) {
|
|
489
|
-
if (ignoreResources && ( ignoreResources.has(strResource))) {
|
|
496
|
+
if (ignoreResources && ( (ignoreResources.has(strResource)))) {
|
|
490
497
|
continue;
|
|
491
498
|
}
|
|
492
499
|
const editStack = this._editStacks.get(strResource);
|
|
@@ -495,15 +502,15 @@ let UndoRedoService = class UndoRedoService {
|
|
|
495
502
|
}
|
|
496
503
|
_splitFutureWorkspaceElement(toRemove, ignoreResources) {
|
|
497
504
|
const individualArr = toRemove.actual.split();
|
|
498
|
-
const individualMap = ( new Map());
|
|
505
|
+
const individualMap = ( (new Map()));
|
|
499
506
|
for (const _element of individualArr) {
|
|
500
507
|
const resourceLabel = getResourceLabel(_element.resource);
|
|
501
508
|
const strResource = this.getUriComparisonKey(_element.resource);
|
|
502
|
-
const element = ( new ResourceStackElement(_element, resourceLabel, strResource, 0, 0, 0, 0));
|
|
509
|
+
const element = ( (new ResourceStackElement(_element, resourceLabel, strResource, 0, 0, 0, 0)));
|
|
503
510
|
individualMap.set(element.strResource, element);
|
|
504
511
|
}
|
|
505
512
|
for (const strResource of toRemove.strResources) {
|
|
506
|
-
if (ignoreResources && ( ignoreResources.has(strResource))) {
|
|
513
|
+
if (ignoreResources && ( (ignoreResources.has(strResource)))) {
|
|
507
514
|
continue;
|
|
508
515
|
}
|
|
509
516
|
const editStack = this._editStacks.get(strResource);
|
|
@@ -512,7 +519,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
512
519
|
}
|
|
513
520
|
removeElements(resource) {
|
|
514
521
|
const strResource = typeof resource === 'string' ? resource : this.getUriComparisonKey(resource);
|
|
515
|
-
if (( this._editStacks.has(strResource))) {
|
|
522
|
+
if (( (this._editStacks.has(strResource)))) {
|
|
516
523
|
const editStack = this._editStacks.get(strResource);
|
|
517
524
|
editStack.dispose();
|
|
518
525
|
this._editStacks.delete(strResource);
|
|
@@ -520,14 +527,14 @@ let UndoRedoService = class UndoRedoService {
|
|
|
520
527
|
}
|
|
521
528
|
setElementsValidFlag(resource, isValid, filter) {
|
|
522
529
|
const strResource = this.getUriComparisonKey(resource);
|
|
523
|
-
if (( this._editStacks.has(strResource))) {
|
|
530
|
+
if (( (this._editStacks.has(strResource)))) {
|
|
524
531
|
const editStack = this._editStacks.get(strResource);
|
|
525
532
|
editStack.setElementsValidFlag(isValid, filter);
|
|
526
533
|
}
|
|
527
534
|
}
|
|
528
535
|
hasElements(resource) {
|
|
529
536
|
const strResource = this.getUriComparisonKey(resource);
|
|
530
|
-
if (( this._editStacks.has(strResource))) {
|
|
537
|
+
if (( (this._editStacks.has(strResource)))) {
|
|
531
538
|
const editStack = this._editStacks.get(strResource);
|
|
532
539
|
return (editStack.hasPastElements() || editStack.hasFutureElements());
|
|
533
540
|
}
|
|
@@ -535,15 +542,17 @@ let UndoRedoService = class UndoRedoService {
|
|
|
535
542
|
}
|
|
536
543
|
createSnapshot(resource) {
|
|
537
544
|
const strResource = this.getUriComparisonKey(resource);
|
|
538
|
-
if (( this._editStacks.has(strResource))) {
|
|
545
|
+
if (( (this._editStacks.has(strResource)))) {
|
|
539
546
|
const editStack = this._editStacks.get(strResource);
|
|
540
547
|
return editStack.createSnapshot(resource);
|
|
541
548
|
}
|
|
542
|
-
return (
|
|
549
|
+
return (
|
|
550
|
+
(new ResourceEditStackSnapshot(resource, []))
|
|
551
|
+
);
|
|
543
552
|
}
|
|
544
553
|
restoreSnapshot(snapshot) {
|
|
545
554
|
const strResource = this.getUriComparisonKey(snapshot.resource);
|
|
546
|
-
if (( this._editStacks.has(strResource))) {
|
|
555
|
+
if (( (this._editStacks.has(strResource)))) {
|
|
547
556
|
const editStack = this._editStacks.get(strResource);
|
|
548
557
|
editStack.restoreSnapshot(snapshot);
|
|
549
558
|
if (!editStack.hasPastElements() && !editStack.hasFutureElements()) {
|
|
@@ -554,7 +563,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
554
563
|
}
|
|
555
564
|
getElements(resource) {
|
|
556
565
|
const strResource = this.getUriComparisonKey(resource);
|
|
557
|
-
if (( this._editStacks.has(strResource))) {
|
|
566
|
+
if (( (this._editStacks.has(strResource)))) {
|
|
558
567
|
const editStack = this._editStacks.get(strResource);
|
|
559
568
|
return editStack.getElements();
|
|
560
569
|
}
|
|
@@ -586,7 +595,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
586
595
|
return matchedStrResource ? true : false;
|
|
587
596
|
}
|
|
588
597
|
const strResource = this.getUriComparisonKey(resourceOrSource);
|
|
589
|
-
if (( this._editStacks.has(strResource))) {
|
|
598
|
+
if (( (this._editStacks.has(strResource)))) {
|
|
590
599
|
const editStack = this._editStacks.get(strResource);
|
|
591
600
|
return editStack.hasPastElements();
|
|
592
601
|
}
|
|
@@ -602,7 +611,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
602
611
|
_acquireLocks(editStackSnapshot) {
|
|
603
612
|
for (const editStack of editStackSnapshot.editStacks) {
|
|
604
613
|
if (editStack.locked) {
|
|
605
|
-
throw new Error('Cannot acquire edit stack lock');
|
|
614
|
+
throw ( (new Error('Cannot acquire edit stack lock')));
|
|
606
615
|
}
|
|
607
616
|
}
|
|
608
617
|
for (const editStack of editStackSnapshot.editStacks) {
|
|
@@ -672,27 +681,33 @@ let UndoRedoService = class UndoRedoService {
|
|
|
672
681
|
for (const strResource of element.strResources) {
|
|
673
682
|
affectedEditStacks.push(this._editStacks.get(strResource) || missingEditStack);
|
|
674
683
|
}
|
|
675
|
-
return (
|
|
684
|
+
return (
|
|
685
|
+
(new EditStackSnapshot(affectedEditStacks))
|
|
686
|
+
);
|
|
676
687
|
}
|
|
677
688
|
_tryToSplitAndUndo(strResource, element, ignoreResources, message) {
|
|
678
689
|
if (element.canSplit()) {
|
|
679
690
|
this._splitPastWorkspaceElement(element, ignoreResources);
|
|
680
691
|
this._notificationService.warn(message);
|
|
681
|
-
return (
|
|
692
|
+
return (
|
|
693
|
+
(new WorkspaceVerificationError(this._undo(strResource, 0, true)))
|
|
694
|
+
);
|
|
682
695
|
}
|
|
683
696
|
else {
|
|
684
697
|
for (const strResource of element.strResources) {
|
|
685
698
|
this.removeElements(strResource);
|
|
686
699
|
}
|
|
687
700
|
this._notificationService.warn(message);
|
|
688
|
-
return (
|
|
701
|
+
return (
|
|
702
|
+
(new WorkspaceVerificationError())
|
|
703
|
+
);
|
|
689
704
|
}
|
|
690
705
|
}
|
|
691
706
|
_checkWorkspaceUndo(strResource, element, editStackSnapshot, checkInvalidatedResources) {
|
|
692
707
|
if (element.removedResources) {
|
|
693
708
|
return this._tryToSplitAndUndo(strResource, element, element.removedResources, ( localizeWithPath(
|
|
694
|
-
|
|
695
|
-
|
|
709
|
+
_moduleId,
|
|
710
|
+
2,
|
|
696
711
|
"Could not undo '{0}' across all files. {1}",
|
|
697
712
|
element.label,
|
|
698
713
|
element.removedResources.createMessage()
|
|
@@ -700,8 +715,8 @@ let UndoRedoService = class UndoRedoService {
|
|
|
700
715
|
}
|
|
701
716
|
if (checkInvalidatedResources && element.invalidatedResources) {
|
|
702
717
|
return this._tryToSplitAndUndo(strResource, element, element.invalidatedResources, ( localizeWithPath(
|
|
703
|
-
|
|
704
|
-
|
|
718
|
+
_moduleId,
|
|
719
|
+
2,
|
|
705
720
|
"Could not undo '{0}' across all files. {1}",
|
|
706
721
|
element.label,
|
|
707
722
|
element.invalidatedResources.createMessage()
|
|
@@ -715,8 +730,8 @@ let UndoRedoService = class UndoRedoService {
|
|
|
715
730
|
}
|
|
716
731
|
if (cannotUndoDueToResources.length > 0) {
|
|
717
732
|
return this._tryToSplitAndUndo(strResource, element, null, ( localizeWithPath(
|
|
718
|
-
|
|
719
|
-
|
|
733
|
+
_moduleId,
|
|
734
|
+
3,
|
|
720
735
|
"Could not undo '{0}' across all files because changes were made to {1}",
|
|
721
736
|
element.label,
|
|
722
737
|
cannotUndoDueToResources.join(', ')
|
|
@@ -730,8 +745,8 @@ let UndoRedoService = class UndoRedoService {
|
|
|
730
745
|
}
|
|
731
746
|
if (cannotLockDueToResources.length > 0) {
|
|
732
747
|
return this._tryToSplitAndUndo(strResource, element, null, ( localizeWithPath(
|
|
733
|
-
|
|
734
|
-
|
|
748
|
+
_moduleId,
|
|
749
|
+
4,
|
|
735
750
|
"Could not undo '{0}' across all files because there is already an undo or redo operation running on {1}",
|
|
736
751
|
element.label,
|
|
737
752
|
cannotLockDueToResources.join(', ')
|
|
@@ -739,8 +754,8 @@ let UndoRedoService = class UndoRedoService {
|
|
|
739
754
|
}
|
|
740
755
|
if (!editStackSnapshot.isValid()) {
|
|
741
756
|
return this._tryToSplitAndUndo(strResource, element, null, ( localizeWithPath(
|
|
742
|
-
|
|
743
|
-
|
|
757
|
+
_moduleId,
|
|
758
|
+
5,
|
|
744
759
|
"Could not undo '{0}' across all files because an undo or redo operation occurred in the meantime",
|
|
745
760
|
element.label
|
|
746
761
|
)));
|
|
@@ -779,35 +794,26 @@ let UndoRedoService = class UndoRedoService {
|
|
|
779
794
|
async _confirmAndExecuteWorkspaceUndo(strResource, element, editStackSnapshot, undoConfirmed) {
|
|
780
795
|
if (element.canSplit() && !this._isPartOfUndoGroup(element)) {
|
|
781
796
|
let UndoChoice;
|
|
782
|
-
( (function(UndoChoice) {
|
|
797
|
+
( ((function(UndoChoice) {
|
|
783
798
|
UndoChoice[UndoChoice["All"] = 0] = "All";
|
|
784
799
|
UndoChoice[UndoChoice["This"] = 1] = "This";
|
|
785
800
|
UndoChoice[UndoChoice["Cancel"] = 2] = "Cancel";
|
|
786
|
-
})(UndoChoice || (UndoChoice = {})));
|
|
801
|
+
})(UndoChoice || (UndoChoice = {}))));
|
|
787
802
|
const { result } = await this._dialogService.prompt({
|
|
788
803
|
type: Severity$1.Info,
|
|
789
804
|
message: ( localizeWithPath(
|
|
790
|
-
|
|
791
|
-
|
|
805
|
+
_moduleId,
|
|
806
|
+
6,
|
|
792
807
|
"Would you like to undo '{0}' across all files?",
|
|
793
808
|
element.label
|
|
794
809
|
)),
|
|
795
810
|
buttons: [
|
|
796
811
|
{
|
|
797
|
-
label: ( localizeWithPath(
|
|
798
|
-
'vs/platform/undoRedo/common/undoRedoService',
|
|
799
|
-
{ key: 'ok', comment: ['{0} denotes a number that is > 1, && denotes a mnemonic'] },
|
|
800
|
-
"&&Undo in {0} Files",
|
|
801
|
-
editStackSnapshot.editStacks.length
|
|
802
|
-
)),
|
|
812
|
+
label: ( localizeWithPath(_moduleId, 7, "&&Undo in {0} Files", editStackSnapshot.editStacks.length)),
|
|
803
813
|
run: () => UndoChoice.All
|
|
804
814
|
},
|
|
805
815
|
{
|
|
806
|
-
label: ( localizeWithPath(
|
|
807
|
-
'vs/platform/undoRedo/common/undoRedoService',
|
|
808
|
-
{ key: 'nok', comment: ['&& denotes a mnemonic'] },
|
|
809
|
-
"Undo this &&File"
|
|
810
|
-
)),
|
|
816
|
+
label: ( localizeWithPath(_moduleId, 8, "Undo this &&File")),
|
|
811
817
|
run: () => UndoChoice.This
|
|
812
818
|
}
|
|
813
819
|
],
|
|
@@ -852,8 +858,8 @@ let UndoRedoService = class UndoRedoService {
|
|
|
852
858
|
}
|
|
853
859
|
if (editStack.locked) {
|
|
854
860
|
const message = ( localizeWithPath(
|
|
855
|
-
|
|
856
|
-
|
|
861
|
+
_moduleId,
|
|
862
|
+
9,
|
|
857
863
|
"Could not undo '{0}' because there is already an undo or redo operation running.",
|
|
858
864
|
element.label
|
|
859
865
|
));
|
|
@@ -862,7 +868,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
862
868
|
}
|
|
863
869
|
return this._invokeResourcePrepare(element, (cleanup) => {
|
|
864
870
|
editStack.moveBackward(element);
|
|
865
|
-
return this._safeInvokeWithLocks(element, () => element.actual.undo(), ( new EditStackSnapshot([editStack])), cleanup, () => this._continueUndoInGroup(element.groupId, undoConfirmed));
|
|
871
|
+
return this._safeInvokeWithLocks(element, () => element.actual.undo(), ( (new EditStackSnapshot([editStack]))), cleanup, () => this._continueUndoInGroup(element.groupId, undoConfirmed));
|
|
866
872
|
});
|
|
867
873
|
}
|
|
868
874
|
_findClosestUndoElementInGroup(groupId) {
|
|
@@ -905,7 +911,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
905
911
|
return this._undo(this.getUriComparisonKey(resourceOrSource), 0, false);
|
|
906
912
|
}
|
|
907
913
|
_undo(strResource, sourceId = 0, undoConfirmed) {
|
|
908
|
-
if (!( this._editStacks.has(strResource))) {
|
|
914
|
+
if (!( (this._editStacks.has(strResource)))) {
|
|
909
915
|
return;
|
|
910
916
|
}
|
|
911
917
|
const editStack = this._editStacks.get(strResource);
|
|
@@ -936,22 +942,9 @@ let UndoRedoService = class UndoRedoService {
|
|
|
936
942
|
}
|
|
937
943
|
async _confirmAndContinueUndo(strResource, sourceId, element) {
|
|
938
944
|
const result = await this._dialogService.confirm({
|
|
939
|
-
message: ( localizeWithPath(
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
"Would you like to undo '{0}'?",
|
|
943
|
-
element.label
|
|
944
|
-
)),
|
|
945
|
-
primaryButton: ( localizeWithPath(
|
|
946
|
-
'vs/platform/undoRedo/common/undoRedoService',
|
|
947
|
-
{ key: 'confirmDifferentSource.yes', comment: ['&& denotes a mnemonic'] },
|
|
948
|
-
"&&Yes"
|
|
949
|
-
)),
|
|
950
|
-
cancelButton: ( localizeWithPath(
|
|
951
|
-
'vs/platform/undoRedo/common/undoRedoService',
|
|
952
|
-
'confirmDifferentSource.no',
|
|
953
|
-
"No"
|
|
954
|
-
))
|
|
945
|
+
message: ( localizeWithPath(_moduleId, 10, "Would you like to undo '{0}'?", element.label)),
|
|
946
|
+
primaryButton: ( localizeWithPath(_moduleId, 11, "&&Yes")),
|
|
947
|
+
cancelButton: ( localizeWithPath(_moduleId, 12, "No"))
|
|
955
948
|
});
|
|
956
949
|
if (!result.confirmed) {
|
|
957
950
|
return;
|
|
@@ -984,7 +977,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
984
977
|
return matchedStrResource ? true : false;
|
|
985
978
|
}
|
|
986
979
|
const strResource = this.getUriComparisonKey(resourceOrSource);
|
|
987
|
-
if (( this._editStacks.has(strResource))) {
|
|
980
|
+
if (( (this._editStacks.has(strResource)))) {
|
|
988
981
|
const editStack = this._editStacks.get(strResource);
|
|
989
982
|
return editStack.hasFutureElements();
|
|
990
983
|
}
|
|
@@ -994,21 +987,25 @@ let UndoRedoService = class UndoRedoService {
|
|
|
994
987
|
if (element.canSplit()) {
|
|
995
988
|
this._splitFutureWorkspaceElement(element, ignoreResources);
|
|
996
989
|
this._notificationService.warn(message);
|
|
997
|
-
return (
|
|
990
|
+
return (
|
|
991
|
+
(new WorkspaceVerificationError(this._redo(strResource)))
|
|
992
|
+
);
|
|
998
993
|
}
|
|
999
994
|
else {
|
|
1000
995
|
for (const strResource of element.strResources) {
|
|
1001
996
|
this.removeElements(strResource);
|
|
1002
997
|
}
|
|
1003
998
|
this._notificationService.warn(message);
|
|
1004
|
-
return (
|
|
999
|
+
return (
|
|
1000
|
+
(new WorkspaceVerificationError())
|
|
1001
|
+
);
|
|
1005
1002
|
}
|
|
1006
1003
|
}
|
|
1007
1004
|
_checkWorkspaceRedo(strResource, element, editStackSnapshot, checkInvalidatedResources) {
|
|
1008
1005
|
if (element.removedResources) {
|
|
1009
1006
|
return this._tryToSplitAndRedo(strResource, element, element.removedResources, ( localizeWithPath(
|
|
1010
|
-
|
|
1011
|
-
|
|
1007
|
+
_moduleId,
|
|
1008
|
+
13,
|
|
1012
1009
|
"Could not redo '{0}' across all files. {1}",
|
|
1013
1010
|
element.label,
|
|
1014
1011
|
element.removedResources.createMessage()
|
|
@@ -1016,8 +1013,8 @@ let UndoRedoService = class UndoRedoService {
|
|
|
1016
1013
|
}
|
|
1017
1014
|
if (checkInvalidatedResources && element.invalidatedResources) {
|
|
1018
1015
|
return this._tryToSplitAndRedo(strResource, element, element.invalidatedResources, ( localizeWithPath(
|
|
1019
|
-
|
|
1020
|
-
|
|
1016
|
+
_moduleId,
|
|
1017
|
+
13,
|
|
1021
1018
|
"Could not redo '{0}' across all files. {1}",
|
|
1022
1019
|
element.label,
|
|
1023
1020
|
element.invalidatedResources.createMessage()
|
|
@@ -1031,8 +1028,8 @@ let UndoRedoService = class UndoRedoService {
|
|
|
1031
1028
|
}
|
|
1032
1029
|
if (cannotRedoDueToResources.length > 0) {
|
|
1033
1030
|
return this._tryToSplitAndRedo(strResource, element, null, ( localizeWithPath(
|
|
1034
|
-
|
|
1035
|
-
|
|
1031
|
+
_moduleId,
|
|
1032
|
+
14,
|
|
1036
1033
|
"Could not redo '{0}' across all files because changes were made to {1}",
|
|
1037
1034
|
element.label,
|
|
1038
1035
|
cannotRedoDueToResources.join(', ')
|
|
@@ -1046,8 +1043,8 @@ let UndoRedoService = class UndoRedoService {
|
|
|
1046
1043
|
}
|
|
1047
1044
|
if (cannotLockDueToResources.length > 0) {
|
|
1048
1045
|
return this._tryToSplitAndRedo(strResource, element, null, ( localizeWithPath(
|
|
1049
|
-
|
|
1050
|
-
|
|
1046
|
+
_moduleId,
|
|
1047
|
+
15,
|
|
1051
1048
|
"Could not redo '{0}' across all files because there is already an undo or redo operation running on {1}",
|
|
1052
1049
|
element.label,
|
|
1053
1050
|
cannotLockDueToResources.join(', ')
|
|
@@ -1055,8 +1052,8 @@ let UndoRedoService = class UndoRedoService {
|
|
|
1055
1052
|
}
|
|
1056
1053
|
if (!editStackSnapshot.isValid()) {
|
|
1057
1054
|
return this._tryToSplitAndRedo(strResource, element, null, ( localizeWithPath(
|
|
1058
|
-
|
|
1059
|
-
|
|
1055
|
+
_moduleId,
|
|
1056
|
+
16,
|
|
1060
1057
|
"Could not redo '{0}' across all files because an undo or redo operation occurred in the meantime",
|
|
1061
1058
|
element.label
|
|
1062
1059
|
)));
|
|
@@ -1096,8 +1093,8 @@ let UndoRedoService = class UndoRedoService {
|
|
|
1096
1093
|
}
|
|
1097
1094
|
if (editStack.locked) {
|
|
1098
1095
|
const message = ( localizeWithPath(
|
|
1099
|
-
|
|
1100
|
-
|
|
1096
|
+
_moduleId,
|
|
1097
|
+
17,
|
|
1101
1098
|
"Could not redo '{0}' because there is already an undo or redo operation running.",
|
|
1102
1099
|
element.label
|
|
1103
1100
|
));
|
|
@@ -1106,7 +1103,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
1106
1103
|
}
|
|
1107
1104
|
return this._invokeResourcePrepare(element, (cleanup) => {
|
|
1108
1105
|
editStack.moveForward(element);
|
|
1109
|
-
return this._safeInvokeWithLocks(element, () => element.actual.redo(), ( new EditStackSnapshot([editStack])), cleanup, () => this._continueRedoInGroup(element.groupId));
|
|
1106
|
+
return this._safeInvokeWithLocks(element, () => element.actual.redo(), ( (new EditStackSnapshot([editStack]))), cleanup, () => this._continueRedoInGroup(element.groupId));
|
|
1110
1107
|
});
|
|
1111
1108
|
}
|
|
1112
1109
|
_findClosestRedoElementInGroup(groupId) {
|
|
@@ -1149,7 +1146,7 @@ let UndoRedoService = class UndoRedoService {
|
|
|
1149
1146
|
return this._redo(this.getUriComparisonKey(resourceOrSource));
|
|
1150
1147
|
}
|
|
1151
1148
|
_redo(strResource) {
|
|
1152
|
-
if (!( this._editStacks.has(strResource))) {
|
|
1149
|
+
if (!( (this._editStacks.has(strResource)))) {
|
|
1153
1150
|
return;
|
|
1154
1151
|
}
|
|
1155
1152
|
const editStack = this._editStacks.get(strResource);
|
|
@@ -1175,10 +1172,10 @@ let UndoRedoService = class UndoRedoService {
|
|
|
1175
1172
|
}
|
|
1176
1173
|
}
|
|
1177
1174
|
};
|
|
1178
|
-
UndoRedoService = ( __decorate([
|
|
1179
|
-
( __param(0, IDialogService)),
|
|
1180
|
-
( __param(1, INotificationService))
|
|
1181
|
-
], UndoRedoService));
|
|
1175
|
+
UndoRedoService = ( (__decorate([
|
|
1176
|
+
( (__param(0, IDialogService))),
|
|
1177
|
+
( (__param(1, INotificationService)))
|
|
1178
|
+
], UndoRedoService)));
|
|
1182
1179
|
class WorkspaceVerificationError {
|
|
1183
1180
|
constructor(returnValue) {
|
|
1184
1181
|
this.returnValue = returnValue;
|