@codingame/monaco-vscode-api 8.0.4 → 9.0.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/api.js +9 -10
- package/debugProtocol.d.ts +69 -5
- package/extensions.d.ts +5 -3
- package/extensions.js +1 -1
- package/localExtensionHost.js +2 -2
- package/missing-services.js +19 -3
- package/package.json +9 -8
- package/service-override/extensions.d.ts +1 -1
- package/service-override/tools/editor.d.ts +4 -4
- package/service-override/tools/editor.js +7 -3
- package/services.js +2 -2
- package/tools.js +1 -1
- package/vscode/src/vs/base/browser/browser.js +4 -3
- package/vscode/src/vs/base/browser/defaultWorkerFactory.js +83 -13
- package/vscode/src/vs/base/browser/dom.js +6 -12
- package/vscode/src/vs/base/browser/markdownRenderer.js +57 -68
- package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js +1 -1
- package/vscode/src/vs/base/browser/ui/actionbar/actionbar.d.ts +1 -1
- package/vscode/src/vs/base/browser/ui/actionbar/actionbar.js +3 -3
- package/vscode/src/vs/base/browser/ui/button/button.js +26 -1
- package/vscode/src/vs/base/browser/ui/dialog/dialog.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/dialog/dialog.js +7 -7
- package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js +1 -1
- package/vscode/src/vs/base/browser/ui/findinput/findInput.js +1 -1
- package/vscode/src/vs/base/browser/ui/findinput/findInputToggles.js +3 -3
- package/vscode/src/vs/base/browser/ui/findinput/replaceInput.js +2 -2
- package/vscode/src/vs/base/browser/ui/hover/hover.d.ts +1 -0
- package/vscode/src/vs/base/browser/ui/hover/hoverDelegate.d.ts +7 -0
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js +2 -2
- package/vscode/src/vs/base/browser/ui/iconLabel/iconLabel.js +8 -6
- package/vscode/src/vs/base/browser/ui/icons/iconSelectBox.js +2 -2
- package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js +6 -6
- package/vscode/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.js +1 -1
- package/vscode/src/vs/base/browser/ui/list/listView.js +2 -2
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +1 -1
- package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js +1 -1
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +1 -1
- package/vscode/src/vs/base/browser/ui/table/tableWidget.js +8 -0
- package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js +1 -1
- package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +11 -6
- package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js +1 -1
- package/vscode/src/vs/base/common/actions.js +1 -1
- package/vscode/src/vs/base/common/amd.js +119 -0
- package/vscode/src/vs/base/common/async.d.ts +13 -1
- package/vscode/src/vs/base/common/date.js +22 -6
- package/vscode/src/vs/base/common/event.d.ts +6 -0
- package/vscode/src/vs/base/common/event.js +5 -0
- package/vscode/src/vs/base/common/jsonErrorMessages.js +9 -9
- package/vscode/src/vs/base/common/keybindingLabels.js +20 -20
- package/vscode/src/vs/base/common/network.js +15 -13
- package/vscode/src/vs/base/common/performance.js +1 -1
- package/vscode/src/vs/base/common/platform.js +3 -1
- package/vscode/src/vs/base/common/product.d.ts +0 -1
- package/vscode/src/vs/base/common/worker/simpleWorker.js +136 -127
- package/vscode/src/vs/editor/browser/controller/mouseHandler.js +18 -66
- package/vscode/src/vs/editor/browser/controller/mouseTarget.js +5 -18
- package/vscode/src/vs/editor/browser/controller/pointerHandler.js +3 -3
- package/vscode/src/vs/editor/browser/controller/textAreaHandler.js +5 -5
- package/vscode/src/vs/editor/browser/coreCommands.js +3 -3
- package/vscode/src/vs/editor/browser/services/editorWorkerService.js +115 -221
- package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js +2 -2
- package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js +5 -2
- package/vscode/src/vs/editor/browser/view/viewLayer.js +20 -20
- package/vscode/src/vs/editor/browser/view/viewOverlays.js +5 -6
- package/vscode/src/vs/editor/browser/view.js +1 -3
- package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.js +10 -14
- package/vscode/src/vs/editor/browser/viewParts/minimap/minimap.js +3 -1
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +4 -3
- package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js +12 -12
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js +14 -14
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js +3 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js +7 -7
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js +5 -5
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js +7 -7
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js +4 -4
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js +2 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js +5 -5
- package/vscode/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.js +3 -3
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js +4 -4
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.js +15 -5
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js +1 -1
- package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js +59 -50
- package/vscode/src/vs/editor/common/config/editorOptions.js +1 -1
- package/vscode/src/vs/editor/common/core/editorColorRegistry.js +71 -71
- package/vscode/src/vs/editor/common/cursor/cursor.js +1 -1
- package/vscode/src/vs/editor/common/cursor/cursorTypeEditOperations.js +1 -1
- package/vscode/src/vs/editor/common/editorContextKeys.js +47 -47
- package/vscode/src/vs/editor/common/languages/modesRegistry.js +1 -1
- package/vscode/src/vs/editor/common/languages.js +29 -28
- package/vscode/src/vs/editor/common/model/editStack.js +1 -1
- package/vscode/src/vs/editor/common/model/textModel.js +8 -39
- package/vscode/src/vs/editor/common/model/tokenizationTextModelPart.js +84 -74
- package/vscode/src/vs/editor/common/model/tokens.js +82 -0
- package/vscode/src/vs/editor/common/model/treeSitterTokens.js +69 -0
- package/vscode/src/vs/editor/common/model.d.ts +2 -0
- package/vscode/src/vs/editor/common/services/editorSimpleWorker.js +39 -241
- package/vscode/src/vs/editor/common/services/editorWorker.d.ts +3 -2
- package/vscode/src/vs/editor/common/services/editorWorkerBootstrap.js +27 -0
- package/vscode/src/vs/editor/common/services/editorWorkerHost.js +10 -0
- package/vscode/src/vs/editor/common/services/getIconClasses.js +1 -1
- package/vscode/src/vs/editor/common/services/languageService.js +10 -37
- package/vscode/src/vs/editor/common/services/modelService.js +6 -17
- package/vscode/src/vs/editor/common/services/textModelSync/textModelSync.impl.js +323 -0
- package/vscode/src/vs/editor/common/services/treeSitterParserService.js +3 -0
- package/vscode/src/vs/editor/common/standaloneStrings.js +57 -28
- package/vscode/src/vs/editor/common/viewLayout/viewLineRenderer.js +2 -2
- package/vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js +6 -6
- package/vscode/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.js +6 -6
- package/vscode/src/vs/editor/contrib/caretOperations/browser/caretOperations.js +2 -2
- package/vscode/src/vs/editor/contrib/caretOperations/browser/transpose.js +1 -1
- package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js +17 -17
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js +1 -1
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionCommands.js +28 -28
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionContributions.js +3 -3
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +14 -6
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +8 -8
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js +14 -1
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +41 -29
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js +2 -2
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorContributions.js +2 -2
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.js +1 -1
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.js +2 -2
- package/vscode/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.js +13 -13
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js +7 -7
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.js +10 -30
- package/vscode/src/vs/editor/contrib/comment/browser/comment.js +6 -6
- package/vscode/src/vs/editor/contrib/contextmenu/browser/contextmenu.js +10 -10
- package/vscode/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.js +2 -2
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js +3 -3
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +12 -15
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +8 -8
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.js +1 -1
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js +3 -3
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js +2 -2
- package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js +1 -1
- package/vscode/src/vs/editor/contrib/find/browser/findController.js +26 -25
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +27 -27
- package/vscode/src/vs/editor/contrib/folding/browser/folding.d.ts +4 -1
- package/vscode/src/vs/editor/contrib/folding/browser/folding.js +20 -3
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +9 -9
- package/vscode/src/vs/editor/contrib/folding/browser/foldingModel.d.ts +2 -1
- package/vscode/src/vs/editor/contrib/folding/browser/foldingModel.js +5 -13
- package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.d.ts +3 -1
- package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.js +2 -2
- package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js +3 -3
- package/vscode/src/vs/editor/contrib/format/browser/formatActions.js +2 -2
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoError.js +8 -8
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js +14 -14
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js +39 -39
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.js +1 -1
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js +1 -1
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +9 -4
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js +3 -3
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +10 -14
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.js +8 -8
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.js +3 -3
- package/vscode/src/vs/editor/contrib/hover/browser/{hoverController.js → contentHoverController2.js} +26 -84
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverRendered.js +3 -3
- package/vscode/src/vs/editor/contrib/hover/browser/{contentHoverController.js → contentHoverWidgetWrapper.js} +20 -5
- package/vscode/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.js +5 -5
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js +2 -2
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js +37 -37
- package/vscode/src/vs/editor/contrib/hover/browser/hoverContribution.js +4 -2
- package/vscode/src/vs/editor/contrib/hover/browser/hoverUtils.js +12 -0
- package/vscode/src/vs/editor/contrib/hover/browser/marginHoverController.js +166 -0
- package/vscode/src/vs/editor/contrib/hover/browser/marginHoverWidget.js +24 -4
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +9 -9
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +7 -6
- package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +2 -2
- package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js +20 -20
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +8 -8
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{commands.js → controller/commands.js} +26 -26
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionContextKeys.js → controller/inlineCompletionContextKeys.js} +14 -14
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsController.js → controller/inlineCompletionsController.js} +35 -35
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{hoverParticipant.js → hintsWidget/hoverParticipant.js} +23 -23
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsHintsWidget.css.js → hintsWidget/inlineCompletionsHintsWidget.css.js} +1 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsHintsWidget.js → hintsWidget/inlineCompletionsHintsWidget.js} +38 -38
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js +3 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{ghostText.js → model/ghostText.js} +5 -5
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsModel.js → model/inlineCompletionsModel.js} +27 -27
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsSource.js → model/inlineCompletionsSource.js} +16 -16
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{provideInlineCompletions.js → model/provideInlineCompletions.js} +11 -11
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{singleTextEdit.js → model/singleTextEdit.js} +6 -6
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{suggestWidgetInlineCompletionProvider.js → model/suggestWidgetAdaptor.js} +11 -11
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{ghostText.css.js → view/ghostTextView.css.js} +1 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{ghostTextWidget.js → view/ghostTextView.js} +29 -29
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/commands.js +6 -6
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/consts.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/inlineEditsModel.js +1 -1
- package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js +1 -1
- package/vscode/src/vs/editor/contrib/linesOperations/browser/linesOperations.js +30 -30
- package/vscode/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +2 -2
- package/vscode/src/vs/editor/contrib/links/browser/links.js +10 -10
- package/vscode/src/vs/editor/contrib/message/browser/messageController.js +1 -1
- package/vscode/src/vs/editor/contrib/multicursor/browser/multicursor.js +22 -22
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.js +1 -1
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +4 -4
- package/vscode/src/vs/editor/contrib/peekView/browser/peekView.js +17 -17
- package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js +1 -1
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +5 -5
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +32 -32
- package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js +2 -2
- package/vscode/src/vs/editor/contrib/rename/browser/rename.js +11 -11
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +6 -8
- package/vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.js +4 -4
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js +4 -4
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js +4 -4
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +11 -11
- package/vscode/src/vs/editor/contrib/suggest/browser/suggest.js +8 -8
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js +28 -13
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestModel.js +6 -3
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js +16 -16
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +2 -2
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +2 -2
- package/vscode/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.js +33 -33
- package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +4 -4
- package/vscode/src/vs/editor/contrib/tokenization/browser/tokenization.js +1 -1
- package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +24 -24
- package/vscode/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js +5 -5
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js +9 -9
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.js +64 -0
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +62 -89
- package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js +1 -1
- package/vscode/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js +3 -3
- package/vscode/src/vs/editor/standalone/browser/standaloneCodeEditor.js +0 -1
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.d.ts +1 -1
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.js +24 -3
- package/vscode/src/vs/editor/standalone/browser/standaloneTreeSitterService.js +13 -0
- package/vscode/src/vs/nls.js +4 -3
- package/vscode/src/vs/nls.messages.js +7 -0
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +49 -49
- package/vscode/src/vs/platform/action/common/actionCommonCategories.js +6 -6
- package/vscode/src/vs/platform/actionWidget/browser/actionList.js +4 -4
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.css.js +1 -1
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js +7 -7
- package/vscode/src/vs/platform/actions/browser/buttonbar.js +8 -7
- package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js +5 -5
- package/vscode/src/vs/platform/actions/browser/toolbar.js +2 -2
- package/vscode/src/vs/platform/actions/common/actions.d.ts +2 -0
- package/vscode/src/vs/platform/actions/common/actions.js +2 -0
- package/vscode/src/vs/platform/actions/common/menuResetAction.js +1 -1
- package/vscode/src/vs/platform/actions/common/menuService.js +17 -7
- package/vscode/src/vs/platform/clipboard/browser/clipboardService.js +45 -5
- package/vscode/src/vs/platform/clipboard/common/clipboardService.service.d.ts +6 -0
- package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js +1 -1
- package/vscode/src/vs/platform/contextkey/common/contextkeys.js +9 -9
- package/vscode/src/vs/platform/contextkey/common/scanner.js +5 -5
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +9 -9
- package/vscode/src/vs/platform/dnd/browser/dnd.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionEnablementService.js +4 -4
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +3 -2
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionStorage.js +1 -1
- package/vscode/src/vs/platform/extensions/common/extensionValidator.js +19 -19
- package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js +16 -10
- package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +2 -2
- package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js +1 -1
- package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js +4 -4
- package/vscode/src/vs/platform/languagePacks/common/languagePacks.js +1 -1
- package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +3 -3
- package/vscode/src/vs/platform/list/browser/listService.js +27 -27
- package/vscode/src/vs/platform/markers/common/markerService.js +0 -1
- package/vscode/src/vs/platform/markers/common/markers.js +3 -3
- package/vscode/src/vs/platform/quickinput/browser/quickAccess.js +1 -1
- package/vscode/src/vs/platform/quickinput/browser/quickInput.js +8 -8
- package/vscode/src/vs/platform/quickinput/browser/quickInputActions.js +3 -3
- package/vscode/src/vs/platform/quickinput/browser/quickInputController.js +11 -8
- package/vscode/src/vs/platform/quickinput/browser/quickInputService.js +3 -3
- package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +43 -35
- package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +1 -1
- package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js +10 -7
- package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts +12 -2
- package/vscode/src/vs/platform/quickinput/common/quickInput.service.d.ts +10 -1
- package/vscode/src/vs/platform/request/common/request.js +14 -14
- package/vscode/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.d.ts +19 -4
- package/vscode/src/vs/platform/terminal/common/terminal.d.ts +11 -8
- package/vscode/src/vs/platform/terminal/common/terminal.js +9 -5
- package/vscode/src/vs/platform/theme/common/colorUtils.js +4 -3
- package/vscode/src/vs/platform/theme/common/colors/baseColors.js +17 -17
- package/vscode/src/vs/platform/theme/common/colors/chartsColors.js +8 -8
- package/vscode/src/vs/platform/theme/common/colors/editorColors.js +94 -94
- package/vscode/src/vs/platform/theme/common/colors/inputColors.js +45 -45
- package/vscode/src/vs/platform/theme/common/colors/listColors.js +37 -33
- package/vscode/src/vs/platform/theme/common/colors/menuColors.js +7 -7
- package/vscode/src/vs/platform/theme/common/colors/minimapColors.js +11 -11
- package/vscode/src/vs/platform/theme/common/colors/miscColors.js +8 -8
- package/vscode/src/vs/platform/theme/common/colors/quickpickColors.js +9 -9
- package/vscode/src/vs/platform/theme/common/colors/searchColors.js +3 -3
- package/vscode/src/vs/platform/theme/common/iconRegistry.js +5 -5
- package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +42 -42
- package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js +20 -20
- package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js +2 -2
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.js +5 -5
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js +1 -1
- package/vscode/src/vs/platform/window/common/window.js +16 -1
- package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +20 -73
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +98 -52
- package/vscode/src/vs/workbench/api/common/extHostComments.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +5 -5
- package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js +55 -13
- package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +5 -5
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +11 -11
- package/vscode/src/vs/workbench/api/common/extHostSearch.js +48 -5
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostTask.js +2 -1
- package/vscode/src/vs/workbench/api/common/extHostTesting.js +22 -9
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +147 -48
- package/vscode/src/vs/workbench/api/common/extHostTypes.js +17 -10
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +230 -80
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +12 -12
- package/vscode/src/vs/workbench/api/worker/extensionHostWorker.esm.js +3 -0
- package/vscode/src/vs/workbench/browser/actions/developerActions.js +31 -31
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +154 -148
- package/vscode/src/vs/workbench/browser/actions/textInputActions.js +6 -6
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +25 -25
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +21 -21
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +4 -4
- package/vscode/src/vs/workbench/browser/editor.js +2 -2
- package/vscode/src/vs/workbench/browser/labels.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +11 -11
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +11 -11
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +41 -41
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js +11 -11
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +131 -131
- package/vscode/src/vs/workbench/browser/parts/editor/editorAutoSave.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +16 -16
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js +7 -7
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js +13 -13
- package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +9 -9
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +5 -5
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +74 -72
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.js +19 -9
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +15 -15
- package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsList.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsActions.js +17 -17
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +9 -9
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsList.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js +13 -13
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js +4 -4
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +34 -34
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +18 -18
- package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/views/checkbox.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +7 -7
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +4 -4
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +9 -6
- package/vscode/src/vs/workbench/browser/quickaccess.js +1 -1
- package/vscode/src/vs/workbench/browser/window.js +24 -17
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +217 -217
- package/vscode/src/vs/workbench/common/configuration.js +10 -10
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +1 -1
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +1 -1
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +1 -1
- package/vscode/src/vs/workbench/common/theme.js +156 -156
- package/vscode/src/vs/workbench/common/views.js +5 -5
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +178 -137
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +13 -13
- package/vscode/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.js +6 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +88 -61
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +9 -9
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.js +289 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.js +11 -11
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAgentHover.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.js +8 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.js +3 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.js +15 -9
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.js +31 -74
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.service.js +3 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js +5 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js +73 -60
- package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js +139 -50
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.js +36 -19
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.js +26 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js +39 -31
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.js +50 -37
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js +7 -20
- package/vscode/src/vs/workbench/contrib/chat/browser/media/chat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +62 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatColors.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +36 -17
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +105 -40
- package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js +35 -2
- package/vscode/src/vs/workbench/contrib/chat/common/chatRequestParser.js +12 -5
- package/vscode/src/vs/workbench/contrib/chat/common/chatService.js +13 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js +17 -21
- package/vscode/src/vs/workbench/contrib/chat/common/chatWordCounter.js +17 -1
- package/vscode/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.js +3 -0
- package/vscode/src/vs/workbench/contrib/chat/common/languageModels.js +6 -6
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +15 -15
- package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +10 -10
- package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +6 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +4 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.js +5 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +10 -10
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +6 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +15 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.js +33 -1
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js +13 -34
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +4 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +5 -5
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +7 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +5 -5
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +3 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +4 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +3 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +18 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +15 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +0 -8
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js +10 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +7 -6
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsModel.js +13 -6
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +17 -13
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +64 -30
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +85 -11
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +7 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.js +6 -4
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +9 -9
- package/vscode/src/vs/workbench/contrib/comments/common/commentModel.js +30 -0
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js +3 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +15 -9
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js +65 -60
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointWidget.js +21 -16
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +75 -74
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +12 -12
- package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +45 -41
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +57 -57
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSessionPicker.js +4 -4
- package/vscode/src/vs/workbench/contrib/debug/browser/linkDetector.js +260 -0
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts +9 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js +18 -11
- package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugUtils.js +3 -0
- package/vscode/src/vs/workbench/contrib/debug/common/disassemblyViewInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/common/replModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +166 -166
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +24 -24
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js +5 -5
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js +3 -3
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +4 -4
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +20 -20
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +14 -14
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +85 -85
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands._save.js +8 -8
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +6 -6
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +33 -33
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._configuration.js +52 -87
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._editorPane.js +2 -2
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +7 -7
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +18 -14
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +7 -7
- package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/common/files.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/files/common/files.js +14 -14
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +3 -3
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js +20 -20
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js +4 -4
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +4 -4
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +73 -93
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.js +11 -18
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +234 -112
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.js +53 -138
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +33 -38
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +249 -117
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js +85 -44
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js +93 -41
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +63 -45
- package/vscode/src/vs/workbench/contrib/list/browser/list.contribution.js +3 -0
- package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js +27 -0
- package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js +54 -0
- package/vscode/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.js +95 -25
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +29 -29
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +269 -0
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.js +40 -0
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +58 -6
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js +2 -1
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js +6 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +17 -17
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js +12 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/foldingController.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.js +49 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.js +1515 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.js +266 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.js +630 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.js +113 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.js +37 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css.js +4 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js +729 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.js +28 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.js +445 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.js +184 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.js +454 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.js +256 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.js +45 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/media/notebook.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookBrowser.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +9 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +62 -43
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookIcons.js +29 -29
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.js +29 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.js +13 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js +53 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool.js +114 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.js +0 -1
- 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 +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js +16 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js +32 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js +14 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.js +47 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js +35 -30
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js +4 -0
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js +2 -3
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookDiffEditorInput.js +105 -0
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +9 -3
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js +11 -18
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +3 -3
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js +12 -12
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +18 -17
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js +54 -49
- package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js +21 -21
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +15 -15
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIcons.js +17 -17
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +60 -60
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/common/scm.js +2 -1
- package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +10 -10
- package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.js +4 -5
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js +1 -1
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +10 -10
- package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js +14 -33
- package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js +2 -2
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js +1 -1
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js +2 -2
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +3 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +3 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +9 -9
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +29 -29
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +5 -5
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +5 -5
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts +18 -1
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +4 -4
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalMenus.js +32 -32
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.d.ts +3 -0
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +7 -7
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +23 -23
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +16 -16
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalStrings.js +28 -28
- package/vscode/src/vs/workbench/contrib/testing/common/constants.js +11 -11
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +8 -4
- package/vscode/src/vs/workbench/contrib/testing/common/testTypes.d.ts +2 -1
- package/vscode/src/vs/workbench/contrib/url/browser/trustedDomains.js +6 -6
- package/vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js +3 -3
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor.js +21 -2
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js +2 -2
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +3 -3
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +7 -7
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolver.js +2 -1
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js +16 -16
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js +1 -1
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +15 -15
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts +6 -8
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.service.d.ts +10 -3
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +1 -1
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.js +1 -1
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +6 -6
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts +2 -2
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManagers.d.ts +1 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensions.d.ts +5 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +83 -83
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +5 -5
- package/vscode/src/vs/workbench/services/language/common/languageService.js +28 -28
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js +3 -3
- package/vscode/src/vs/workbench/services/output/common/output.js +1 -2
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js +2 -2
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js +7 -7
- package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js +2 -2
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +8 -8
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +5 -5
- package/vscode/src/vs/workbench/services/search/common/fileSearchManager.js +62 -30
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +42 -12
- package/vscode/src/vs/workbench/services/search/common/search.js +69 -34
- package/vscode/src/vs/workbench/services/search/common/searchExtConversionTypes.js +144 -0
- package/vscode/src/vs/workbench/services/search/common/searchExtTypes.js +9 -29
- package/vscode/src/vs/workbench/services/search/common/searchHelpers.js +7 -7
- package/vscode/src/vs/workbench/services/search/common/textSearchManager.js +77 -93
- package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js +9 -9
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +7 -4
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +22 -22
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +13 -13
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +8 -9
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js +1 -1
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +11 -11
- package/vscode/src/vs/workbench/services/views/browser/viewsService.js +7 -7
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +20 -17
- package/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts +1 -85
- package/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts +42 -13
- package/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts +5 -0
- package/vscode-dts/vscode.proposed.chatProvider.d.ts +1 -1
- package/vscode-dts/vscode.proposed.chatVariableResolver.d.ts +0 -17
- package/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts +6 -0
- package/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts +6 -0
- package/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts +7 -0
- package/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts +8 -0
- package/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts +6 -3
- package/vscode-dts/vscode.proposed.extensionsAny.d.ts +1 -0
- package/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts +7 -6
- package/vscode-dts/vscode.proposed.findFiles2New.d.ts +36 -11
- package/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts +51 -30
- package/vscode-dts/vscode.proposed.interactive.d.ts +0 -2
- package/vscode-dts/vscode.proposed.lmTools.d.ts +119 -20
- package/vscode-dts/vscode.proposed.notebookReplDocument.d.ts +20 -0
- package/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts +1 -0
- package/vscode-dts/vscode.proposed.testObserver.d.ts +6 -0
- package/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts +1 -9
- package/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts +58 -17
- package/workers/editor.worker.js +1 -1
- package/workers/extensionHost.worker.js +1 -3
- package/external/vscode-marked/lib/marked.esm.js +0 -2199
- package/vscode/src/vs/editor/browser/services/webWorker.js +0 -57
- package/vscode/src/vs/editor/editor.worker.js +0 -21
- package/vscode-dts/vscode.proposed.authGetSessions.d.ts +0 -70
- package/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts +0 -338
- package/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts +0 -38
- /package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{commandIds.js → controller/commandIds.js} +0 -0
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { stringDiff } from '../../../base/common/diff/diff.js';
|
|
2
|
-
import { URI } from '../../../base/common/uri.js';
|
|
3
2
|
import { Position } from '../core/position.js';
|
|
4
3
|
import { Range } from '../core/range.js';
|
|
5
|
-
import { MirrorTextModel } from '../model/mirrorTextModel.js';
|
|
6
|
-
import { getWordAtText, ensureValidWordDefinition } from '../core/wordHelper.js';
|
|
7
4
|
import { computeLinks } from '../languages/linkComputer.js';
|
|
8
5
|
import { BasicInplaceReplace } from '../languages/supports/inplaceReplaceSupport.js';
|
|
9
6
|
import { createMonacoBaseAPI } from './editorBaseApi.js';
|
|
7
|
+
import './editorWorkerHost.js';
|
|
10
8
|
import { StopWatch } from '../../../base/common/stopwatch.js';
|
|
11
9
|
import { UnicodeTextModelHighlighter } from './unicodeTextModelHighlighter.js';
|
|
12
10
|
import { DiffComputer } from '../diff/legacyLinesDiffComputer.js';
|
|
@@ -15,254 +13,43 @@ import { createProxyObject, getAllMethodNames } from '../../../base/common/objec
|
|
|
15
13
|
import { BugIndicatingError } from '../../../base/common/errors.js';
|
|
16
14
|
import { computeDefaultDocumentColors } from '../languages/defaultDocumentColorsComputer.js';
|
|
17
15
|
import { findSectionHeaders } from './findSectionHeaders.js';
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
get eol() {
|
|
23
|
-
return this._eol;
|
|
24
|
-
}
|
|
25
|
-
getValue() {
|
|
26
|
-
return this.getText();
|
|
27
|
-
}
|
|
28
|
-
findMatches(regex) {
|
|
29
|
-
const matches = [];
|
|
30
|
-
for (let i = 0; i < this._lines.length; i++) {
|
|
31
|
-
const line = this._lines[i];
|
|
32
|
-
const offsetToAdd = this.offsetAt(( new Position(i + 1, 1)));
|
|
33
|
-
const iteratorOverMatches = line.matchAll(regex);
|
|
34
|
-
for (const match of iteratorOverMatches) {
|
|
35
|
-
if (match.index || match.index === 0) {
|
|
36
|
-
match.index = match.index + offsetToAdd;
|
|
37
|
-
}
|
|
38
|
-
matches.push(match);
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
return matches;
|
|
42
|
-
}
|
|
43
|
-
getLinesContent() {
|
|
44
|
-
return this._lines.slice(0);
|
|
45
|
-
}
|
|
46
|
-
getLineCount() {
|
|
47
|
-
return this._lines.length;
|
|
48
|
-
}
|
|
49
|
-
getLineContent(lineNumber) {
|
|
50
|
-
return this._lines[lineNumber - 1];
|
|
51
|
-
}
|
|
52
|
-
getWordAtPosition(position, wordDefinition) {
|
|
53
|
-
const wordAtText = getWordAtText(position.column, ensureValidWordDefinition(wordDefinition), this._lines[position.lineNumber - 1], 0);
|
|
54
|
-
if (wordAtText) {
|
|
55
|
-
return ( new Range(
|
|
56
|
-
position.lineNumber,
|
|
57
|
-
wordAtText.startColumn,
|
|
58
|
-
position.lineNumber,
|
|
59
|
-
wordAtText.endColumn
|
|
60
|
-
));
|
|
61
|
-
}
|
|
62
|
-
return null;
|
|
63
|
-
}
|
|
64
|
-
getWordUntilPosition(position, wordDefinition) {
|
|
65
|
-
const wordAtPosition = this.getWordAtPosition(position, wordDefinition);
|
|
66
|
-
if (!wordAtPosition) {
|
|
67
|
-
return {
|
|
68
|
-
word: '',
|
|
69
|
-
startColumn: position.column,
|
|
70
|
-
endColumn: position.column
|
|
71
|
-
};
|
|
72
|
-
}
|
|
73
|
-
return {
|
|
74
|
-
word: this._lines[position.lineNumber - 1].substring(wordAtPosition.startColumn - 1, position.column - 1),
|
|
75
|
-
startColumn: wordAtPosition.startColumn,
|
|
76
|
-
endColumn: position.column
|
|
77
|
-
};
|
|
78
|
-
}
|
|
79
|
-
words(wordDefinition) {
|
|
80
|
-
const lines = this._lines;
|
|
81
|
-
const wordenize = this._wordenize.bind(this);
|
|
82
|
-
let lineNumber = 0;
|
|
83
|
-
let lineText = '';
|
|
84
|
-
let wordRangesIdx = 0;
|
|
85
|
-
let wordRanges = [];
|
|
86
|
-
return {
|
|
87
|
-
*[Symbol.iterator]() {
|
|
88
|
-
while (true) {
|
|
89
|
-
if (wordRangesIdx < wordRanges.length) {
|
|
90
|
-
const value = lineText.substring(wordRanges[wordRangesIdx].start, wordRanges[wordRangesIdx].end);
|
|
91
|
-
wordRangesIdx += 1;
|
|
92
|
-
yield value;
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
95
|
-
if (lineNumber < lines.length) {
|
|
96
|
-
lineText = lines[lineNumber];
|
|
97
|
-
wordRanges = wordenize(lineText, wordDefinition);
|
|
98
|
-
wordRangesIdx = 0;
|
|
99
|
-
lineNumber += 1;
|
|
100
|
-
}
|
|
101
|
-
else {
|
|
102
|
-
break;
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
};
|
|
108
|
-
}
|
|
109
|
-
getLineWords(lineNumber, wordDefinition) {
|
|
110
|
-
const content = this._lines[lineNumber - 1];
|
|
111
|
-
const ranges = this._wordenize(content, wordDefinition);
|
|
112
|
-
const words = [];
|
|
113
|
-
for (const range of ranges) {
|
|
114
|
-
words.push({
|
|
115
|
-
word: content.substring(range.start, range.end),
|
|
116
|
-
startColumn: range.start + 1,
|
|
117
|
-
endColumn: range.end + 1
|
|
118
|
-
});
|
|
119
|
-
}
|
|
120
|
-
return words;
|
|
121
|
-
}
|
|
122
|
-
_wordenize(content, wordDefinition) {
|
|
123
|
-
const result = [];
|
|
124
|
-
let match;
|
|
125
|
-
wordDefinition.lastIndex = 0;
|
|
126
|
-
while (match = wordDefinition.exec(content)) {
|
|
127
|
-
if (match[0].length === 0) {
|
|
128
|
-
break;
|
|
129
|
-
}
|
|
130
|
-
result.push({ start: match.index, end: match.index + match[0].length });
|
|
131
|
-
}
|
|
132
|
-
return result;
|
|
133
|
-
}
|
|
134
|
-
getValueInRange(range) {
|
|
135
|
-
range = this._validateRange(range);
|
|
136
|
-
if (range.startLineNumber === range.endLineNumber) {
|
|
137
|
-
return this._lines[range.startLineNumber - 1].substring(range.startColumn - 1, range.endColumn - 1);
|
|
138
|
-
}
|
|
139
|
-
const lineEnding = this._eol;
|
|
140
|
-
const startLineIndex = range.startLineNumber - 1;
|
|
141
|
-
const endLineIndex = range.endLineNumber - 1;
|
|
142
|
-
const resultLines = [];
|
|
143
|
-
resultLines.push(this._lines[startLineIndex].substring(range.startColumn - 1));
|
|
144
|
-
for (let i = startLineIndex + 1; i < endLineIndex; i++) {
|
|
145
|
-
resultLines.push(this._lines[i]);
|
|
146
|
-
}
|
|
147
|
-
resultLines.push(this._lines[endLineIndex].substring(0, range.endColumn - 1));
|
|
148
|
-
return resultLines.join(lineEnding);
|
|
149
|
-
}
|
|
150
|
-
offsetAt(position) {
|
|
151
|
-
position = this._validatePosition(position);
|
|
152
|
-
this._ensureLineStarts();
|
|
153
|
-
return this._lineStarts.getPrefixSum(position.lineNumber - 2) + (position.column - 1);
|
|
154
|
-
}
|
|
155
|
-
positionAt(offset) {
|
|
156
|
-
offset = Math.floor(offset);
|
|
157
|
-
offset = Math.max(0, offset);
|
|
158
|
-
this._ensureLineStarts();
|
|
159
|
-
const out = this._lineStarts.getIndexOf(offset);
|
|
160
|
-
const lineLength = this._lines[out.index].length;
|
|
161
|
-
return {
|
|
162
|
-
lineNumber: 1 + out.index,
|
|
163
|
-
column: 1 + Math.min(out.remainder, lineLength)
|
|
164
|
-
};
|
|
165
|
-
}
|
|
166
|
-
_validateRange(range) {
|
|
167
|
-
const start = this._validatePosition({ lineNumber: range.startLineNumber, column: range.startColumn });
|
|
168
|
-
const end = this._validatePosition({ lineNumber: range.endLineNumber, column: range.endColumn });
|
|
169
|
-
if (start.lineNumber !== range.startLineNumber
|
|
170
|
-
|| start.column !== range.startColumn
|
|
171
|
-
|| end.lineNumber !== range.endLineNumber
|
|
172
|
-
|| end.column !== range.endColumn) {
|
|
173
|
-
return {
|
|
174
|
-
startLineNumber: start.lineNumber,
|
|
175
|
-
startColumn: start.column,
|
|
176
|
-
endLineNumber: end.lineNumber,
|
|
177
|
-
endColumn: end.column
|
|
178
|
-
};
|
|
179
|
-
}
|
|
180
|
-
return range;
|
|
181
|
-
}
|
|
182
|
-
_validatePosition(position) {
|
|
183
|
-
if (!Position.isIPosition(position)) {
|
|
184
|
-
throw ( new Error('bad position'));
|
|
185
|
-
}
|
|
186
|
-
let { lineNumber, column } = position;
|
|
187
|
-
let hasChanged = false;
|
|
188
|
-
if (lineNumber < 1) {
|
|
189
|
-
lineNumber = 1;
|
|
190
|
-
column = 1;
|
|
191
|
-
hasChanged = true;
|
|
192
|
-
}
|
|
193
|
-
else if (lineNumber > this._lines.length) {
|
|
194
|
-
lineNumber = this._lines.length;
|
|
195
|
-
column = this._lines[lineNumber - 1].length + 1;
|
|
196
|
-
hasChanged = true;
|
|
197
|
-
}
|
|
198
|
-
else {
|
|
199
|
-
const maxCharacter = this._lines[lineNumber - 1].length + 1;
|
|
200
|
-
if (column < 1) {
|
|
201
|
-
column = 1;
|
|
202
|
-
hasChanged = true;
|
|
203
|
-
}
|
|
204
|
-
else if (column > maxCharacter) {
|
|
205
|
-
column = maxCharacter;
|
|
206
|
-
hasChanged = true;
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
if (!hasChanged) {
|
|
210
|
-
return position;
|
|
211
|
-
}
|
|
212
|
-
else {
|
|
213
|
-
return { lineNumber, column };
|
|
214
|
-
}
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
class EditorSimpleWorker {
|
|
218
|
-
constructor(host, foreignModuleFactory) {
|
|
219
|
-
this._host = host;
|
|
220
|
-
this._models = Object.create(null);
|
|
221
|
-
this._foreignModuleFactory = foreignModuleFactory;
|
|
222
|
-
this._foreignModule = null;
|
|
16
|
+
import { WorkerTextModelSyncServer } from './textModelSync/textModelSync.impl.js';
|
|
17
|
+
class BaseEditorSimpleWorker {
|
|
18
|
+
constructor() {
|
|
19
|
+
this._workerTextModelSyncServer = ( new WorkerTextModelSyncServer());
|
|
223
20
|
}
|
|
224
21
|
dispose() {
|
|
225
|
-
this._models = Object.create(null);
|
|
226
22
|
}
|
|
227
23
|
_getModel(uri) {
|
|
228
|
-
return this.
|
|
24
|
+
return this._workerTextModelSyncServer.getModel(uri);
|
|
229
25
|
}
|
|
230
26
|
_getModels() {
|
|
231
|
-
|
|
232
|
-
( Object.keys(this._models)).forEach((key) => all.push(this._models[key]));
|
|
233
|
-
return all;
|
|
27
|
+
return this._workerTextModelSyncServer.getModels();
|
|
234
28
|
}
|
|
235
|
-
acceptNewModel(data) {
|
|
236
|
-
this.
|
|
29
|
+
$acceptNewModel(data) {
|
|
30
|
+
this._workerTextModelSyncServer.$acceptNewModel(data);
|
|
237
31
|
}
|
|
238
|
-
acceptModelChanged(
|
|
239
|
-
|
|
240
|
-
return;
|
|
241
|
-
}
|
|
242
|
-
const model = this._models[strURL];
|
|
243
|
-
model.onEvents(e);
|
|
32
|
+
$acceptModelChanged(uri, e) {
|
|
33
|
+
this._workerTextModelSyncServer.$acceptModelChanged(uri, e);
|
|
244
34
|
}
|
|
245
|
-
acceptRemovedModel(
|
|
246
|
-
|
|
247
|
-
return;
|
|
248
|
-
}
|
|
249
|
-
delete this._models[strURL];
|
|
35
|
+
$acceptRemovedModel(uri) {
|
|
36
|
+
this._workerTextModelSyncServer.$acceptRemovedModel(uri);
|
|
250
37
|
}
|
|
251
|
-
async computeUnicodeHighlights(url, options, range) {
|
|
38
|
+
async $computeUnicodeHighlights(url, options, range) {
|
|
252
39
|
const model = this._getModel(url);
|
|
253
40
|
if (!model) {
|
|
254
41
|
return { ranges: [], hasMore: false, ambiguousCharacterCount: 0, invisibleCharacterCount: 0, nonBasicAsciiCharacterCount: 0 };
|
|
255
42
|
}
|
|
256
43
|
return UnicodeTextModelHighlighter.computeUnicodeHighlights(model, options, range);
|
|
257
44
|
}
|
|
258
|
-
async findSectionHeaders(url, options) {
|
|
45
|
+
async $findSectionHeaders(url, options) {
|
|
259
46
|
const model = this._getModel(url);
|
|
260
47
|
if (!model) {
|
|
261
48
|
return [];
|
|
262
49
|
}
|
|
263
50
|
return findSectionHeaders(model, options);
|
|
264
51
|
}
|
|
265
|
-
async computeDiff(originalUrl, modifiedUrl, options, algorithm) {
|
|
52
|
+
async $computeDiff(originalUrl, modifiedUrl, options, algorithm) {
|
|
266
53
|
const original = this._getModel(originalUrl);
|
|
267
54
|
const modified = this._getModel(modifiedUrl);
|
|
268
55
|
if (!original || !modified) {
|
|
@@ -319,7 +106,7 @@ class EditorSimpleWorker {
|
|
|
319
106
|
}
|
|
320
107
|
return true;
|
|
321
108
|
}
|
|
322
|
-
async computeDirtyDiff(originalUrl, modifiedUrl, ignoreTrimWhitespace) {
|
|
109
|
+
async $computeDirtyDiff(originalUrl, modifiedUrl, ignoreTrimWhitespace) {
|
|
323
110
|
const original = this._getModel(originalUrl);
|
|
324
111
|
const modified = this._getModel(modifiedUrl);
|
|
325
112
|
if (!original || !modified) {
|
|
@@ -337,7 +124,7 @@ class EditorSimpleWorker {
|
|
|
337
124
|
return diffComputer.computeDiff().changes;
|
|
338
125
|
}
|
|
339
126
|
static { this._diffLimit = 100000; }
|
|
340
|
-
async computeMoreMinimalEdits(modelUrl, edits, pretty) {
|
|
127
|
+
async $computeMoreMinimalEdits(modelUrl, edits, pretty) {
|
|
341
128
|
const model = this._getModel(modelUrl);
|
|
342
129
|
if (!model) {
|
|
343
130
|
return edits;
|
|
@@ -399,7 +186,7 @@ class EditorSimpleWorker {
|
|
|
399
186
|
}
|
|
400
187
|
return result;
|
|
401
188
|
}
|
|
402
|
-
computeHumanReadableDiff(modelUrl, edits, options) {
|
|
189
|
+
$computeHumanReadableDiff(modelUrl, edits, options) {
|
|
403
190
|
const model = this._getModel(modelUrl);
|
|
404
191
|
if (!model) {
|
|
405
192
|
return edits;
|
|
@@ -478,14 +265,14 @@ class EditorSimpleWorker {
|
|
|
478
265
|
}
|
|
479
266
|
return result;
|
|
480
267
|
}
|
|
481
|
-
async computeLinks(modelUrl) {
|
|
268
|
+
async $computeLinks(modelUrl) {
|
|
482
269
|
const model = this._getModel(modelUrl);
|
|
483
270
|
if (!model) {
|
|
484
271
|
return null;
|
|
485
272
|
}
|
|
486
273
|
return computeLinks(model);
|
|
487
274
|
}
|
|
488
|
-
async computeDefaultDocumentColors(modelUrl) {
|
|
275
|
+
async $computeDefaultDocumentColors(modelUrl) {
|
|
489
276
|
const model = this._getModel(modelUrl);
|
|
490
277
|
if (!model) {
|
|
491
278
|
return null;
|
|
@@ -493,7 +280,7 @@ class EditorSimpleWorker {
|
|
|
493
280
|
return computeDefaultDocumentColors(model);
|
|
494
281
|
}
|
|
495
282
|
static { this._suggestionsLimit = 10000; }
|
|
496
|
-
async textualSuggest(modelUrls, leadingWord, wordDef, wordDefFlags) {
|
|
283
|
+
async $textualSuggest(modelUrls, leadingWord, wordDef, wordDefFlags) {
|
|
497
284
|
const sw = ( new StopWatch());
|
|
498
285
|
const wordDefRegExp = ( new RegExp(wordDef, wordDefFlags));
|
|
499
286
|
const seen = ( new Set());
|
|
@@ -514,7 +301,7 @@ class EditorSimpleWorker {
|
|
|
514
301
|
}
|
|
515
302
|
return { words: Array.from(seen), duration: sw.elapsed() };
|
|
516
303
|
}
|
|
517
|
-
async computeWordRanges(modelUrl, range, wordDef, wordDefFlags) {
|
|
304
|
+
async $computeWordRanges(modelUrl, range, wordDef, wordDefFlags) {
|
|
518
305
|
const model = this._getModel(modelUrl);
|
|
519
306
|
if (!model) {
|
|
520
307
|
return Object.create(null);
|
|
@@ -542,7 +329,7 @@ class EditorSimpleWorker {
|
|
|
542
329
|
}
|
|
543
330
|
return result;
|
|
544
331
|
}
|
|
545
|
-
async navigateValueSet(modelUrl, range, up, wordDef, wordDefFlags) {
|
|
332
|
+
async $navigateValueSet(modelUrl, range, up, wordDef, wordDefFlags) {
|
|
546
333
|
const model = this._getModel(modelUrl);
|
|
547
334
|
if (!model) {
|
|
548
335
|
return null;
|
|
@@ -565,9 +352,20 @@ class EditorSimpleWorker {
|
|
|
565
352
|
const result = BasicInplaceReplace.INSTANCE.navigateValueSet(range, selectionText, wordRange, word, up);
|
|
566
353
|
return result;
|
|
567
354
|
}
|
|
568
|
-
|
|
355
|
+
}
|
|
356
|
+
class EditorSimpleWorker extends BaseEditorSimpleWorker {
|
|
357
|
+
constructor(_host, _foreignModuleFactory) {
|
|
358
|
+
super();
|
|
359
|
+
this._host = _host;
|
|
360
|
+
this._foreignModuleFactory = _foreignModuleFactory;
|
|
361
|
+
this._foreignModule = null;
|
|
362
|
+
}
|
|
363
|
+
async $ping() {
|
|
364
|
+
return 'pong';
|
|
365
|
+
}
|
|
366
|
+
$loadForeignModule(moduleId, createData, foreignHostMethods) {
|
|
569
367
|
const proxyMethodRequest = (method, args) => {
|
|
570
|
-
return this._host
|
|
368
|
+
return this._host.$fhr(method, args);
|
|
571
369
|
};
|
|
572
370
|
const foreignHost = createProxyObject(foreignHostMethods, proxyMethodRequest);
|
|
573
371
|
const ctx = {
|
|
@@ -582,7 +380,7 @@ class EditorSimpleWorker {
|
|
|
582
380
|
}
|
|
583
381
|
return Promise.reject(( new Error(`Unexpected usage`)));
|
|
584
382
|
}
|
|
585
|
-
fmr(method, args) {
|
|
383
|
+
$fmr(method, args) {
|
|
586
384
|
if (!this._foreignModule || typeof this._foreignModule[method] !== 'function') {
|
|
587
385
|
return Promise.reject(( new Error('Missing requestHandler or method: ' + method)));
|
|
588
386
|
}
|
|
@@ -597,4 +395,4 @@ class EditorSimpleWorker {
|
|
|
597
395
|
if (typeof importScripts === 'function') {
|
|
598
396
|
globalThis.monaco = createMonacoBaseAPI();
|
|
599
397
|
}
|
|
600
|
-
export { EditorSimpleWorker };
|
|
398
|
+
export { BaseEditorSimpleWorker, EditorSimpleWorker };
|
|
@@ -3,7 +3,7 @@ import { URI } from '../../../base/common/uri.js';
|
|
|
3
3
|
import { IRange } from '../core/range.js';
|
|
4
4
|
import { IDocumentDiffProviderOptions, IDocumentDiff } from '../diff/documentDiffProvider.js';
|
|
5
5
|
import { IChange } from '../diff/legacyLinesDiffComputer.js';
|
|
6
|
-
import { TextEdit, IInplaceReplaceSupportResult } from '../languages.js';
|
|
6
|
+
import { TextEdit, IInplaceReplaceSupportResult, IColorInformation } from '../languages.js';
|
|
7
7
|
import { UnicodeHighlighterOptions } from './unicodeTextModelHighlighter.js';
|
|
8
8
|
import { FindSectionHeaderOptions, SectionHeader } from './findSectionHeaders.js';
|
|
9
9
|
|
|
@@ -14,7 +14,7 @@ interface IEditorWorkerService {
|
|
|
14
14
|
readonly _serviceBrand: undefined;
|
|
15
15
|
canComputeUnicodeHighlights(uri: URI): boolean;
|
|
16
16
|
computedUnicodeHighlights(uri: URI, options: UnicodeHighlighterOptions, range?: IRange): Promise<IUnicodeHighlightsResult>;
|
|
17
|
-
/** Implementation in {@link
|
|
17
|
+
/** Implementation in {@link BaseEditorSimpleWorker.computeDiff} */
|
|
18
18
|
computeDiff(original: URI, modified: URI, options: IDocumentDiffProviderOptions, algorithm: DiffAlgorithmName): Promise<IDocumentDiff | null>;
|
|
19
19
|
canComputeDirtyDiff(original: URI, modified: URI): boolean;
|
|
20
20
|
computeDirtyDiff(original: URI, modified: URI, ignoreTrimWhitespace: boolean): Promise<IChange[] | null>;
|
|
@@ -27,6 +27,7 @@ interface IEditorWorkerService {
|
|
|
27
27
|
canNavigateValueSet(resource: URI): boolean;
|
|
28
28
|
navigateValueSet(resource: URI, range: IRange, up: boolean): Promise<IInplaceReplaceSupportResult | null>;
|
|
29
29
|
findSectionHeaders(uri: URI, options: FindSectionHeaderOptions): Promise<SectionHeader[]>;
|
|
30
|
+
computeDefaultDocumentColors(uri: URI): Promise<IColorInformation[] | null>;
|
|
30
31
|
}
|
|
31
32
|
interface IUnicodeHighlightsResult {
|
|
32
33
|
ranges: IRange[];
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { SimpleWorkerServer } from '../../../base/common/worker/simpleWorker.js';
|
|
2
|
+
import { EditorSimpleWorker } from './editorSimpleWorker.js';
|
|
3
|
+
import { EditorWorkerHost } from './editorWorkerHost.js';
|
|
4
|
+
let initialized = false;
|
|
5
|
+
function initialize(factory) {
|
|
6
|
+
if (initialized) {
|
|
7
|
+
return;
|
|
8
|
+
}
|
|
9
|
+
initialized = true;
|
|
10
|
+
const simpleWorker = ( new SimpleWorkerServer((msg) => {
|
|
11
|
+
globalThis.postMessage(msg);
|
|
12
|
+
}, (workerServer) => ( new EditorSimpleWorker(EditorWorkerHost.getChannel(workerServer), null))));
|
|
13
|
+
globalThis.onmessage = (e) => {
|
|
14
|
+
simpleWorker.onmessage(e.data);
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
globalThis.onmessage = (e) => {
|
|
18
|
+
if (!initialized) {
|
|
19
|
+
initialize();
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
function bootstrapSimpleEditorWorker(createFn) {
|
|
23
|
+
globalThis.onmessage = () => {
|
|
24
|
+
initialize();
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
export { bootstrapSimpleEditorWorker, initialize };
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
class EditorWorkerHost {
|
|
2
|
+
static { this.CHANNEL_NAME = 'editorWorkerHost'; }
|
|
3
|
+
static getChannel(workerServer) {
|
|
4
|
+
return workerServer.getChannel(EditorWorkerHost.CHANNEL_NAME);
|
|
5
|
+
}
|
|
6
|
+
static setChannel(workerClient, obj) {
|
|
7
|
+
workerClient.setChannel(EditorWorkerHost.CHANNEL_NAME, obj);
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
export { EditorWorkerHost };
|
|
@@ -84,6 +84,6 @@ function detectLanguageId(modelService, languageService, resource) {
|
|
|
84
84
|
return languageService.guessLanguageIdByFilepathOrFirstLine(resource);
|
|
85
85
|
}
|
|
86
86
|
function cssEscape(str) {
|
|
87
|
-
return str.replace(/[\
|
|
87
|
+
return str.replace(/[\s]/g, '/');
|
|
88
88
|
}
|
|
89
89
|
export { getIconClasses, getIconClassesForLanguageId };
|
|
@@ -1,9 +1,13 @@
|
|
|
1
|
-
import { Emitter } from '../../../base/common/event.js';
|
|
1
|
+
import { Emitter, Event } from '../../../base/common/event.js';
|
|
2
2
|
import { Disposable } from '../../../base/common/lifecycle.js';
|
|
3
3
|
import { LanguagesRegistry } from './languagesRegistry.js';
|
|
4
4
|
import { firstOrDefault } from '../../../base/common/arrays.js';
|
|
5
5
|
import { TokenizationRegistry } from '../languages.js';
|
|
6
6
|
import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
|
|
7
|
+
import '../../../base/common/observableInternal/derived.js';
|
|
8
|
+
import '../../../base/common/observableInternal/autorun.js';
|
|
9
|
+
import { observableFromEvent } from '../../../base/common/observableInternal/utils.js';
|
|
10
|
+
import '../../../base/common/cancellation.js';
|
|
7
11
|
class LanguageService extends Disposable {
|
|
8
12
|
static { this.instanceCount = 0; }
|
|
9
13
|
constructor(warnOnOverwrite = false) {
|
|
@@ -106,43 +110,12 @@ class LanguageService extends Disposable {
|
|
|
106
110
|
}
|
|
107
111
|
}
|
|
108
112
|
class LanguageSelection {
|
|
109
|
-
constructor(
|
|
110
|
-
this.
|
|
111
|
-
this.
|
|
112
|
-
this._listener = null;
|
|
113
|
-
this._emitter = null;
|
|
114
|
-
this.languageId = this._selector();
|
|
115
|
-
}
|
|
116
|
-
_dispose() {
|
|
117
|
-
if (this._listener) {
|
|
118
|
-
this._listener.dispose();
|
|
119
|
-
this._listener = null;
|
|
120
|
-
}
|
|
121
|
-
if (this._emitter) {
|
|
122
|
-
this._emitter.dispose();
|
|
123
|
-
this._emitter = null;
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
|
-
get onDidChange() {
|
|
127
|
-
if (!this._listener) {
|
|
128
|
-
this._listener = this._onDidChangeLanguages(() => this._evaluate());
|
|
129
|
-
}
|
|
130
|
-
if (!this._emitter) {
|
|
131
|
-
this._emitter = ( new Emitter({
|
|
132
|
-
onDidRemoveLastListener: () => {
|
|
133
|
-
this._dispose();
|
|
134
|
-
}
|
|
135
|
-
}));
|
|
136
|
-
}
|
|
137
|
-
return this._emitter.event;
|
|
113
|
+
constructor(onDidChangeLanguages, selector) {
|
|
114
|
+
this._value = observableFromEvent(this, onDidChangeLanguages, () => selector());
|
|
115
|
+
this.onDidChange = Event.fromObservable(this._value);
|
|
138
116
|
}
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
if (languageId === this.languageId) {
|
|
142
|
-
return;
|
|
143
|
-
}
|
|
144
|
-
this.languageId = languageId;
|
|
145
|
-
this._emitter?.fire(this.languageId);
|
|
117
|
+
get languageId() {
|
|
118
|
+
return this._value.get();
|
|
146
119
|
}
|
|
147
120
|
}
|
|
148
121
|
export { LanguageService };
|
|
@@ -5,10 +5,9 @@ import { OS, OperatingSystem, isLinux, isMacintosh } from '../../../base/common/
|
|
|
5
5
|
import { EditOperation } from '../core/editOperation.js';
|
|
6
6
|
import { Range } from '../core/range.js';
|
|
7
7
|
import { DefaultEndOfLine, EndOfLineSequence, EndOfLinePreference } from '../model.js';
|
|
8
|
-
import {
|
|
8
|
+
import { TextModel, createTextBuffer } from '../model/textModel.js';
|
|
9
9
|
import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
|
|
10
10
|
import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
|
|
11
|
-
import { ILanguageService } from '../languages/language.js';
|
|
12
11
|
import { ITextResourcePropertiesService } from './textResourceConfiguration.js';
|
|
13
12
|
import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
|
|
14
13
|
import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.service.js';
|
|
@@ -16,7 +15,7 @@ import { StringSHA1 } from '../../../base/common/hash.js';
|
|
|
16
15
|
import { isEditStackElement } from '../model/editStack.js';
|
|
17
16
|
import { Schemas } from '../../../base/common/network.js';
|
|
18
17
|
import { equals } from '../../../base/common/objects.js';
|
|
19
|
-
import {
|
|
18
|
+
import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
|
|
20
19
|
var ModelService_1;
|
|
21
20
|
function MODEL_ID(resource) {
|
|
22
21
|
return ( resource.toString());
|
|
@@ -49,13 +48,12 @@ class DisposedModelInfo {
|
|
|
49
48
|
let ModelService = class ModelService extends Disposable {
|
|
50
49
|
static { ModelService_1 = this; }
|
|
51
50
|
static { this.MAX_MEMORY_FOR_CLOSED_FILES_UNDO_STACK = 20 * 1024 * 1024; }
|
|
52
|
-
constructor(_configurationService, _resourcePropertiesService, _undoRedoService,
|
|
51
|
+
constructor(_configurationService, _resourcePropertiesService, _undoRedoService, _instantiationService) {
|
|
53
52
|
super();
|
|
54
53
|
this._configurationService = _configurationService;
|
|
55
54
|
this._resourcePropertiesService = _resourcePropertiesService;
|
|
56
55
|
this._undoRedoService = _undoRedoService;
|
|
57
|
-
this.
|
|
58
|
-
this._languageConfigurationService = _languageConfigurationService;
|
|
56
|
+
this._instantiationService = _instantiationService;
|
|
59
57
|
this._onModelAdded = this._register(( new Emitter()));
|
|
60
58
|
this.onModelAdded = this._onModelAdded.event;
|
|
61
59
|
this._onModelRemoved = this._register(( new Emitter()));
|
|
@@ -237,15 +235,7 @@ let ModelService = class ModelService extends Disposable {
|
|
|
237
235
|
}
|
|
238
236
|
_createModelData(value, languageIdOrSelection, resource, isForSimpleWidget) {
|
|
239
237
|
const options = this.getCreationOptions(languageIdOrSelection, resource, isForSimpleWidget);
|
|
240
|
-
const model = (
|
|
241
|
-
value,
|
|
242
|
-
languageIdOrSelection,
|
|
243
|
-
options,
|
|
244
|
-
resource,
|
|
245
|
-
this._undoRedoService,
|
|
246
|
-
this._languageService,
|
|
247
|
-
this._languageConfigurationService
|
|
248
|
-
));
|
|
238
|
+
const model = this._instantiationService.createInstance(TextModel, value, languageIdOrSelection, options, resource);
|
|
249
239
|
if (resource && ( this._disposedModels.has(MODEL_ID(resource)))) {
|
|
250
240
|
const disposedModelData = this._removeDisposedModel(resource);
|
|
251
241
|
const elements = this._undoRedoService.getElements(resource);
|
|
@@ -476,8 +466,7 @@ ModelService = ModelService_1 = ( __decorate([
|
|
|
476
466
|
( __param(0, IConfigurationService)),
|
|
477
467
|
( __param(1, ITextResourcePropertiesService)),
|
|
478
468
|
( __param(2, IUndoRedoService)),
|
|
479
|
-
( __param(3,
|
|
480
|
-
( __param(4, ILanguageConfigurationService))
|
|
469
|
+
( __param(3, IInstantiationService))
|
|
481
470
|
], ModelService));
|
|
482
471
|
class DefaultModelSHA1Computer {
|
|
483
472
|
static { this.MAX_MODEL_SIZE = 10 * 1024 * 1024; }
|