@codingame/monaco-vscode-api 18.4.0 → 19.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/missing-services.js +1217 -2932
- package/monaco.js +0 -3
- package/package.json +8 -8
- package/services.d.ts +12 -8
- package/services.js +12 -7
- package/vscode/product.json.js +1 -1
- package/vscode/src/vs/base/browser/dom.d.ts +83 -2
- package/vscode/src/vs/base/browser/dom.js +280 -3
- package/vscode/src/vs/base/browser/domStylesheets.d.ts +2 -0
- package/vscode/src/vs/base/browser/domStylesheets.js +11 -1
- package/vscode/src/vs/base/browser/markdownRenderer.d.ts +1 -0
- package/vscode/src/vs/base/browser/markdownRenderer.js +34 -18
- package/vscode/src/vs/base/browser/ui/button/button.js +4 -1
- package/vscode/src/vs/base/browser/ui/codicons/codicon/codicon.ttf +0 -0
- package/vscode/src/vs/base/browser/ui/list/list.d.ts +1 -0
- package/vscode/src/vs/base/browser/ui/list/listView.d.ts +1 -1
- package/vscode/src/vs/base/browser/ui/list/listView.js +5 -5
- package/vscode/src/vs/base/browser/ui/list/listWidget.d.ts +1 -1
- package/vscode/src/vs/base/browser/ui/list/listWidget.js +5 -1
- package/vscode/src/vs/base/browser/ui/toggle/toggle.d.ts +3 -1
- package/vscode/src/vs/base/browser/ui/toggle/toggle.js +21 -4
- package/vscode/src/vs/base/common/arrays.d.ts +0 -1
- package/vscode/src/vs/base/common/arrays.js +1 -6
- package/vscode/src/vs/base/common/async.d.ts +1 -0
- package/vscode/src/vs/base/common/async.js +2 -1
- package/vscode/src/vs/base/common/buffer.d.ts +1 -0
- package/vscode/src/vs/base/common/buffer.js +3 -0
- package/vscode/src/vs/base/common/codicons.d.ts +7 -0
- package/vscode/src/vs/base/common/codiconsLibrary.d.ts +7 -0
- package/vscode/src/vs/base/common/codiconsLibrary.js +7 -0
- package/vscode/src/vs/base/common/collections.d.ts +1 -0
- package/vscode/src/vs/base/common/collections.js +14 -1
- package/vscode/src/vs/base/common/color.js +2 -2
- package/vscode/src/vs/base/common/dataTransfer.d.ts +1 -1
- package/vscode/src/vs/base/common/decorators.d.ts +1 -1
- package/vscode/src/vs/base/common/event.d.ts +1 -1
- package/vscode/src/vs/base/common/glob.d.ts +1 -1
- package/vscode/src/vs/base/common/glob.js +2 -2
- package/vscode/src/vs/base/common/hotReloadHelpers.js +1 -1
- package/vscode/src/vs/base/common/iterator.d.ts +1 -1
- package/vscode/src/vs/base/common/network.d.ts +1 -0
- package/vscode/src/vs/base/common/network.js +1 -0
- package/vscode/src/vs/base/common/oauth.d.ts +34 -4
- package/vscode/src/vs/base/common/oauth.js +77 -6
- package/vscode/src/vs/base/common/observableInternal/index.d.ts +2 -2
- package/vscode/src/vs/base/common/observableInternal/logging/debugger/utils.js +8 -1
- package/vscode/src/vs/base/common/observableInternal/set.js +0 -1
- package/vscode/src/vs/base/common/performance.js +1 -1
- package/vscode/src/vs/base/common/product.d.ts +2 -1
- package/vscode/src/vs/base/common/types.d.ts +4 -8
- package/vscode/src/vs/base/common/types.js +3 -3
- package/vscode/src/vs/base/common/worker/webWorker.js +1 -1
- package/vscode/src/vs/editor/browser/config/migrateOptions.js +8 -0
- package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContext.d.ts +2 -0
- package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContext.js +18 -14
- package/vscode/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.js +5 -3
- package/vscode/src/vs/editor/browser/editorBrowser.d.ts +3 -1
- package/vscode/src/vs/editor/browser/gpu/atlas/textureAtlas.d.ts +3 -1
- package/vscode/src/vs/editor/browser/gpu/atlas/textureAtlas.js +5 -4
- package/vscode/src/vs/editor/browser/gpu/raster/glyphRasterizer.d.ts +3 -1
- package/vscode/src/vs/editor/browser/gpu/raster/glyphRasterizer.js +3 -3
- package/vscode/src/vs/editor/browser/gpu/viewGpuContext.js +2 -3
- package/vscode/src/vs/editor/browser/observableCodeEditor.d.ts +6 -0
- package/vscode/src/vs/editor/browser/observableCodeEditor.js +38 -1
- package/vscode/src/vs/editor/browser/services/abstractCodeEditorService.js +9 -1
- package/vscode/src/vs/editor/browser/services/bulkEditService.d.ts +2 -0
- package/vscode/src/vs/editor/browser/services/editorWorkerService.d.ts +4 -0
- package/vscode/src/vs/editor/browser/services/editorWorkerService.js +18 -2
- package/vscode/src/vs/editor/browser/services/inlineCompletionsService.d.ts +32 -0
- package/vscode/src/vs/editor/browser/services/inlineCompletionsService.js +141 -0
- package/vscode/src/vs/editor/browser/services/inlineCompletionsService.service.d.ts +11 -0
- package/vscode/src/vs/editor/browser/services/inlineCompletionsService.service.js +6 -0
- package/vscode/src/vs/editor/browser/view/domLineBreaksComputer.js +2 -2
- package/vscode/src/vs/editor/browser/view/viewController.js +5 -1
- package/vscode/src/vs/editor/browser/view.d.ts +1 -1
- package/vscode/src/vs/editor/browser/view.js +5 -5
- package/vscode/src/vs/editor/browser/viewParts/viewCursors/viewCursors.d.ts +1 -1
- package/vscode/src/vs/editor/browser/viewParts/viewCursors/viewCursors.js +3 -3
- package/vscode/src/vs/editor/browser/viewParts/viewLines/viewLine.js +14 -6
- package/vscode/src/vs/editor/browser/viewParts/viewLines/viewLineOptions.d.ts +1 -0
- package/vscode/src/vs/editor/browser/viewParts/viewLines/viewLineOptions.js +3 -7
- package/vscode/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.js +12 -2
- package/vscode/src/vs/editor/browser/viewParts/whitespace/whitespace.js +4 -2
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.d.ts +8 -2
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +39 -9
- package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js +12 -12
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.css +52 -49
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js +15 -15
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js +3 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js +2 -2
- 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/diffEditorViewModel.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js +7 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js +7 -7
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js +5 -5
- 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/common/config/editorConfigurationSchema.js +54 -54
- package/vscode/src/vs/editor/common/config/editorOptions.d.ts +173 -160
- package/vscode/src/vs/editor/common/config/editorOptions.js +645 -570
- package/vscode/src/vs/editor/common/config/fontInfo.js +1 -1
- package/vscode/src/vs/editor/common/core/2d/point.d.ts +5 -0
- package/vscode/src/vs/editor/common/core/2d/point.js +23 -0
- package/vscode/src/vs/editor/common/core/editorColorRegistry.js +71 -71
- package/vscode/src/vs/editor/common/core/edits/edit.d.ts +6 -0
- package/vscode/src/vs/editor/common/core/edits/edit.js +41 -0
- package/vscode/src/vs/editor/common/core/edits/lineEdit.d.ts +17 -11
- package/vscode/src/vs/editor/common/core/edits/lineEdit.js +36 -9
- package/vscode/src/vs/editor/common/core/edits/stringEdit.d.ts +63 -16
- package/vscode/src/vs/editor/common/core/edits/stringEdit.js +205 -48
- package/vscode/src/vs/editor/common/core/edits/textEdit.d.ts +5 -1
- package/vscode/src/vs/editor/common/core/edits/textEdit.js +18 -2
- package/vscode/src/vs/editor/common/core/text/abstractText.d.ts +3 -1
- package/vscode/src/vs/editor/common/core/text/abstractText.js +10 -1
- package/vscode/src/vs/editor/common/core/text/getPositionOffsetTransformerFromTextModel.js +2 -1
- package/vscode/src/vs/editor/common/core/text/positionToOffset.d.ts +2 -28
- package/vscode/src/vs/editor/common/core/text/positionToOffset.js +11 -92
- package/vscode/src/vs/editor/common/core/text/positionToOffsetImpl.d.ts +37 -0
- package/vscode/src/vs/editor/common/core/text/positionToOffsetImpl.js +104 -0
- package/vscode/src/vs/editor/common/cursor/cursor.d.ts +3 -2
- package/vscode/src/vs/editor/common/cursor/cursor.js +24 -16
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js +3 -1
- package/vscode/src/vs/editor/common/diff/rangeMapping.d.ts +1 -0
- package/vscode/src/vs/editor/common/diff/rangeMapping.js +11 -1
- package/vscode/src/vs/editor/common/editorCommon.d.ts +2 -1
- package/vscode/src/vs/editor/common/editorContextKeys.js +46 -46
- package/vscode/src/vs/editor/common/languages/defaultDocumentColorsComputer.js +1 -1
- package/vscode/src/vs/editor/common/languages/languageConfiguration.d.ts +5 -1
- package/vscode/src/vs/editor/common/languages/languageConfigurationRegistry.d.ts +1 -0
- package/vscode/src/vs/editor/common/languages/languageConfigurationRegistry.js +7 -1
- package/vscode/src/vs/editor/common/languages/modesRegistry.js +1 -1
- package/vscode/src/vs/editor/common/languages.d.ts +31 -27
- package/vscode/src/vs/editor/common/languages.js +57 -62
- package/vscode/src/vs/editor/common/model/editStack.d.ts +2 -1
- package/vscode/src/vs/editor/common/model/editStack.js +4 -3
- package/vscode/src/vs/editor/common/model/intervalTree.d.ts +2 -2
- package/vscode/src/vs/editor/common/model/intervalTree.js +24 -7
- package/vscode/src/vs/editor/common/model/textModel.d.ts +24 -10
- package/vscode/src/vs/editor/common/model/textModel.js +114 -53
- package/vscode/src/vs/editor/common/model/tokens/abstractSyntaxTokenBackend.js +1 -1
- package/vscode/src/vs/editor/common/model/tokens/treeSitter/treeSitterSyntaxTokenBackend.d.ts +0 -3
- package/vscode/src/vs/editor/common/model/tokens/treeSitter/treeSitterSyntaxTokenBackend.js +1 -13
- package/vscode/src/vs/editor/common/model/tokens/treeSitter/treeSitterTree.d.ts +2 -0
- package/vscode/src/vs/editor/common/model/tokens/treeSitter/treeSitterTree.js +13 -2
- package/vscode/src/vs/editor/common/model.d.ts +8 -2
- package/vscode/src/vs/editor/common/services/editorWebWorker.d.ts +4 -0
- package/vscode/src/vs/editor/common/services/editorWebWorker.js +14 -0
- package/vscode/src/vs/editor/common/services/editorWorker.service.d.ts +4 -0
- package/vscode/src/vs/editor/common/services/findSectionHeaders.js +7 -0
- package/vscode/src/vs/editor/common/services/languageFeatures.service.d.ts +1 -2
- package/vscode/src/vs/editor/common/services/languageFeaturesService.d.ts +1 -2
- package/vscode/src/vs/editor/common/services/languageFeaturesService.js +0 -1
- package/vscode/src/vs/editor/common/services/model.service.d.ts +2 -1
- package/vscode/src/vs/editor/common/services/modelService.d.ts +2 -1
- package/vscode/src/vs/editor/common/services/modelService.js +3 -2
- package/vscode/src/vs/editor/common/services/textResourceConfiguration.service.d.ts +1 -1
- package/vscode/src/vs/editor/common/standalone/standaloneEnums.d.ts +159 -157
- package/vscode/src/vs/editor/common/standalone/standaloneEnums.js +160 -159
- package/vscode/src/vs/editor/common/standaloneStrings.js +50 -49
- package/vscode/src/vs/editor/common/textModelEditReason.d.ts +94 -12
- package/vscode/src/vs/editor/common/textModelEditReason.js +86 -20
- package/vscode/src/vs/editor/common/textModelEvents.d.ts +24 -0
- package/vscode/src/vs/editor/common/textModelEvents.js +33 -1
- package/vscode/src/vs/editor/common/tokens/lineTokens.d.ts +22 -1
- package/vscode/src/vs/editor/common/tokens/lineTokens.js +79 -2
- package/vscode/src/vs/editor/common/viewLayout/viewLineRenderer.js +2 -2
- package/vscode/src/vs/editor/common/viewModel/viewModelDecorations.d.ts +5 -1
- package/vscode/src/vs/editor/common/viewModel/viewModelDecorations.js +10 -4
- package/vscode/src/vs/editor/common/viewModel/viewModelImpl.d.ts +3 -1
- package/vscode/src/vs/editor/common/viewModel/viewModelImpl.js +39 -12
- package/vscode/src/vs/editor/common/viewModel/viewModelLines.d.ts +3 -3
- package/vscode/src/vs/editor/common/viewModel/viewModelLines.js +6 -6
- package/vscode/src/vs/editor/common/viewModel.d.ts +3 -1
- package/vscode/src/vs/editor/common/viewModel.js +2 -1
- package/vscode/src/vs/editor/common/viewModelEventDispatcher.d.ts +11 -3
- package/vscode/src/vs/editor/common/viewModelEventDispatcher.js +14 -1
- 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 +20 -20
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js +3 -1
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionCommands.js +29 -29
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionContributions.js +3 -3
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +3 -3
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +8 -8
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +9 -9
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js +2 -2
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensWidget.css +2 -7
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerCloseButton.js +1 -1
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.js +1 -1
- package/vscode/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.js +3 -3
- package/vscode/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.js +1 -1
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerActions.js +7 -7
- package/vscode/src/vs/editor/contrib/comment/browser/comment.js +6 -6
- package/vscode/src/vs/editor/contrib/comment/browser/lineCommentCommand.d.ts +1 -1
- package/vscode/src/vs/editor/contrib/comment/browser/lineCommentCommand.js +9 -5
- 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 +4 -4
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +9 -9
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +8 -8
- 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 +16 -16
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +29 -29
- package/vscode/src/vs/editor/contrib/folding/browser/folding.js +20 -20
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +9 -9
- 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/link/goToDefinitionAtPosition.js +1 -1
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +3 -3
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js +3 -3
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +3 -3
- 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/gpu/browser/gpuActions.js +10 -5
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverRendered.js +3 -3
- package/vscode/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.js +2 -2
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js +2 -2
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js +24 -24
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +9 -9
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +10 -6
- package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +2 -2
- package/vscode/src/vs/editor/contrib/indentation/browser/indentation.d.ts +0 -1
- package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js +22 -47
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +8 -8
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.js +19 -19
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js +11 -11
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.d.ts +2 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js +11 -12
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js +3 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/animation.d.ts +7 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/animation.js +5 -5
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.d.ts +3 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.js +35 -30
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.js +2 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/graph.d.ts +9 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/graph.js +66 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.d.ts +12 -4
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.js +144 -100
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.d.ts +7 -5
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.js +100 -49
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.d.ts +3 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.d.ts +4 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.js +37 -29
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.d.ts +39 -13
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.js +150 -162
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.d.ts +0 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/utils.js +2 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.d.ts +2 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.js +12 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.js +9 -5
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.js +13 -10
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.js +2 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.d.ts +5 -5
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.d.ts +5 -4
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.js +5 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.d.ts +0 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.js +103 -62
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.d.ts +25 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.js +13 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCollapsedView.js +1 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCustomView.js +4 -6
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.d.ts +1 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.js +7 -4
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.d.ts +1 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.js +16 -12
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.d.ts +3 -4
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.js +34 -34
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.d.ts +1 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.js +13 -8
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.js +6 -7
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.d.ts +2 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.js +20 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.js +20 -20
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.js +4 -11
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css +10 -7
- package/vscode/src/vs/editor/contrib/insertFinalNewLine/browser/insertFinalNewLine.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/middleScroll/browser/middleScroll.contribution.d.ts +1 -0
- package/vscode/src/vs/editor/contrib/middleScroll/browser/middleScroll.contribution.js +5 -0
- package/vscode/src/vs/editor/contrib/middleScroll/browser/middleScroll.css +20 -0
- package/vscode/src/vs/editor/contrib/middleScroll/browser/middleScrollController.d.ts +9 -0
- package/vscode/src/vs/editor/contrib/middleScroll/browser/middleScrollController.js +132 -0
- 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 +9 -9
- package/vscode/src/vs/editor/contrib/peekView/browser/peekView.d.ts +1 -0
- package/vscode/src/vs/editor/contrib/peekView/browser/peekView.js +21 -17
- package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js +1 -1
- package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.css +0 -1
- package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js +2 -2
- package/vscode/src/vs/editor/contrib/rename/browser/rename.js +14 -12
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +6 -6
- package/vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.js +4 -4
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.d.ts +2 -0
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js +5 -5
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetSession.d.ts +2 -1
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetSession.js +3 -2
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js +4 -4
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css +24 -24
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +11 -11
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js +13 -13
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.js +18 -10
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.d.ts +4 -3
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.js +34 -39
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.d.ts +5 -6
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.js +65 -70
- package/vscode/src/vs/editor/contrib/suggest/browser/suggest.js +8 -8
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js +13 -11
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.d.ts +1 -1
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.js +1 -1
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.d.ts +1 -0
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js +18 -18
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +2 -2
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +4 -2
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.js +1 -1
- package/vscode/src/vs/editor/contrib/suggest/browser/wordContextKey.js +1 -1
- 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/bannerController.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/wordHighlighter.js +3 -3
- package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js +1 -1
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.d.ts +1 -1
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.js +5 -2
- package/vscode/src/vs/platform/accessibility/browser/accessibleView.d.ts +1 -1
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +79 -69
- 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.js +7 -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 +0 -1
- package/vscode/src/vs/platform/actions/common/actions.js +0 -1
- package/vscode/src/vs/platform/actions/common/menuResetAction.js +1 -1
- package/vscode/src/vs/platform/actions/common/menuService.js +2 -2
- package/vscode/src/vs/platform/configuration/common/configuration.js +4 -1
- package/vscode/src/vs/platform/configuration/common/configurationRegistry.js +11 -11
- package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js +1 -1
- package/vscode/src/vs/platform/contextkey/common/contextkey.js +11 -11
- 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.service.d.ts +1 -1
- package/vscode/src/vs/platform/dnd/browser/dnd.js +1 -1
- package/vscode/src/vs/platform/environment/common/argv.d.ts +11 -0
- package/vscode/src/vs/platform/environment/common/environment.service.d.ts +0 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.d.ts +1 -0
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +19 -19
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.service.d.ts +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementUtil.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js +7 -7
- package/vscode/src/vs/platform/extensions/common/extensionValidator.js +20 -20
- package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.d.ts +9 -3
- package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js +9 -3
- package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +2 -2
- package/vscode/src/vs/platform/files/common/files.d.ts +6 -1
- package/vscode/src/vs/platform/files/common/files.js +11 -7
- package/vscode/src/vs/platform/files/common/files.service.d.ts +1 -0
- package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js +1 -1
- package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.d.ts +2 -2
- package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js +4 -4
- package/vscode/src/vs/platform/keybinding/common/keybinding.service.d.ts +2 -1
- package/vscode/src/vs/platform/languagePacks/common/languagePacks.service.d.ts +1 -1
- package/vscode/src/vs/platform/list/browser/listService.d.ts +1 -7
- package/vscode/src/vs/platform/list/browser/listService.js +27 -27
- package/vscode/src/vs/platform/log/common/log.d.ts +4 -0
- package/vscode/src/vs/platform/log/common/log.js +15 -7
- package/vscode/src/vs/platform/markers/common/markerService.js +4 -3
- package/vscode/src/vs/platform/markers/common/markers.d.ts +2 -0
- package/vscode/src/vs/platform/markers/common/markers.js +6 -6
- package/vscode/src/vs/platform/mcp/common/mcpManagement.service.d.ts +9 -4
- package/vscode/src/vs/platform/mcp/common/mcpResourceScannerService.service.d.ts +10 -0
- package/vscode/src/vs/platform/mcp/common/mcpResourceScannerService.service.js +6 -0
- package/vscode/src/vs/platform/notification/common/notification.d.ts +1 -0
- package/vscode/src/vs/platform/notification/common/notification.js +12 -2
- package/vscode/src/vs/platform/product/common/product.js +3 -3
- package/vscode/src/vs/platform/quickinput/browser/quickInput.js +10 -10
- package/vscode/src/vs/platform/quickinput/browser/quickInputActions.js +3 -3
- package/vscode/src/vs/platform/quickinput/browser/quickInputController.js +7 -6
- package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +7 -12
- package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +1 -1
- package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts +2 -1
- package/vscode/src/vs/platform/remote/common/remoteAgentEnvironment.d.ts +1 -0
- package/vscode/src/vs/platform/remote/common/remoteAuthorityResolver.d.ts +2 -2
- package/vscode/src/vs/platform/request/common/request.d.ts +1 -1
- package/vscode/src/vs/platform/request/common/request.js +18 -18
- package/vscode/src/vs/platform/request/common/request.service.d.ts +1 -1
- package/vscode/src/vs/platform/telemetry/common/commonProperties.d.ts +1 -1
- package/vscode/src/vs/platform/telemetry/common/telemetry.d.ts +2 -0
- package/vscode/src/vs/platform/telemetry/common/telemetryUtils.js +1 -1
- package/vscode/src/vs/platform/terminal/common/terminal.d.ts +2 -1
- package/vscode/src/vs/platform/terminal/common/terminal.service.d.ts +2 -1
- package/vscode/src/vs/platform/theme/browser/defaultStyles.d.ts +1 -1
- package/vscode/src/vs/platform/theme/common/colorUtils.js +2 -2
- 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.d.ts +1 -0
- package/vscode/src/vs/platform/theme/common/colors/editorColors.js +95 -94
- package/vscode/src/vs/platform/theme/common/colors/inputColors.js +47 -47
- package/vscode/src/vs/platform/theme/common/colors/listColors.js +36 -36
- 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 +15 -15
- 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 +6 -6
- package/vscode/src/vs/platform/theme/common/themeService.d.ts +1 -1
- package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js +20 -20
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.d.ts +3 -1
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js +6 -2
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.d.ts +2 -1
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.js +7 -6
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.service.d.ts +1 -1
- package/vscode/src/vs/platform/window/common/window.d.ts +1 -0
- package/vscode/src/vs/platform/workspace/common/workspace.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +5 -7
- package/vscode/src/vs/workbench/api/common/extHost.protocol.d.ts +25 -24
- package/vscode/src/vs/workbench/api/common/extHostAuthentication.d.ts +10 -4
- package/vscode/src/vs/workbench/api/common/extHostAuthentication.js +109 -77
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.d.ts +2 -1
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +22 -0
- package/vscode/src/vs/workbench/api/common/extHostCommands.js +3 -0
- package/vscode/src/vs/workbench/api/common/extHostCustomEditors.d.ts +1 -1
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostDocuments.d.ts +4 -2
- package/vscode/src/vs/workbench/api/common/extHostDocuments.js +35 -5
- package/vscode/src/vs/workbench/api/common/extHostEditorTabs.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +3 -4
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.d.ts +1 -5
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +34 -182
- package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.d.ts +2 -2
- package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js +7 -2
- package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +2 -3
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostMcp.d.ts +3 -1
- package/vscode/src/vs/workbench/api/common/extHostMcp.js +71 -20
- package/vscode/src/vs/workbench/api/common/extHostNotebook.d.ts +1 -1
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +7 -5
- package/vscode/src/vs/workbench/api/common/extHostNotebookEditor.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostSCM.d.ts +1 -1
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +2 -1
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +7 -3
- package/vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.d.ts +4 -3
- package/vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.js +5 -2
- package/vscode/src/vs/workbench/api/common/extHostTextEditor.js +3 -0
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.d.ts +16 -7
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +20 -8
- package/vscode/src/vs/workbench/api/common/extHostTypes.d.ts +16 -13
- package/vscode/src/vs/workbench/api/common/extHostTypes.js +11 -12
- package/vscode/src/vs/workbench/api/common/extHostWebviewMessaging.d.ts +2 -2
- package/vscode/src/vs/workbench/api/common/extHostWebviewPanels.d.ts +1 -1
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +1 -1
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +12 -12
- package/vscode/src/vs/workbench/browser/actions/developerActions.js +31 -31
- package/vscode/src/vs/workbench/browser/actions/textInputActions.js +6 -6
- package/vscode/src/vs/workbench/browser/contextkeys.d.ts +1 -0
- package/vscode/src/vs/workbench/browser/contextkeys.js +6 -1
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.service.d.ts +1 -1
- package/vscode/src/vs/workbench/common/configuration.js +9 -9
- package/vscode/src/vs/workbench/common/contextkeys.d.ts +1 -0
- package/vscode/src/vs/workbench/common/contextkeys.js +73 -72
- package/vscode/src/vs/workbench/common/editor/editorInput.d.ts +1 -1
- package/vscode/src/vs/workbench/common/editor.d.ts +2 -1
- package/vscode/src/vs/workbench/common/editor.js +6 -6
- package/vscode/src/vs/workbench/common/theme.js +160 -160
- package/vscode/src/vs/workbench/common/views.js +4 -4
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +157 -160
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +12 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.service.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.service.d.ts +18 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAttachmentResolveService.service.js +6 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatContentParts.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.service.d.ts +4 -3
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.d.ts +9 -3
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +62 -41
- package/vscode/src/vs/workbench/contrib/chat/common/chatEditingService.d.ts +24 -5
- package/vscode/src/vs/workbench/contrib/chat/common/chatEditingService.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/common/chatEditingService.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatEntitlementService.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatService.d.ts +29 -9
- package/vscode/src/vs/workbench/contrib/chat/common/chatService.service.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/chat/common/chatSlashCommands.service.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/chat/common/chatVariableEntries.d.ts +152 -0
- package/vscode/src/vs/workbench/contrib/chat/common/chatVariableEntries.js +160 -0
- package/vscode/src/vs/workbench/contrib/chat/common/chatVariables.d.ts +2 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/constants.d.ts +5 -5
- package/vscode/src/vs/workbench/contrib/chat/common/constants.js +11 -24
- package/vscode/src/vs/workbench/contrib/chat/common/languageModelToolsService.d.ts +8 -1
- package/vscode/src/vs/workbench/contrib/chat/common/languageModelToolsService.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/common/languageModelToolsService.service.d.ts +4 -2
- package/vscode/src/vs/workbench/contrib/chat/common/languageModels.d.ts +5 -1
- package/vscode/src/vs/workbench/contrib/chat/common/languageModels.js +22 -7
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/base/frontMatterCodec/tokens/index.d.ts +5 -0
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/codecs/base/simpleCodec/tokens/tokens.d.ts +20 -0
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/contentProviders/types.d.ts +6 -4
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/types.d.ts +2 -17
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/{types.d.ts → promptsService.d.ts} +14 -7
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/{types.service.d.ts → promptsService.service.d.ts} +6 -7
- package/vscode/src/vs/workbench/contrib/chat/common/tools/editFileTool.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/chat/common/tools/editFileTool.js +1 -1
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +15 -15
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +6 -6
- 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/largeFileOptimizations.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +4 -4
- 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/commentService.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js +12 -12
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +11 -11
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +73 -65
- package/vscode/src/vs/workbench/contrib/debug/common/debugUtils.js +7 -0
- package/vscode/src/vs/workbench/contrib/extensions/common/extensions.js +1 -1
- package/vscode/src/vs/workbench/contrib/extensions/common/extensions.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/extensions/common/searchExtensionsTool.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +6 -6
- package/vscode/src/vs/workbench/contrib/files/browser/files.service.d.ts +3 -3
- 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/inlineChatSessionService.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js +2 -2
- package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js +5 -5
- package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.d.ts +55 -9
- package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.js +29 -13
- package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.service.d.ts +16 -6
- package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.service.js +2 -1
- package/vscode/src/vs/workbench/contrib/mcp/common/modelContextProtocol.d.ts +119 -31
- package/vscode/src/vs/workbench/contrib/mcp/common/modelContextProtocol.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.d.ts +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookService.service.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/preferences/common/preferences.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.service.d.ts +8 -0
- package/vscode/src/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.service.js +6 -0
- 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/constants.d.ts +3 -0
- package/vscode/src/vs/workbench/contrib/tasks/common/constants.js +10 -0
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +5 -5
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.d.ts +4 -3
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +13 -4
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts +6 -2
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.service.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/testing/common/constants.d.ts +2 -0
- package/vscode/src/vs/workbench/contrib/testing/common/constants.js +13 -11
- package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js +3 -3
- package/vscode/src/vs/workbench/contrib/webview/browser/webview.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service.d.ts +2 -2
- package/vscode/src/vs/workbench/services/accounts/common/defaultAccount.d.ts +1 -0
- package/vscode/src/vs/workbench/services/accounts/common/defaultAccount.js +6 -4
- package/vscode/src/vs/workbench/services/authentication/common/authentication.d.ts +4 -0
- package/vscode/src/vs/workbench/services/authentication/common/authentication.service.d.ts +1 -0
- package/vscode/src/vs/workbench/services/authentication/common/authenticationQuery.d.ts +132 -0
- package/vscode/src/vs/workbench/services/authentication/common/authenticationQuery.service.d.ts +20 -0
- package/vscode/src/vs/workbench/services/authentication/common/authenticationQuery.service.js +6 -0
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolver.service.d.ts +2 -2
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +16 -16
- package/vscode/src/vs/workbench/services/coreExperimentation/common/coreExperimentationService.service.d.ts +6 -0
- package/vscode/src/vs/workbench/services/coreExperimentation/common/coreExperimentationService.service.js +6 -0
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts +1 -1
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +1 -1
- package/vscode/src/vs/workbench/services/editor/common/editorService.d.ts +1 -1
- package/vscode/src/vs/workbench/services/editor/common/editorService.service.d.ts +2 -2
- package/vscode/src/vs/workbench/services/environment/common/environmentService.service.d.ts +1 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostProtocol.d.ts +1 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +84 -84
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service.d.ts +1 -1
- package/vscode/src/vs/workbench/services/host/browser/host.service.d.ts +1 -1
- package/vscode/src/vs/workbench/services/language/common/languageService.js +28 -28
- package/vscode/src/vs/workbench/services/layout/browser/layoutService.d.ts +2 -2
- package/vscode/src/vs/workbench/services/layout/browser/layoutService.js +17 -17
- package/vscode/src/vs/workbench/services/layout/browser/layoutService.service.d.ts +5 -1
- package/vscode/src/vs/workbench/services/localization/common/locale.service.d.ts +1 -1
- package/vscode/src/vs/workbench/services/log/common/logConstants.js +1 -1
- package/vscode/src/vs/workbench/services/mcp/common/mcpWorkbenchManagementService.service.d.ts +16 -0
- package/vscode/src/vs/workbench/services/mcp/common/mcpWorkbenchManagementService.service.js +6 -0
- package/vscode/src/vs/workbench/services/outline/browser/outline.service.d.ts +1 -1
- package/vscode/src/vs/workbench/services/preferences/common/preferences.service.d.ts +1 -1
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +8 -8
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +6 -6
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +3 -3
- package/vscode/src/vs/workbench/services/textfile/common/textfiles.d.ts +1 -1
- 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/userDataSync/common/userDataSync.js +13 -12
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackup.d.ts +1 -1
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackup.service.d.ts +1 -1
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyEditorService.service.d.ts +1 -1
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyFileService.service.d.ts +2 -2
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyService.service.d.ts +1 -1
- package/vscode-dts/vscode.proposed.authProviderSpecific.d.ts +30 -0
- package/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts +10 -0
- package/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts +10 -0
- package/vscode-dts/vscode.proposed.chatProvider.d.ts +139 -10
- package/vscode-dts/vscode.proposed.d.ts +3 -1
- package/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts +5 -0
- package/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts +21 -4
- package/vscode-dts/vscode.proposed.languageModelDataPart.d.ts +1 -0
- package/vscode-dts/vscode.proposed.remoteCodingAgents.d.ts +8 -0
- package/vscode-dts/vscode.proposed.terminalCompletionProvider.d.ts +2 -0
- package/vscode-dts/vscode.proposed.textDocumentChangeReason.d.ts +30 -0
- package/workbench.d.ts +1 -1
- package/vscode/src/vs/base/browser/domImpl/domObservable.d.ts +0 -3
- package/vscode/src/vs/base/browser/domImpl/domObservable.js +0 -16
- package/vscode/src/vs/base/browser/domImpl/n.d.ts +0 -83
- package/vscode/src/vs/base/browser/domImpl/n.js +0 -283
- package/vscode/src/vs/editor/common/codecs/frontMatterCodec/tokens/index.d.ts +0 -5
- package/vscode/src/vs/editor/common/codecs/simpleCodec/tokens/index.d.ts +0 -20
- package/vscode/src/vs/editor/common/tokens/tokenArray.d.ts +0 -25
- package/vscode/src/vs/editor/common/tokens/tokenArray.js +0 -84
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEditsAdapter.d.ts +0 -16
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEditsAdapter.js +0 -94
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.d.ts +0 -243
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +0 -426
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.d.ts +0 -601
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +0 -1185
- package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.d.ts +0 -130
- package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js +0 -235
- package/vscode/src/vs/workbench/contrib/chat/common/modelPicker/modelPickerWidget.d.ts +0 -4
- package/vscode/src/vs/workbench/contrib/chat/common/modelPicker/modelPickerWidget.js +0 -6
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/parsers/promptHeader/metadata/index.d.ts +0 -3
- package/vscode/src/vs/workbench/contrib/mcp/common/mcpConfigPathsService.service.d.ts +0 -7
- package/vscode/src/vs/workbench/contrib/mcp/common/mcpConfigPathsService.service.js +0 -6
- package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExpService.service.d.ts +0 -6
- package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedExpService.service.js +0 -6
- package/vscode-dts/vscode.proposed.inlineEdit.d.ts +0 -103
- /package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/{types.service.js → promptsService.service.js} +0 -0
|
@@ -400,7 +400,13 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
|
|
|
400
400
|
const curLineNumber = this._editors.modified.getPosition().lineNumber;
|
|
401
401
|
let diff;
|
|
402
402
|
if (target === 'next') {
|
|
403
|
-
|
|
403
|
+
const modifiedLineCount = this._editors.modified.getModel().getLineCount();
|
|
404
|
+
if (modifiedLineCount === curLineNumber) {
|
|
405
|
+
diff = diffs[0];
|
|
406
|
+
}
|
|
407
|
+
else {
|
|
408
|
+
diff = diffs.find(d => d.lineRangeMapping.modified.startLineNumber > curLineNumber) ?? diffs[0];
|
|
409
|
+
}
|
|
404
410
|
}
|
|
405
411
|
else {
|
|
406
412
|
diff = findLast(diffs, d => d.lineRangeMapping.modified.startLineNumber < curLineNumber) ?? diffs[diffs.length - 1];
|
|
@@ -22,8 +22,8 @@ import { ActionRunnerWithContext } from '../../multiDiffEditor/utils.js';
|
|
|
22
22
|
import { DiffEditorSash } from '../components/diffEditorSash.js';
|
|
23
23
|
import { prependRemoveOnDispose, applyStyle, appendRemoveOnDispose } from '../utils.js';
|
|
24
24
|
import { EditorGutter } from '../utils/editorGutter.js';
|
|
25
|
-
import { derived, derivedDisposable, derivedWithSetter } from '../../../../../base/common/observableInternal/observables/derived.js';
|
|
26
25
|
import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
|
|
26
|
+
import { derived, derivedDisposable, derivedWithSetter } from '../../../../../base/common/observableInternal/observables/derived.js';
|
|
27
27
|
import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
|
|
28
28
|
import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
|
|
29
29
|
|
package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js
CHANGED
|
@@ -156,7 +156,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
|
|
|
156
156
|
const unchangedLinesDecorationShow = {
|
|
157
157
|
description: 'Fold Unchanged',
|
|
158
158
|
glyphMarginHoverMessage: ( new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true }))
|
|
159
|
-
.appendMarkdown(( localize(
|
|
159
|
+
.appendMarkdown(( localize(192, 'Fold Unchanged Region'))),
|
|
160
160
|
glyphMarginClassName: 'fold-unchanged ' + ThemeIcon.asClassName(Codicon.fold),
|
|
161
161
|
zIndex: 10001,
|
|
162
162
|
};
|
|
@@ -258,7 +258,7 @@ class CompactCollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
|
|
|
258
258
|
this._register(autorun(reader => {
|
|
259
259
|
if (!this._hide) {
|
|
260
260
|
const lineCount = this._unchangedRegion.getHiddenModifiedRange(reader).length;
|
|
261
|
-
const linesHiddenText = ( localize(
|
|
261
|
+
const linesHiddenText = ( localize(193, '{0} hidden lines', lineCount));
|
|
262
262
|
this._nodes.text.innerText = linesHiddenText;
|
|
263
263
|
}
|
|
264
264
|
}));
|
|
@@ -276,12 +276,12 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
|
|
|
276
276
|
this._revealModifiedHiddenLine = _revealModifiedHiddenLine;
|
|
277
277
|
this._options = _options;
|
|
278
278
|
this._nodes = h('div.diff-hidden-lines', [
|
|
279
|
-
h('div.top@top', { title: ( localize(
|
|
279
|
+
h('div.top@top', { title: ( localize(194, 'Click or drag to show more above')) }),
|
|
280
280
|
h('div.center@content', { style: { display: 'flex' } }, [
|
|
281
|
-
h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localize(
|
|
281
|
+
h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localize(195, 'Show Unchanged Region')), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
|
|
282
282
|
h('div@others', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center' } }),
|
|
283
283
|
]),
|
|
284
|
-
h('div.bottom@bottom', { title: ( localize(
|
|
284
|
+
h('div.bottom@bottom', { title: ( localize(196, 'Click or drag to show more below')), role: 'button' }),
|
|
285
285
|
]);
|
|
286
286
|
root.root.appendChild(this._nodes.root);
|
|
287
287
|
if (!this._hide) {
|
|
@@ -391,8 +391,8 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
|
|
|
391
391
|
const children = [];
|
|
392
392
|
if (!this._hide) {
|
|
393
393
|
const lineCount = _unchangedRegion.getHiddenModifiedRange(reader).length;
|
|
394
|
-
const linesHiddenText = ( localize(
|
|
395
|
-
const span = $('span', { title: ( localize(
|
|
394
|
+
const linesHiddenText = ( localize(193, '{0} hidden lines', lineCount));
|
|
395
|
+
const span = $('span', { title: ( localize(197, 'Double click to unfold')) }, linesHiddenText);
|
|
396
396
|
span.addEventListener('dblclick', e => {
|
|
397
397
|
if (e.button !== 0) {
|
|
398
398
|
return;
|
|
@@ -11,12 +11,12 @@ import { ThemeIcon } from '../../../../../base/common/themables.js';
|
|
|
11
11
|
import { PlaceholderViewZone, applyViewZones, ViewZoneOverlayWidget, applyStyle } from '../utils.js';
|
|
12
12
|
import { OffsetRange, OffsetRangeSet } from '../../../../common/core/ranges/offsetRange.js';
|
|
13
13
|
import { localize } from '../../../../../nls.js';
|
|
14
|
-
import { recomputeInitiallyAndOnChange } from '../../../../../base/common/observableInternal/utils/utils.js';
|
|
15
14
|
import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
|
|
16
15
|
import { observableSignalFromEvent } from '../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
|
|
17
16
|
import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
|
|
18
17
|
import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
|
|
19
18
|
import { autorun, autorunWithStore, autorunHandleChanges } from '../../../../../base/common/observableInternal/reactions/autorun.js';
|
|
19
|
+
import { recomputeInitiallyAndOnChange } from '../../../../../base/common/observableInternal/utils/utils.js';
|
|
20
20
|
import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
|
|
21
21
|
|
|
22
22
|
class MovedBlocksLinesFeature extends Disposable {
|
|
@@ -251,12 +251,12 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
|
|
|
251
251
|
let text;
|
|
252
252
|
if (_move.changes.length > 0) {
|
|
253
253
|
text = this._kind === 'original' ? ( localize(
|
|
254
|
-
|
|
254
|
+
198,
|
|
255
255
|
'Code moved with changes to line {0}-{1}',
|
|
256
256
|
this._move.lineRangeMapping.modified.startLineNumber,
|
|
257
257
|
this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
|
|
258
258
|
)) : ( localize(
|
|
259
|
-
|
|
259
|
+
199,
|
|
260
260
|
'Code moved with changes from line {0}-{1}',
|
|
261
261
|
this._move.lineRangeMapping.original.startLineNumber,
|
|
262
262
|
this._move.lineRangeMapping.original.endLineNumberExclusive - 1
|
|
@@ -264,12 +264,12 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
|
|
|
264
264
|
}
|
|
265
265
|
else {
|
|
266
266
|
text = this._kind === 'original' ? ( localize(
|
|
267
|
-
|
|
267
|
+
200,
|
|
268
268
|
'Code moved to line {0}-{1}',
|
|
269
269
|
this._move.lineRangeMapping.modified.startLineNumber,
|
|
270
270
|
this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
|
|
271
271
|
)) : ( localize(
|
|
272
|
-
|
|
272
|
+
201,
|
|
273
273
|
'Code moved from line {0}-{1}',
|
|
274
274
|
this._move.lineRangeMapping.original.startLineNumber,
|
|
275
275
|
this._move.lineRangeMapping.original.endLineNumberExclusive - 1
|
|
@@ -102,8 +102,8 @@ class RevertButton extends Disposable {
|
|
|
102
102
|
this._id = `revertButton${RevertButton.counter++}`;
|
|
103
103
|
this._domNode = h('div.revertButton', {
|
|
104
104
|
title: this._revertSelection
|
|
105
|
-
? ( localize(
|
|
106
|
-
: ( localize(
|
|
105
|
+
? ( localize(202, 'Revert Selected Changes'))
|
|
106
|
+
: ( localize(203, 'Revert Change'))
|
|
107
107
|
}, [renderIcon(Codicon.arrowRight)]).root;
|
|
108
108
|
this._register(addDisposableListener(this._domNode, EventType.MOUSE_DOWN, e => {
|
|
109
109
|
if (e.button !== 2) {
|
|
@@ -16,11 +16,11 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
|
|
|
16
16
|
import '../../../../platform/theme/common/colors/searchColors.js';
|
|
17
17
|
import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
|
|
18
18
|
|
|
19
|
-
registerColor('diffEditor.move.border', '#8b8b8b9c', ( localize(
|
|
20
|
-
registerColor('diffEditor.moveActive.border', '#FFA500', ( localize(
|
|
21
|
-
registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localize(
|
|
22
|
-
const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localize(
|
|
23
|
-
const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localize(
|
|
19
|
+
registerColor('diffEditor.move.border', '#8b8b8b9c', ( localize(204, 'The border color for text that got moved in the diff editor.')));
|
|
20
|
+
registerColor('diffEditor.moveActive.border', '#FFA500', ( localize(205, 'The active border color for text that got moved in the diff editor.')));
|
|
21
|
+
registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localize(206, 'The color of the shadow around unchanged region widgets.')));
|
|
22
|
+
const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localize(207, 'Line decoration for inserts in the diff editor.')));
|
|
23
|
+
const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localize(208, 'Line decoration for removals in the diff editor.')));
|
|
24
24
|
const diffLineAddDecorationBackgroundWithIndicator = ModelDecorationOptions.register({
|
|
25
25
|
className: 'line-insert',
|
|
26
26
|
description: 'line-insert',
|
|
@@ -10,7 +10,7 @@ const editorConfigurationBaseNode = ( Object.freeze({
|
|
|
10
10
|
id: 'editor',
|
|
11
11
|
order: 5,
|
|
12
12
|
type: 'object',
|
|
13
|
-
title: ( localize(
|
|
13
|
+
title: ( localize(214, "Editor")),
|
|
14
14
|
scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
|
|
15
15
|
}));
|
|
16
16
|
const editorConfiguration = {
|
|
@@ -22,7 +22,7 @@ const editorConfiguration = {
|
|
|
22
22
|
minimum: 1,
|
|
23
23
|
maximum: 16,
|
|
24
24
|
markdownDescription: ( localize(
|
|
25
|
-
|
|
25
|
+
215,
|
|
26
26
|
"The number of spaces a tab is equal to. This setting is overridden based on the file contents when {0} is on.",
|
|
27
27
|
'`#editor.detectIndentation#`'
|
|
28
28
|
))
|
|
@@ -40,7 +40,7 @@ const editorConfiguration = {
|
|
|
40
40
|
],
|
|
41
41
|
default: 'tabSize',
|
|
42
42
|
markdownDescription: ( localize(
|
|
43
|
-
|
|
43
|
+
216,
|
|
44
44
|
"The number of spaces used for indentation or `\"tabSize\"` to use the value from `#editor.tabSize#`. This setting is overridden based on the file contents when `#editor.detectIndentation#` is on."
|
|
45
45
|
))
|
|
46
46
|
},
|
|
@@ -48,7 +48,7 @@ const editorConfiguration = {
|
|
|
48
48
|
type: 'boolean',
|
|
49
49
|
default: EDITOR_MODEL_DEFAULTS.insertSpaces,
|
|
50
50
|
markdownDescription: ( localize(
|
|
51
|
-
|
|
51
|
+
217,
|
|
52
52
|
"Insert spaces when pressing `Tab`. This setting is overridden based on the file contents when {0} is on.",
|
|
53
53
|
'`#editor.detectIndentation#`'
|
|
54
54
|
))
|
|
@@ -57,7 +57,7 @@ const editorConfiguration = {
|
|
|
57
57
|
type: 'boolean',
|
|
58
58
|
default: EDITOR_MODEL_DEFAULTS.detectIndentation,
|
|
59
59
|
markdownDescription: ( localize(
|
|
60
|
-
|
|
60
|
+
218,
|
|
61
61
|
"Controls whether {0} and {1} will be automatically detected when a file is opened based on the file contents.",
|
|
62
62
|
'`#editor.tabSize#`',
|
|
63
63
|
'`#editor.insertSpaces#`'
|
|
@@ -66,13 +66,13 @@ const editorConfiguration = {
|
|
|
66
66
|
'editor.trimAutoWhitespace': {
|
|
67
67
|
type: 'boolean',
|
|
68
68
|
default: EDITOR_MODEL_DEFAULTS.trimAutoWhitespace,
|
|
69
|
-
description: ( localize(
|
|
69
|
+
description: ( localize(219, "Remove trailing auto inserted whitespace."))
|
|
70
70
|
},
|
|
71
71
|
'editor.largeFileOptimizations': {
|
|
72
72
|
type: 'boolean',
|
|
73
73
|
default: EDITOR_MODEL_DEFAULTS.largeFileOptimizations,
|
|
74
74
|
description: ( localize(
|
|
75
|
-
|
|
75
|
+
220,
|
|
76
76
|
"Special handling for large files to disable certain memory intensive features."
|
|
77
77
|
))
|
|
78
78
|
},
|
|
@@ -80,29 +80,29 @@ const editorConfiguration = {
|
|
|
80
80
|
enum: ['off', 'currentDocument', 'matchingDocuments', 'allDocuments'],
|
|
81
81
|
default: 'matchingDocuments',
|
|
82
82
|
enumDescriptions: [
|
|
83
|
-
( localize(
|
|
84
|
-
( localize(
|
|
85
|
-
( localize(
|
|
86
|
-
( localize(
|
|
83
|
+
( localize(221, 'Turn off Word Based Suggestions.')),
|
|
84
|
+
( localize(222, 'Only suggest words from the active document.')),
|
|
85
|
+
( localize(223, 'Suggest words from all open documents of the same language.')),
|
|
86
|
+
( localize(224, 'Suggest words from all open documents.'))
|
|
87
87
|
],
|
|
88
88
|
description: ( localize(
|
|
89
|
-
|
|
89
|
+
225,
|
|
90
90
|
"Controls whether completions should be computed based on words in the document and from which documents they are computed."
|
|
91
91
|
))
|
|
92
92
|
},
|
|
93
93
|
'editor.semanticHighlighting.enabled': {
|
|
94
94
|
enum: [true, false, 'configuredByTheme'],
|
|
95
95
|
enumDescriptions: [
|
|
96
|
-
( localize(
|
|
97
|
-
( localize(
|
|
96
|
+
( localize(226, 'Semantic highlighting enabled for all color themes.')),
|
|
97
|
+
( localize(227, 'Semantic highlighting disabled for all color themes.')),
|
|
98
98
|
( localize(
|
|
99
|
-
|
|
99
|
+
228,
|
|
100
100
|
'Semantic highlighting is configured by the current color theme\'s `semanticHighlighting` setting.'
|
|
101
101
|
))
|
|
102
102
|
],
|
|
103
103
|
default: 'configuredByTheme',
|
|
104
104
|
description: ( localize(
|
|
105
|
-
|
|
105
|
+
229,
|
|
106
106
|
"Controls whether the semanticHighlighting is shown for the languages that support it."
|
|
107
107
|
))
|
|
108
108
|
},
|
|
@@ -110,7 +110,7 @@ const editorConfiguration = {
|
|
|
110
110
|
type: 'boolean',
|
|
111
111
|
default: false,
|
|
112
112
|
markdownDescription: ( localize(
|
|
113
|
-
|
|
113
|
+
230,
|
|
114
114
|
"Keep peek editors open even when double-clicking their content or when hitting `Escape`."
|
|
115
115
|
))
|
|
116
116
|
},
|
|
@@ -118,7 +118,7 @@ const editorConfiguration = {
|
|
|
118
118
|
type: 'integer',
|
|
119
119
|
default: 20_000,
|
|
120
120
|
description: ( localize(
|
|
121
|
-
|
|
121
|
+
231,
|
|
122
122
|
"Lines above this length will not be tokenized for performance reasons"
|
|
123
123
|
))
|
|
124
124
|
},
|
|
@@ -126,7 +126,7 @@ const editorConfiguration = {
|
|
|
126
126
|
type: 'boolean',
|
|
127
127
|
default: true,
|
|
128
128
|
description: ( localize(
|
|
129
|
-
|
|
129
|
+
232,
|
|
130
130
|
"Controls whether the tokenization should happen asynchronously on a web worker."
|
|
131
131
|
)),
|
|
132
132
|
tags: ['experimental'],
|
|
@@ -135,7 +135,7 @@ const editorConfiguration = {
|
|
|
135
135
|
type: 'boolean',
|
|
136
136
|
default: false,
|
|
137
137
|
description: ( localize(
|
|
138
|
-
|
|
138
|
+
233,
|
|
139
139
|
"Controls whether async tokenization should be logged. For debugging only."
|
|
140
140
|
)),
|
|
141
141
|
},
|
|
@@ -143,7 +143,7 @@ const editorConfiguration = {
|
|
|
143
143
|
type: 'boolean',
|
|
144
144
|
default: false,
|
|
145
145
|
description: ( localize(
|
|
146
|
-
|
|
146
|
+
234,
|
|
147
147
|
"Controls whether async tokenization should be verified against legacy background tokenization. Might slow down tokenization. For debugging only."
|
|
148
148
|
)),
|
|
149
149
|
tags: ['experimental'],
|
|
@@ -152,7 +152,7 @@ const editorConfiguration = {
|
|
|
152
152
|
type: 'boolean',
|
|
153
153
|
default: false,
|
|
154
154
|
markdownDescription: ( localize(
|
|
155
|
-
|
|
155
|
+
235,
|
|
156
156
|
"Controls whether tree sitter parsing should be turned on and telemetry collected. Setting `editor.experimental.preferTreeSitter` for specific languages will take precedence."
|
|
157
157
|
)),
|
|
158
158
|
tags: ['experimental', 'onExP']
|
|
@@ -161,7 +161,7 @@ const editorConfiguration = {
|
|
|
161
161
|
type: 'boolean',
|
|
162
162
|
default: false,
|
|
163
163
|
markdownDescription: ( localize(
|
|
164
|
-
|
|
164
|
+
236,
|
|
165
165
|
"Controls whether tree sitter parsing should be turned on for css. This will take precedence over `editor.experimental.treeSitterTelemetry` for css."
|
|
166
166
|
)),
|
|
167
167
|
tags: ['experimental', 'onExP']
|
|
@@ -170,7 +170,7 @@ const editorConfiguration = {
|
|
|
170
170
|
type: 'boolean',
|
|
171
171
|
default: false,
|
|
172
172
|
markdownDescription: ( localize(
|
|
173
|
-
|
|
173
|
+
237,
|
|
174
174
|
"Controls whether tree sitter parsing should be turned on for typescript. This will take precedence over `editor.experimental.treeSitterTelemetry` for typescript."
|
|
175
175
|
)),
|
|
176
176
|
tags: ['experimental', 'onExP']
|
|
@@ -179,7 +179,7 @@ const editorConfiguration = {
|
|
|
179
179
|
type: 'boolean',
|
|
180
180
|
default: false,
|
|
181
181
|
markdownDescription: ( localize(
|
|
182
|
-
|
|
182
|
+
238,
|
|
183
183
|
"Controls whether tree sitter parsing should be turned on for ini. This will take precedence over `editor.experimental.treeSitterTelemetry` for ini."
|
|
184
184
|
)),
|
|
185
185
|
tags: ['experimental', 'onExP']
|
|
@@ -188,7 +188,7 @@ const editorConfiguration = {
|
|
|
188
188
|
type: 'boolean',
|
|
189
189
|
default: false,
|
|
190
190
|
markdownDescription: ( localize(
|
|
191
|
-
|
|
191
|
+
239,
|
|
192
192
|
"Controls whether tree sitter parsing should be turned on for regex. This will take precedence over `editor.experimental.treeSitterTelemetry` for regex."
|
|
193
193
|
)),
|
|
194
194
|
tags: ['experimental', 'onExP']
|
|
@@ -197,7 +197,7 @@ const editorConfiguration = {
|
|
|
197
197
|
type: ['array', 'null'],
|
|
198
198
|
default: null,
|
|
199
199
|
description: ( localize(
|
|
200
|
-
|
|
200
|
+
240,
|
|
201
201
|
'Defines the bracket symbols that increase or decrease the indentation.'
|
|
202
202
|
)),
|
|
203
203
|
items: {
|
|
@@ -205,11 +205,11 @@ const editorConfiguration = {
|
|
|
205
205
|
items: [
|
|
206
206
|
{
|
|
207
207
|
type: 'string',
|
|
208
|
-
description: ( localize(
|
|
208
|
+
description: ( localize(241, 'The opening bracket character or string sequence.'))
|
|
209
209
|
},
|
|
210
210
|
{
|
|
211
211
|
type: 'string',
|
|
212
|
-
description: ( localize(
|
|
212
|
+
description: ( localize(242, 'The closing bracket character or string sequence.'))
|
|
213
213
|
}
|
|
214
214
|
]
|
|
215
215
|
}
|
|
@@ -218,7 +218,7 @@ const editorConfiguration = {
|
|
|
218
218
|
type: ['array', 'null'],
|
|
219
219
|
default: null,
|
|
220
220
|
description: ( localize(
|
|
221
|
-
|
|
221
|
+
243,
|
|
222
222
|
'Defines the bracket pairs that are colorized by their nesting level if bracket pair colorization is enabled.'
|
|
223
223
|
)),
|
|
224
224
|
items: {
|
|
@@ -226,11 +226,11 @@ const editorConfiguration = {
|
|
|
226
226
|
items: [
|
|
227
227
|
{
|
|
228
228
|
type: 'string',
|
|
229
|
-
description: ( localize(
|
|
229
|
+
description: ( localize(241, 'The opening bracket character or string sequence.'))
|
|
230
230
|
},
|
|
231
231
|
{
|
|
232
232
|
type: 'string',
|
|
233
|
-
description: ( localize(
|
|
233
|
+
description: ( localize(242, 'The closing bracket character or string sequence.'))
|
|
234
234
|
}
|
|
235
235
|
]
|
|
236
236
|
}
|
|
@@ -239,7 +239,7 @@ const editorConfiguration = {
|
|
|
239
239
|
type: 'number',
|
|
240
240
|
default: diffEditorDefaultOptions.maxComputationTime,
|
|
241
241
|
description: ( localize(
|
|
242
|
-
|
|
242
|
+
244,
|
|
243
243
|
"Timeout in milliseconds after which diff computation is cancelled. Use 0 for no timeout."
|
|
244
244
|
))
|
|
245
245
|
},
|
|
@@ -247,7 +247,7 @@ const editorConfiguration = {
|
|
|
247
247
|
type: 'number',
|
|
248
248
|
default: diffEditorDefaultOptions.maxFileSize,
|
|
249
249
|
description: ( localize(
|
|
250
|
-
|
|
250
|
+
245,
|
|
251
251
|
"Maximum file size in MB for which to compute diffs. Use 0 for no limit."
|
|
252
252
|
))
|
|
253
253
|
},
|
|
@@ -255,7 +255,7 @@ const editorConfiguration = {
|
|
|
255
255
|
type: 'boolean',
|
|
256
256
|
default: diffEditorDefaultOptions.renderSideBySide,
|
|
257
257
|
description: ( localize(
|
|
258
|
-
|
|
258
|
+
246,
|
|
259
259
|
"Controls whether the diff editor shows the diff side by side or inline."
|
|
260
260
|
))
|
|
261
261
|
},
|
|
@@ -263,7 +263,7 @@ const editorConfiguration = {
|
|
|
263
263
|
type: 'number',
|
|
264
264
|
default: diffEditorDefaultOptions.renderSideBySideInlineBreakpoint,
|
|
265
265
|
description: ( localize(
|
|
266
|
-
|
|
266
|
+
247,
|
|
267
267
|
"If the diff editor width is smaller than this value, the inline view is used."
|
|
268
268
|
))
|
|
269
269
|
},
|
|
@@ -271,7 +271,7 @@ const editorConfiguration = {
|
|
|
271
271
|
type: 'boolean',
|
|
272
272
|
default: diffEditorDefaultOptions.useInlineViewWhenSpaceIsLimited,
|
|
273
273
|
description: ( localize(
|
|
274
|
-
|
|
274
|
+
248,
|
|
275
275
|
"If enabled and the editor width is too small, the inline view is used."
|
|
276
276
|
))
|
|
277
277
|
},
|
|
@@ -279,7 +279,7 @@ const editorConfiguration = {
|
|
|
279
279
|
type: 'boolean',
|
|
280
280
|
default: diffEditorDefaultOptions.renderMarginRevertIcon,
|
|
281
281
|
description: ( localize(
|
|
282
|
-
|
|
282
|
+
249,
|
|
283
283
|
"When enabled, the diff editor shows arrows in its glyph margin to revert changes."
|
|
284
284
|
))
|
|
285
285
|
},
|
|
@@ -287,7 +287,7 @@ const editorConfiguration = {
|
|
|
287
287
|
type: 'boolean',
|
|
288
288
|
default: diffEditorDefaultOptions.renderGutterMenu,
|
|
289
289
|
description: ( localize(
|
|
290
|
-
|
|
290
|
+
250,
|
|
291
291
|
"When enabled, the diff editor shows a special gutter for revert and stage actions."
|
|
292
292
|
))
|
|
293
293
|
},
|
|
@@ -295,7 +295,7 @@ const editorConfiguration = {
|
|
|
295
295
|
type: 'boolean',
|
|
296
296
|
default: diffEditorDefaultOptions.ignoreTrimWhitespace,
|
|
297
297
|
description: ( localize(
|
|
298
|
-
|
|
298
|
+
251,
|
|
299
299
|
"When enabled, the diff editor ignores changes in leading or trailing whitespace."
|
|
300
300
|
))
|
|
301
301
|
},
|
|
@@ -303,24 +303,24 @@ const editorConfiguration = {
|
|
|
303
303
|
type: 'boolean',
|
|
304
304
|
default: diffEditorDefaultOptions.renderIndicators,
|
|
305
305
|
description: ( localize(
|
|
306
|
-
|
|
306
|
+
252,
|
|
307
307
|
"Controls whether the diff editor shows +/- indicators for added/removed changes."
|
|
308
308
|
))
|
|
309
309
|
},
|
|
310
310
|
'diffEditor.codeLens': {
|
|
311
311
|
type: 'boolean',
|
|
312
312
|
default: diffEditorDefaultOptions.diffCodeLens,
|
|
313
|
-
description: ( localize(
|
|
313
|
+
description: ( localize(253, "Controls whether the editor shows CodeLens."))
|
|
314
314
|
},
|
|
315
315
|
'diffEditor.wordWrap': {
|
|
316
316
|
type: 'string',
|
|
317
317
|
enum: ['off', 'on', 'inherit'],
|
|
318
318
|
default: diffEditorDefaultOptions.diffWordWrap,
|
|
319
319
|
markdownEnumDescriptions: [
|
|
320
|
-
( localize(
|
|
321
|
-
( localize(
|
|
320
|
+
( localize(254, "Lines will never wrap.")),
|
|
321
|
+
( localize(255, "Lines will wrap at the viewport width.")),
|
|
322
322
|
( localize(
|
|
323
|
-
|
|
323
|
+
256,
|
|
324
324
|
"Lines will wrap according to the {0} setting.",
|
|
325
325
|
'`#editor.wordWrap#`'
|
|
326
326
|
)),
|
|
@@ -331,26 +331,26 @@ const editorConfiguration = {
|
|
|
331
331
|
enum: ['legacy', 'advanced'],
|
|
332
332
|
default: diffEditorDefaultOptions.diffAlgorithm,
|
|
333
333
|
markdownEnumDescriptions: [
|
|
334
|
-
( localize(
|
|
335
|
-
( localize(
|
|
334
|
+
( localize(257, "Uses the legacy diffing algorithm.")),
|
|
335
|
+
( localize(258, "Uses the advanced diffing algorithm.")),
|
|
336
336
|
]
|
|
337
337
|
},
|
|
338
338
|
'diffEditor.hideUnchangedRegions.enabled': {
|
|
339
339
|
type: 'boolean',
|
|
340
340
|
default: diffEditorDefaultOptions.hideUnchangedRegions.enabled,
|
|
341
|
-
markdownDescription: ( localize(
|
|
341
|
+
markdownDescription: ( localize(259, "Controls whether the diff editor shows unchanged regions.")),
|
|
342
342
|
},
|
|
343
343
|
'diffEditor.hideUnchangedRegions.revealLineCount': {
|
|
344
344
|
type: 'integer',
|
|
345
345
|
default: diffEditorDefaultOptions.hideUnchangedRegions.revealLineCount,
|
|
346
|
-
markdownDescription: ( localize(
|
|
346
|
+
markdownDescription: ( localize(260, "Controls how many lines are used for unchanged regions.")),
|
|
347
347
|
minimum: 1,
|
|
348
348
|
},
|
|
349
349
|
'diffEditor.hideUnchangedRegions.minimumLineCount': {
|
|
350
350
|
type: 'integer',
|
|
351
351
|
default: diffEditorDefaultOptions.hideUnchangedRegions.minimumLineCount,
|
|
352
352
|
markdownDescription: ( localize(
|
|
353
|
-
|
|
353
|
+
261,
|
|
354
354
|
"Controls how many lines are used as a minimum for unchanged regions."
|
|
355
355
|
)),
|
|
356
356
|
minimum: 1,
|
|
@@ -359,7 +359,7 @@ const editorConfiguration = {
|
|
|
359
359
|
type: 'integer',
|
|
360
360
|
default: diffEditorDefaultOptions.hideUnchangedRegions.contextLineCount,
|
|
361
361
|
markdownDescription: ( localize(
|
|
362
|
-
|
|
362
|
+
262,
|
|
363
363
|
"Controls how many lines are used as context when comparing unchanged regions."
|
|
364
364
|
)),
|
|
365
365
|
minimum: 1,
|
|
@@ -367,13 +367,13 @@ const editorConfiguration = {
|
|
|
367
367
|
'diffEditor.experimental.showMoves': {
|
|
368
368
|
type: 'boolean',
|
|
369
369
|
default: diffEditorDefaultOptions.experimental.showMoves,
|
|
370
|
-
markdownDescription: ( localize(
|
|
370
|
+
markdownDescription: ( localize(263, "Controls whether the diff editor should show detected code moves."))
|
|
371
371
|
},
|
|
372
372
|
'diffEditor.experimental.showEmptyDecorations': {
|
|
373
373
|
type: 'boolean',
|
|
374
374
|
default: diffEditorDefaultOptions.experimental.showEmptyDecorations,
|
|
375
375
|
description: ( localize(
|
|
376
|
-
|
|
376
|
+
264,
|
|
377
377
|
"Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted."
|
|
378
378
|
)),
|
|
379
379
|
},
|
|
@@ -381,7 +381,7 @@ const editorConfiguration = {
|
|
|
381
381
|
type: 'boolean',
|
|
382
382
|
default: diffEditorDefaultOptions.experimental.useTrueInlineView,
|
|
383
383
|
description: ( localize(
|
|
384
|
-
|
|
384
|
+
265,
|
|
385
385
|
"If enabled and the editor uses the inline view, word changes are rendered inline."
|
|
386
386
|
)),
|
|
387
387
|
},
|