@codingame/monaco-vscode-api 1.79.1 → 1.79.2-next.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/README.md +11 -2
- package/dist/api.js +10 -8
- package/dist/composite.d.ts +65 -0
- package/dist/configurationRegistry.d.ts +212 -0
- package/dist/contextkey.d.ts +1 -1
- package/dist/default-extensions/json.js +1 -0
- package/dist/default-extensions/theme-defaults.js +2 -2
- package/dist/editorBrowser.d.ts +272 -3
- package/dist/event.d.ts +6 -1
- package/dist/{extension-tools-0c4c1ad7.js → extension-tools-3c2bf0a4.js} +698 -507
- package/dist/extensions.d.ts +3 -2
- package/dist/extensions.d2.ts +6 -17
- package/dist/extensionsRegistry.d.ts +15 -9
- package/dist/files.d.ts +71 -7
- package/dist/jsonSchema.d.ts +1 -1
- package/dist/keybinding.d.ts +2 -2
- package/dist/languageFeatures.d.ts +703 -61
- package/dist/monaco.d.ts +5 -4
- package/dist/override/vs/workbench/contrib/notebook/browser/contrib/find/findMatchDecorationModel.js +2 -0
- package/dist/override/vs/workbench/contrib/notebook/browser/notebookEditor.js +2 -0
- package/dist/override/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +2 -0
- package/dist/override/vs/workbench/contrib/notebook/common/notebookEditorInput.js +2 -1
- package/dist/platform.d.ts +11 -0
- package/dist/rollup-extension-directory-plugin.js +1 -1
- package/dist/rollup-vsix-plugin.js +2 -2
- package/dist/service-override/configuration.d.ts +5 -206
- package/dist/service-override/dialogs.js +16 -1
- package/dist/service-override/files.d.ts +2 -2
- package/dist/service-override/files.js +1 -1
- package/dist/service-override/markers.d.ts +7 -0
- package/dist/service-override/markers.js +6 -0
- package/dist/service-override/output.d.ts +7 -0
- package/dist/service-override/output.js +22 -0
- package/dist/service-override/preferences.js +7 -1
- package/dist/service-override/quickaccess.js +0 -9
- package/dist/service-override/search.d.ts +7 -0
- package/dist/service-override/search.js +19 -0
- package/dist/service-override/terminal.d.ts +607 -0
- package/dist/service-override/terminal.js +98 -0
- package/dist/service-override/tools/editor.js +1 -1
- package/dist/service-override/views.d.ts +561 -335
- package/dist/service-override/views.js +51 -11
- package/dist/services.d.ts +2627 -108
- package/dist/services.js +3 -0
- package/dist/severity.d.ts +16 -0
- package/dist/uri.d.ts +22 -11
- package/dist/views.d.ts +270 -0
- package/dist/vscode/vs/base/common/processes.js +24 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/decorations.js +20 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/delegatingEditorImpl.js +106 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/diffEditorSash.js +59 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.contribution.js +41 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.js +369 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/diffModel.js +247 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/lineAlignment.js +179 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/overviewRulerPart.js +121 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/style.css.js +4 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/unchangedRanges.js +184 -0
- package/dist/vscode/vs/editor/browser/widget/diffEditorWidget2/utils.js +88 -0
- package/dist/vscode/vs/platform/extensionManagement/common/extensionManagement.js +38 -1
- package/dist/vscode/vs/platform/extensionManagement/common/extensionManagementUtil.js +5 -1
- package/dist/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.js +13 -5
- package/dist/vscode/vs/platform/files/common/fileService.js +43 -5
- package/dist/vscode/vs/platform/files/common/files.js +3 -1
- package/dist/vscode/vs/platform/languagePacks/common/languagePacks.js +4 -1
- package/dist/vscode/vs/platform/log/common/bufferLog.js +34 -0
- package/dist/vscode/vs/platform/log/common/fileLog.js +105 -0
- package/dist/vscode/vs/platform/quickinput/browser/quickPickPin.js +1 -1
- package/dist/vscode/vs/platform/remote/common/remoteAuthorityResolver.js +20 -1
- package/dist/vscode/vs/platform/request/browser/requestService.js +1 -1
- package/dist/vscode/vs/platform/request/common/request.js +3 -3
- package/dist/vscode/vs/platform/storage/common/storage.js +3 -0
- package/dist/vscode/vs/platform/terminal/common/capabilities/bufferMarkCapability.js +39 -0
- package/dist/vscode/vs/platform/terminal/common/capabilities/commandDetectionCapability.js +565 -0
- package/dist/vscode/vs/platform/terminal/common/capabilities/cwdDetectionCapability.js +27 -0
- package/dist/vscode/vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability.js +22 -0
- package/dist/vscode/vs/platform/terminal/common/capabilities/partialCommandDetectionCapability.js +46 -0
- package/dist/vscode/vs/platform/terminal/common/capabilities/terminalCapabilityStore.js +80 -0
- package/dist/vscode/vs/platform/terminal/common/environmentVariable.js +7 -0
- package/dist/vscode/vs/platform/terminal/common/environmentVariableCollection.js +196 -0
- package/dist/vscode/vs/platform/terminal/common/environmentVariableShared.js +23 -0
- package/dist/vscode/vs/platform/terminal/common/terminal.js +21 -1
- package/dist/vscode/vs/platform/terminal/common/terminalDataBuffering.js +45 -0
- package/dist/vscode/vs/platform/terminal/common/terminalEnvironment.js +37 -0
- package/dist/vscode/vs/platform/terminal/common/terminalPlatformConfiguration.js +622 -0
- package/dist/vscode/vs/platform/terminal/common/terminalProfiles.js +107 -0
- package/dist/vscode/vs/platform/terminal/common/terminalRecorder.js +66 -0
- package/dist/vscode/vs/platform/terminal/common/terminalStrings.js +16 -0
- package/dist/vscode/vs/platform/terminal/common/xterm/shellIntegrationAddon.js +321 -0
- package/dist/vscode/vs/platform/userDataSync/common/settingsMerge.js +39 -1
- package/dist/vscode/vs/platform/userDataSync/common/userDataSync.js +19 -0
- package/dist/vscode/vs/platform/window/common/window.js +7 -1
- package/dist/vscode/vs/platform/workspace/common/canonicalUri.js +3 -0
- package/dist/vscode/vs/platform/workspace/common/virtualWorkspace.js +4 -1
- package/dist/vscode/vs/platform/workspaces/common/workspaces.js +2 -2
- package/dist/vscode/vs/workbench/api/browser/mainThreadCommands.js +2 -3
- package/dist/vscode/vs/workbench/api/browser/mainThreadEditorTabs.js +473 -0
- package/dist/vscode/vs/workbench/api/browser/mainThreadLanguageFeatures.js +45 -38
- package/dist/vscode/vs/workbench/api/browser/mainThreadSearch.js +146 -0
- package/dist/vscode/vs/workbench/api/browser/mainThreadStatusBar.js +33 -52
- package/dist/vscode/vs/workbench/api/browser/mainThreadTerminalService.js +395 -0
- package/dist/vscode/vs/workbench/api/browser/mainThreadTheming.js +22 -0
- package/dist/vscode/vs/workbench/api/browser/mainThreadTreeViews.js +10 -5
- package/dist/vscode/vs/workbench/api/browser/mainThreadWindow.js +11 -4
- package/dist/vscode/vs/workbench/api/browser/mainThreadWorkspace.js +34 -11
- package/dist/vscode/vs/workbench/api/browser/statusBarExtensionPoint.js +81 -0
- package/dist/vscode/vs/workbench/api/common/extHost.protocol.js +7 -2
- package/dist/vscode/vs/workbench/api/common/extHostDebugService.js +4 -13
- package/dist/vscode/vs/workbench/api/common/extHostExtensionService.js +30 -15
- package/dist/vscode/vs/workbench/api/common/extHostFileSystemConsumer.js +20 -6
- package/dist/vscode/vs/workbench/api/common/extHostLanguageFeatures.js +41 -8
- package/dist/vscode/vs/workbench/api/common/extHostManagedSockets.js +3 -0
- package/dist/vscode/vs/workbench/api/common/extHostSearch.js +109 -0
- package/dist/vscode/vs/workbench/api/common/extHostStatusBar.js +33 -6
- package/dist/vscode/vs/workbench/api/common/extHostTerminalService.js +879 -1
- package/dist/vscode/vs/workbench/api/common/extHostTheming.js +38 -0
- package/dist/vscode/vs/workbench/api/common/extHostTreeViews.js +8 -5
- package/dist/vscode/vs/workbench/api/common/extHostTypeConverters.js +15 -17
- package/dist/vscode/vs/workbench/api/common/extHostTypes.js +117 -4
- package/dist/vscode/vs/workbench/api/common/extHostWindow.js +28 -6
- package/dist/vscode/vs/workbench/api/common/extHostWorkspace.js +28 -0
- package/dist/vscode/vs/workbench/api/common/shared/dataTransferCache.js +11 -14
- package/dist/vscode/vs/workbench/api/node/extHostTerminalService.js +22 -0
- package/dist/vscode/vs/workbench/browser/actions/layoutActions.js +2 -1
- package/dist/vscode/vs/workbench/browser/actions/windowActions.js +2 -2
- package/dist/vscode/vs/workbench/browser/dnd.js +56 -2
- package/dist/vscode/vs/workbench/browser/parts/compositePart.js +1 -1
- package/dist/vscode/vs/workbench/browser/parts/dialogs/dialogHandler.js +2 -2
- package/dist/vscode/vs/workbench/browser/parts/editor/editor.contribution.js +1 -0
- package/dist/vscode/vs/workbench/browser/parts/editor/editor.js +1 -0
- package/dist/vscode/vs/workbench/browser/parts/editor/editorCommands.js +9 -10
- package/dist/vscode/vs/workbench/browser/parts/editor/editorGroupView.js +15 -9
- package/dist/vscode/vs/workbench/browser/parts/editor/editorGroupWatermark.js +13 -17
- package/dist/vscode/vs/workbench/browser/parts/editor/editorStatus.js +1 -1
- package/dist/vscode/vs/workbench/browser/parts/editor/editorsObserver.js +2 -2
- package/dist/vscode/vs/workbench/browser/parts/editor/media/editorgroupview.css.js +1 -1
- package/dist/vscode/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css.js +1 -1
- package/dist/vscode/vs/workbench/browser/parts/editor/noTabsTitleControl.js +3 -1
- package/dist/vscode/vs/workbench/browser/parts/editor/tabsTitleControl.js +60 -11
- package/dist/vscode/vs/workbench/browser/parts/editor/textDiffEditor.js +16 -10
- package/dist/vscode/vs/workbench/browser/parts/editor/textResourceEditor.js +1 -1
- package/dist/vscode/vs/workbench/browser/parts/statusbar/media/statusbarpart.css.js +1 -1
- package/dist/vscode/vs/workbench/browser/parts/views/checkbox.js +10 -0
- package/dist/vscode/vs/workbench/browser/parts/views/treeView.js +78 -14
- package/dist/vscode/vs/workbench/browser/parts/views/viewPaneContainer.js +1 -1
- package/dist/vscode/vs/workbench/browser/workbench.contribution.js +65 -6
- package/dist/vscode/vs/workbench/common/configuration.js +8 -1
- package/dist/vscode/vs/workbench/common/contextkeys.js +9 -1
- package/dist/vscode/vs/workbench/common/editor/editorGroupModel.js +5 -1
- package/dist/vscode/vs/workbench/common/editor/resourceEditorInput.js +6 -3
- package/dist/vscode/vs/workbench/common/editor/textResourceEditorInput.js +9 -6
- package/dist/vscode/vs/workbench/common/editor.js +1 -5
- package/dist/vscode/vs/workbench/common/resources.js +111 -34
- package/dist/vscode/vs/workbench/contrib/bulkEdit/browser/bulkEditService.js +1 -1
- package/dist/vscode/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.js +1 -1
- package/dist/vscode/vs/workbench/contrib/chat/browser/chat.js +3 -0
- package/dist/vscode/vs/workbench/contrib/chat/common/chatService.js +3 -0
- package/dist/vscode/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.js +6 -4
- package/dist/vscode/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js +250 -0
- package/dist/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput.js +290 -0
- package/dist/vscode/vs/workbench/contrib/customEditor/common/customEditor.js +3 -0
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugActionViewItems.js +1 -0
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugCommands.js +2 -1
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugConfigurationManager.js +20 -20
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugEditorActions.js +5 -3
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugEditorContribution.js +5 -2
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugHover.js +33 -6
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugSession.js +1 -1
- package/dist/vscode/vs/workbench/contrib/debug/browser/debugTaskRunner.js +1 -1
- package/dist/vscode/vs/workbench/contrib/debug/browser/repl.js +3 -3
- package/dist/vscode/vs/workbench/contrib/debug/common/debugModel.js +29 -17
- package/dist/vscode/vs/workbench/contrib/debug/common/debugStorage.js +11 -10
- package/dist/vscode/vs/workbench/contrib/debug/common/debugger.js +10 -6
- package/dist/vscode/vs/workbench/contrib/extensions/browser/extensionsActions.js +2514 -0
- package/dist/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons.js +82 -0
- package/dist/vscode/vs/workbench/contrib/extensions/browser/media/extensionActions.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/extensions/common/extensions.js +6 -1
- package/dist/vscode/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js +16 -0
- package/dist/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput.js +2 -3
- package/dist/vscode/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +2 -0
- package/dist/vscode/vs/workbench/contrib/files/browser/explorerService.js +10 -6
- package/dist/vscode/vs/workbench/contrib/files/browser/explorerViewlet.js +3 -18
- package/dist/vscode/vs/workbench/contrib/files/browser/fileActions.contribution.js +37 -2
- package/dist/vscode/vs/workbench/contrib/files/browser/fileActions.js +65 -3
- package/dist/vscode/vs/workbench/contrib/files/browser/fileCommands.js +3 -3
- package/dist/vscode/vs/workbench/contrib/files/browser/fileConstants.js +3 -1
- package/dist/vscode/vs/workbench/contrib/files/browser/files.contribution.js +41 -6
- package/dist/vscode/vs/workbench/contrib/files/browser/files.js +1 -0
- package/dist/vscode/vs/workbench/contrib/files/browser/views/explorerView.js +3 -3
- package/dist/vscode/vs/workbench/contrib/files/browser/views/explorerViewer.js +6 -2
- package/dist/vscode/vs/workbench/contrib/files/common/explorerModel.js +16 -9
- package/dist/vscode/vs/workbench/contrib/files/common/files.js +1 -6
- package/dist/vscode/vs/workbench/contrib/interactive/browser/interactiveDocumentService.js +3 -0
- package/dist/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput.js +200 -0
- package/dist/vscode/vs/workbench/contrib/interactive/browser/interactiveHistoryService.js +3 -0
- package/dist/vscode/vs/workbench/contrib/markers/browser/markers.contribution.js +586 -0
- package/dist/vscode/vs/workbench/contrib/markers/browser/markersFilterOptions.js +75 -0
- package/dist/vscode/vs/workbench/contrib/markers/browser/markersModel.js +201 -0
- package/dist/vscode/vs/workbench/contrib/markers/browser/markersTable.js +451 -0
- package/dist/vscode/vs/workbench/contrib/markers/browser/markersTreeViewer.js +670 -0
- package/dist/vscode/vs/workbench/contrib/markers/browser/markersView.js +857 -0
- package/dist/vscode/vs/workbench/contrib/markers/browser/markersViewActions.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/markers/browser/markersViewActions.js +132 -0
- package/dist/vscode/vs/workbench/contrib/markers/browser/media/markers.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/markers/browser/messages.js +171 -0
- package/dist/vscode/vs/workbench/contrib/markers/common/markers.js +15 -1
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +135 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +421 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.js +5 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.js +55 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/model/editing.js +54 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange.js +108 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping.js +334 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +606 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.js +307 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/model/rangeUtils.js +36 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js +165 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/telemetry.js +78 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/utils.js +68 -0
- package/dist/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +2 -0
- package/dist/vscode/vs/workbench/contrib/notebook/browser/contrib/find/findFilters.js +70 -0
- package/dist/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +158 -0
- package/dist/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser.js +6 -1
- package/dist/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.js +3 -0
- package/dist/vscode/vs/workbench/contrib/notebook/common/notebookCommon.js +16 -1
- package/dist/vscode/vs/workbench/contrib/notebook/common/notebookService.js +3 -0
- package/dist/vscode/vs/workbench/contrib/output/browser/logViewer.js +64 -0
- package/dist/vscode/vs/workbench/contrib/output/browser/output.contribution.js +378 -0
- package/dist/vscode/vs/workbench/contrib/output/browser/outputServices.js +39 -3
- package/dist/vscode/vs/workbench/contrib/output/browser/outputView.js +220 -0
- package/dist/vscode/vs/workbench/contrib/output/common/outputChannelModel.js +12 -3
- package/dist/vscode/vs/workbench/contrib/output/common/outputLinkComputer.js +129 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +270 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/keybindingsEditor.js +1080 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/media/keybindings.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/media/keybindingsEditor.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/media/preferences.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/media/settingsWidgets.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/preferences.contribution.js +1154 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/preferencesActions.js +94 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/preferencesEditor.js +47 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/preferencesIcons.js +37 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/preferencesRenderers.js +731 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/preferencesSearch.js +271 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +479 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/settingsEditor2.js +1465 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/settingsEditorSettingIndicators.js +506 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/settingsLayout.js +296 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/settingsSearchMenu.js +79 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/settingsTree.js +1984 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/settingsTreeModels.js +759 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/settingsWidgets.js +1008 -0
- package/dist/vscode/vs/workbench/contrib/preferences/browser/tocTree.js +196 -0
- package/dist/vscode/vs/workbench/contrib/preferences/common/preferences.js +68 -0
- package/dist/vscode/vs/workbench/contrib/preferences/common/preferencesContribution.js +157 -0
- package/dist/vscode/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js +67 -0
- package/dist/vscode/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js +16 -16
- package/dist/vscode/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js +1 -2
- package/dist/vscode/vs/workbench/contrib/remote/browser/remoteExplorer.js +23 -2
- package/dist/vscode/vs/workbench/contrib/remote/browser/tunnelView.js +5 -5
- package/dist/vscode/vs/workbench/contrib/search/browser/media/searchview.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/patternInputWidget.js +217 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/replace.js +3 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/replaceContributions.js +7 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/replaceService.js +222 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/search.contribution.js +54 -15
- package/dist/vscode/vs/workbench/contrib/search/browser/searchActionsBase.js +17 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/searchFindInput.js +41 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/searchIcons.js +35 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/searchMessage.js +58 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/searchModel.js +1842 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/searchNotebookHelpers.js +49 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/searchResultsView.js +379 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/searchView.js +1867 -0
- package/dist/vscode/vs/workbench/contrib/search/browser/searchWidget.js +628 -0
- package/dist/vscode/vs/workbench/contrib/search/common/constants.js +30 -1
- package/dist/vscode/vs/workbench/contrib/search/common/search.js +9 -1
- package/dist/vscode/vs/workbench/contrib/search/common/searchHistoryService.js +42 -0
- package/dist/vscode/vs/workbench/contrib/searchEditor/browser/constants.js +11 -0
- package/dist/vscode/vs/workbench/contrib/searchEditor/browser/media/searchEditor.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.js +477 -0
- package/dist/vscode/vs/workbench/contrib/searchEditor/browser/searchEditor.js +697 -0
- package/dist/vscode/vs/workbench/contrib/searchEditor/browser/searchEditorActions.js +188 -0
- package/dist/vscode/vs/workbench/contrib/searchEditor/browser/searchEditorInput.js +295 -0
- package/dist/vscode/vs/workbench/contrib/searchEditor/browser/searchEditorModel.js +135 -0
- package/dist/vscode/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.js +268 -0
- package/dist/vscode/vs/workbench/contrib/snippets/browser/tabCompletion.js +2 -2
- package/dist/vscode/vs/workbench/contrib/tasks/common/taskService.js +16 -1
- package/dist/vscode/vs/workbench/contrib/terminal/browser/environmentVariableInfo.js +119 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/media/scrollbar.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/media/terminal.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/media/widgets.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/media/xterm.css.js +4 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminal.contribution.js +238 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminal.js +4 -1
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalActions.js +1930 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalCommands.js +22 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalConfigHelper.js +213 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalContextMenu.js +17 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalEditor.js +186 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +199 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalEditorService.js +239 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalExtensions.js +22 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalGroup.js +482 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalGroupService.js +372 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalIcon.js +60 -1
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalIcons.js +37 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalInstance.js +2123 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalInstanceService.js +79 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalMainContribution.js +82 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalMenus.js +850 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.js +142 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalProcessManager.js +618 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.js +278 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.js +417 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalProfileService.js +213 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalQuickAccess.js +144 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick.js +267 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalService.js +1063 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalStatusList.js +108 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalTabbedView.js +417 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalTabsList.js +680 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalTooltip.js +72 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalUri.js +39 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/terminalView.js +535 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/widgets/widgetManager.js +36 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.js +469 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.js +97 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.js +56 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.js +416 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/xterm/suggestAddon.js +390 -0
- package/dist/vscode/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.js +587 -0
- package/dist/vscode/vs/workbench/contrib/terminal/common/environmentVariable.js +3 -0
- package/dist/vscode/vs/workbench/contrib/terminal/common/environmentVariableService.js +94 -0
- package/dist/vscode/vs/workbench/contrib/terminal/common/history.js +356 -0
- package/dist/vscode/vs/workbench/contrib/terminal/common/terminal.js +266 -0
- package/dist/vscode/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +23 -16
- package/dist/vscode/vs/workbench/contrib/terminal/common/terminalConfiguration.js +965 -0
- package/dist/vscode/vs/workbench/contrib/terminal/common/terminalContextKey.js +157 -0
- package/dist/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment.js +272 -0
- package/dist/vscode/vs/workbench/contrib/terminal/common/terminalExtensionPoints.js +27 -0
- package/dist/vscode/vs/workbench/contrib/terminal/common/terminalStrings.js +86 -0
- package/dist/vscode/vs/workbench/contrib/terminal/electron-sandbox/terminalProfileResolverService.js +46 -0
- package/dist/vscode/vs/workbench/contrib/terminalContrib/links/browser/links.js +3 -0
- package/dist/vscode/vs/workbench/contrib/terminalContrib/links/browser/terminalLinkProviderService.js +26 -0
- package/dist/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.js +3 -0
- package/dist/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/terminalQuickFixService.js +143 -0
- package/dist/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.js +85 -0
- package/dist/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.js +52 -0
- package/dist/vscode/vs/workbench/services/actions/common/menusExtensionPoint.js +14 -6
- package/dist/vscode/vs/workbench/services/assignment/common/assignmentService.js +3 -0
- package/dist/vscode/vs/workbench/services/configuration/browser/configurationService.js +13 -13
- package/dist/vscode/vs/workbench/services/configuration/common/configuration.js +2 -1
- package/dist/vscode/vs/workbench/services/configuration/common/configurationEditing.js +2 -2
- package/dist/vscode/vs/workbench/services/configuration/common/jsonEditingService.js +2 -2
- package/dist/vscode/vs/workbench/services/dialogs/browser/abstractFileDialogService.js +302 -0
- package/dist/vscode/vs/workbench/services/dialogs/browser/simpleFileDialog.js +971 -0
- package/dist/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.js +3 -2
- package/dist/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.js +4 -0
- package/dist/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +2 -0
- package/dist/vscode/vs/workbench/services/extensions/common/extensionManifestPropertiesService.js +3 -0
- package/dist/vscode/vs/workbench/services/extensions/common/extensions.js +14 -2
- package/dist/vscode/vs/workbench/services/extensions/common/extensionsApiProposals.js +10 -1
- package/dist/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +70 -3
- package/dist/vscode/vs/workbench/services/hover/browser/hoverService.js +1 -1
- package/dist/vscode/vs/workbench/services/hover/browser/hoverWidget.js +2 -1
- package/dist/vscode/vs/workbench/services/hover/browser/media/hover.css.js +1 -1
- package/dist/vscode/vs/workbench/services/keybinding/common/keybindingEditing.js +275 -0
- package/dist/vscode/vs/workbench/services/localization/common/locale.js +3 -0
- package/dist/vscode/vs/workbench/services/log/common/logConstants.js +2 -0
- package/dist/vscode/vs/workbench/services/output/common/output.js +4 -1
- package/dist/vscode/vs/workbench/services/preferences/common/preferences.js +22 -1
- package/dist/vscode/vs/workbench/services/preferences/common/preferencesModels.js +6 -0
- package/dist/vscode/vs/workbench/services/preferences/common/preferencesValidation.js +37 -1
- package/dist/vscode/vs/workbench/services/remote/common/remoteAgentService.js +69 -0
- package/dist/vscode/vs/workbench/services/remote/common/remoteExplorerService.js +66 -27
- package/dist/vscode/vs/workbench/services/search/common/fileSearchManager.js +265 -0
- package/dist/vscode/vs/workbench/services/search/common/queryBuilder.js +6 -0
- package/dist/vscode/vs/workbench/services/search/common/replace.js +203 -0
- package/dist/vscode/vs/workbench/services/search/common/search.js +227 -1
- package/dist/vscode/vs/workbench/services/search/common/searchExtTypes.js +6 -0
- package/dist/vscode/vs/workbench/services/search/common/searchHelpers.js +72 -0
- package/dist/vscode/vs/workbench/services/search/common/searchService.js +355 -0
- package/dist/vscode/vs/workbench/services/search/common/textSearchManager.js +309 -0
- package/dist/vscode/vs/workbench/services/suggest/browser/media/suggest.css.js +4 -0
- package/dist/vscode/vs/workbench/services/suggest/browser/simpleCompletionItem.js +10 -0
- package/dist/vscode/vs/workbench/services/suggest/browser/simpleCompletionModel.js +98 -0
- package/dist/vscode/vs/workbench/services/suggest/browser/simpleSuggestWidget.js +399 -0
- package/dist/vscode/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.js +83 -0
- package/dist/vscode/vs/workbench/services/terminal/common/embedderTerminalService.js +3 -0
- package/dist/vscode/vs/workbench/services/textfile/browser/textFileService.js +1 -1
- package/dist/vscode/vs/workbench/services/textfile/common/textFileEditorModel.js +10 -3
- package/dist/vscode/vs/workbench/services/themes/browser/fileIconThemeData.js +3 -3
- package/dist/vscode/vs/workbench/services/themes/browser/productIconThemeData.js +3 -3
- package/dist/vscode/vs/workbench/services/themes/common/colorThemeData.js +3 -3
- package/dist/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput.js +6 -4
- package/dist/vscode/vs/workbench/services/untitled/common/untitledTextEditorModel.js +3 -0
- package/dist/vscode/vs/workbench/services/untitled/common/untitledTextEditorService.js +4 -0
- package/dist/vscode/vs/workbench/services/userActivity/common/userActivityRegistry.js +15 -0
- package/dist/vscode/vs/workbench/services/userActivity/common/userActivityService.js +37 -0
- package/dist/vscode/vs/workbench/services/userDataSync/common/userDataSync.js +7 -0
- package/dist/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.js +40 -0
- package/dist/vscode/vs/workbench/services/workingCopy/common/workingCopyService.js +12 -0
- package/dist/vscode/vs/workbench/services/workspaces/common/canonicalUriService.js +19 -0
- package/dist/vscode-default-extensions/css/syntaxes/css.tmLanguage.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/json/package.json.js +1 -1
- package/dist/vscode-default-extensions/json/syntaxes/JSONC.tmLanguage.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/json/syntaxes/JSONL.tmLanguage.json.extensionResource.js +2 -0
- package/dist/vscode-default-extensions/latex/syntaxes/Bibtex.tmLanguage.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/latex/syntaxes/LaTeX.tmLanguage.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/latex/syntaxes/TeX.tmLanguage.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/latex/syntaxes/markdown-latex-combined.tmLanguage.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/lua/syntaxes/lua.tmLanguage.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/perl/package.json.js +1 -1
- package/dist/vscode-default-extensions/php/snippets/php.code-snippets.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/sql/language-configuration.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-abyss/themes/abyss-color-theme.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-defaults/package.json.js +1 -1
- package/dist/vscode-default-extensions/theme-defaults/themes/dark_modern.json.extensionResource.js +2 -0
- package/dist/vscode-default-extensions/theme-defaults/themes/dark_vs.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-defaults/themes/hc_black.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-defaults/themes/hc_light.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-defaults/themes/light_modern.json.extensionResource.js +2 -0
- package/dist/vscode-default-extensions/theme-defaults/themes/light_vs.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-monokai/themes/monokai-color-theme.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-monokai-dimmed/themes/dimmed-monokai-color-theme.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-quietlight/themes/quietlight-color-theme.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-red/themes/Red-color-theme.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-seti/icons/vs-seti-icon-theme.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-solarized-dark/themes/solarized-dark-color-theme.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-solarized-light/themes/solarized-light-color-theme.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/theme-tomorrow-night-blue/themes/tomorrow-night-blue-color-theme.json.extensionResource.js +1 -1
- package/dist/vscode-default-extensions/vb/language-configuration.json.extensionResource.js +1 -1
- package/dist/vscode-services/env.js +4 -2
- package/dist/vscode-services/extHost.js +32 -48
- package/dist/vscode-services/missing-services.js +407 -29
- package/dist/vscode-services/window.js +59 -65
- package/dist/vscode-services/workspace.js +19 -5
- package/dist/workers/outputLinkComputer.worker.d.ts +2 -0
- package/dist/workers/outputLinkComputer.worker.js +3 -0
- package/dist/workspace.d.ts +1 -1
- package/monaco-editor-treemending.patch +1305 -1184
- package/package.json +65 -19
- package/dist/activity.d.ts +0 -2802
- package/dist/collections.d.ts +0 -7
- package/dist/colorRegistry.d.ts +0 -710
- package/dist/vscode/vs/platform/product/common/product.js +0 -48
- package/dist/vscode/vs/workbench/contrib/interactiveSession/browser/interactiveSessionFollowups.js +0 -30
- package/dist/vscode/vs/workbench/contrib/interactiveSession/browser/interactiveSessionInputPart.js +0 -196
- package/dist/vscode/vs/workbench/contrib/interactiveSession/browser/interactiveSessionListRenderer.js +0 -622
- package/dist/vscode/vs/workbench/contrib/interactiveSession/browser/interactiveSessionOptions.js +0 -77
- package/dist/vscode/vs/workbench/contrib/interactiveSession/browser/interactiveSessionWidget.js +0 -311
- package/dist/vscode/vs/workbench/contrib/interactiveSession/browser/media/interactiveSession.css.js +0 -4
- package/dist/vscode/vs/workbench/contrib/interactiveSession/common/interactiveSessionContextKeys.js +0 -56
- package/dist/vscode/vs/workbench/contrib/interactiveSession/common/interactiveSessionModel.js +0 -305
- package/dist/vscode/vs/workbench/contrib/interactiveSession/common/interactiveSessionService.js +0 -13
- package/dist/vscode/vs/workbench/contrib/interactiveSession/common/interactiveSessionServiceImpl.js +0 -379
- package/dist/vscode/vs/workbench/contrib/interactiveSession/common/interactiveSessionViewModel.js +0 -207
- package/dist/vscode/vs/workbench/contrib/interactiveSession/common/interactiveSessionWidgetHistoryService.js +0 -3
- package/dist/vscode/vs/workbench/contrib/interactiveSession/common/interactiveSessionWordCounter.js +0 -25
- package/dist/vscode-default-extensions/theme-defaults/themes/dark_plus_experimental.json.extensionResource.js +0 -2
- package/dist/vscode-default-extensions/theme-defaults/themes/light_plus_experimental.json.extensionResource.js +0 -2
|
@@ -15,7 +15,7 @@ import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/com
|
|
|
15
15
|
import { MenuId, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
|
|
16
16
|
import { TitleControl, EditorCommandsContextActionRunner } from './titleControl.js';
|
|
17
17
|
import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
|
|
18
|
-
import { MutableDisposable, dispose, combinedDisposable, toDisposable
|
|
18
|
+
import { MutableDisposable, DisposableStore, dispose, combinedDisposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
19
19
|
import { ScrollableElement } from 'monaco-editor/esm/vs/base/browser/ui/scrollbar/scrollableElement.js';
|
|
20
20
|
import { getOrSet } from 'monaco-editor/esm/vs/base/common/map.js';
|
|
21
21
|
import { registerThemingParticipant, IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
|
|
@@ -65,6 +65,7 @@ let TabsTitleControl = class TabsTitleControl extends TitleControl {
|
|
|
65
65
|
this.layoutScheduler = this._register(( new MutableDisposable()));
|
|
66
66
|
this.path = isWindows ? win32 : posix;
|
|
67
67
|
this.lastMouseWheelEventTime = 0;
|
|
68
|
+
this.isMouseOverTabs = false;
|
|
68
69
|
this.updateEditorLabelScheduler = this._register(( new RunOnceScheduler(() => this.doUpdateEditorLabels(), 0)));
|
|
69
70
|
(async () => this.path = await this.pathService.path)();
|
|
70
71
|
this._register(this.tabResourceLabels.onDidChangeDecorations(() => this.doHandleDecorationsChange()));
|
|
@@ -79,6 +80,8 @@ let TabsTitleControl = class TabsTitleControl extends TitleControl {
|
|
|
79
80
|
this.tabsContainer.draggable = true;
|
|
80
81
|
this.tabsContainer.classList.add('tabs-container');
|
|
81
82
|
this._register(Gesture.addTarget(this.tabsContainer));
|
|
83
|
+
this.tabSizingFixedDisposables = this._register(( new DisposableStore()));
|
|
84
|
+
this.updateTabSizing(false);
|
|
82
85
|
this.tabsScrollbar = this._register(this.createTabsScrollbar(this.tabsContainer));
|
|
83
86
|
this.tabsAndActionsContainer.appendChild(this.tabsScrollbar.getDomNode());
|
|
84
87
|
this.registerTabsContainerListeners(this.tabsContainer, this.tabsScrollbar);
|
|
@@ -111,6 +114,36 @@ let TabsTitleControl = class TabsTitleControl extends TitleControl {
|
|
|
111
114
|
horizontalScrollbarSize: this.getTabsScrollbarSizing()
|
|
112
115
|
});
|
|
113
116
|
}
|
|
117
|
+
updateTabSizing(fromEvent) {
|
|
118
|
+
const [tabsContainer, tabSizingFixedDisposables] = assertAllDefined(this.tabsContainer, this.tabSizingFixedDisposables);
|
|
119
|
+
tabSizingFixedDisposables.clear();
|
|
120
|
+
const options = this.accessor.partOptions;
|
|
121
|
+
if (options.tabSizing === 'fixed') {
|
|
122
|
+
tabsContainer.style.setProperty('--tab-sizing-fixed-max-width', `${options.tabSizingFixedMaxWidth}px`);
|
|
123
|
+
tabSizingFixedDisposables.add(addDisposableListener(tabsContainer, EventType.MOUSE_ENTER, () => {
|
|
124
|
+
this.isMouseOverTabs = true;
|
|
125
|
+
}));
|
|
126
|
+
tabSizingFixedDisposables.add(addDisposableListener(tabsContainer, EventType.MOUSE_LEAVE, () => {
|
|
127
|
+
this.isMouseOverTabs = false;
|
|
128
|
+
this.updateTabsFixedWidth(false);
|
|
129
|
+
}));
|
|
130
|
+
}
|
|
131
|
+
else if (fromEvent) {
|
|
132
|
+
tabsContainer.style.removeProperty('--tab-sizing-fixed-max-width');
|
|
133
|
+
this.updateTabsFixedWidth(false);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
updateTabsFixedWidth(fixed) {
|
|
137
|
+
this.forEachTab((editor, index, tabContainer) => {
|
|
138
|
+
if (fixed) {
|
|
139
|
+
const { width } = tabContainer.getBoundingClientRect();
|
|
140
|
+
tabContainer.style.setProperty('--tab-sizing-current-width', `${width}px`);
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
tabContainer.style.removeProperty('--tab-sizing-current-width');
|
|
144
|
+
}
|
|
145
|
+
});
|
|
146
|
+
}
|
|
114
147
|
getTabsScrollbarSizing() {
|
|
115
148
|
if (this.accessor.partOptions.titleScrollbarSizing !== 'large') {
|
|
116
149
|
return TabsTitleControl.SCROLLBAR_SIZES.default;
|
|
@@ -320,13 +353,19 @@ let TabsTitleControl = class TabsTitleControl extends TitleControl {
|
|
|
320
353
|
labelA.title === labelB.title &&
|
|
321
354
|
labelA.ariaLabel === labelB.ariaLabel;
|
|
322
355
|
}
|
|
323
|
-
|
|
324
|
-
this.
|
|
356
|
+
beforeCloseEditor(editor) {
|
|
357
|
+
if (this.isMouseOverTabs && this.accessor.partOptions.tabSizing === 'fixed') {
|
|
358
|
+
const closingLastTab = this.group.isLast(editor);
|
|
359
|
+
this.updateTabsFixedWidth(!closingLastTab);
|
|
360
|
+
}
|
|
361
|
+
}
|
|
362
|
+
closeEditor(editor) {
|
|
363
|
+
this.handleClosedEditors();
|
|
325
364
|
}
|
|
326
365
|
closeEditors(editors) {
|
|
327
366
|
this.handleClosedEditors();
|
|
328
367
|
}
|
|
329
|
-
handleClosedEditors(
|
|
368
|
+
handleClosedEditors() {
|
|
330
369
|
if (this.group.activeEditor) {
|
|
331
370
|
const tabsContainer = assertIsDefined(this.tabsContainer);
|
|
332
371
|
while (tabsContainer.children.length > this.group.count) {
|
|
@@ -403,6 +442,10 @@ let TabsTitleControl = class TabsTitleControl extends TitleControl {
|
|
|
403
442
|
if (oldOptions.titleScrollbarSizing !== newOptions.titleScrollbarSizing) {
|
|
404
443
|
this.updateTabsScrollbarSizing();
|
|
405
444
|
}
|
|
445
|
+
if (oldOptions.tabSizingFixedMaxWidth !== newOptions.tabSizingFixedMaxWidth ||
|
|
446
|
+
oldOptions.tabSizing !== newOptions.tabSizing) {
|
|
447
|
+
this.updateTabSizing(true);
|
|
448
|
+
}
|
|
406
449
|
if (oldOptions.labelFormat !== newOptions.labelFormat ||
|
|
407
450
|
oldOptions.tabCloseButton !== newOptions.tabCloseButton ||
|
|
408
451
|
oldOptions.tabSizing !== newOptions.tabSizing ||
|
|
@@ -817,7 +860,7 @@ let TabsTitleControl = class TabsTitleControl extends TitleControl {
|
|
|
817
860
|
tabContainer.classList.toggle(`tab-actions-${option}`, tabActionsVisibility === option);
|
|
818
861
|
}
|
|
819
862
|
const tabSizing = isTabSticky && options.pinnedTabSizing === 'shrink' ? 'shrink' : options.tabSizing;
|
|
820
|
-
for (const option of ['fit', 'shrink']) {
|
|
863
|
+
for (const option of ['fit', 'shrink', 'fixed']) {
|
|
821
864
|
tabContainer.classList.toggle(`sizing-${option}`, tabSizing === option);
|
|
822
865
|
}
|
|
823
866
|
tabContainer.classList.toggle('has-icon', options.showIcons && options.hasIcons);
|
|
@@ -1425,7 +1468,7 @@ registerThemingParticipant((theme, collector) => {
|
|
|
1425
1468
|
}
|
|
1426
1469
|
`);
|
|
1427
1470
|
}
|
|
1428
|
-
if (isHighContrast(theme.type) && !isSafari && !activeContrastBorderColor) {
|
|
1471
|
+
if (!isHighContrast(theme.type) && !isSafari && !activeContrastBorderColor) {
|
|
1429
1472
|
const workbenchBackground = WORKBENCH_BACKGROUND(theme);
|
|
1430
1473
|
const editorBackgroundColor = theme.getColor(editorBackground);
|
|
1431
1474
|
const editorGroupHeaderTabsBackground = theme.getColor(EDITOR_GROUP_HEADER_TABS_BACKGROUND);
|
|
@@ -1439,11 +1482,13 @@ registerThemingParticipant((theme, collector) => {
|
|
|
1439
1482
|
adjustedTabDragBackground = editorGroupHeaderTabsBackground.flatten(editorBackgroundColor, editorDragAndDropBackground, editorBackgroundColor, workbenchBackground);
|
|
1440
1483
|
}
|
|
1441
1484
|
const makeTabHoverBackgroundRule = (color, colorDrag, hasFocus = false) => `
|
|
1442
|
-
.monaco-workbench .part.editor > .content:not(.dragged-over) .editor-group-container${hasFocus ? '.active' : ''} > .title .tabs-container > .tab.sizing-shrink:not(.dragged):not(.sticky-compact):hover > .tab-label > .monaco-icon-label-container::after
|
|
1485
|
+
.monaco-workbench .part.editor > .content:not(.dragged-over) .editor-group-container${hasFocus ? '.active' : ''} > .title .tabs-container > .tab.sizing-shrink:not(.dragged):not(.sticky-compact):hover > .tab-label > .monaco-icon-label-container::after,
|
|
1486
|
+
.monaco-workbench .part.editor > .content:not(.dragged-over) .editor-group-container${hasFocus ? '.active' : ''} > .title .tabs-container > .tab.sizing-fixed:not(.dragged):not(.sticky-compact):hover > .tab-label > .monaco-icon-label-container::after {
|
|
1443
1487
|
background: linear-gradient(to left, ${color}, transparent) !important;
|
|
1444
1488
|
}
|
|
1445
1489
|
|
|
1446
|
-
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container${hasFocus ? '.active' : ''} > .title .tabs-container > .tab.sizing-shrink:not(.dragged):not(.sticky-compact):hover > .tab-label > .monaco-icon-label-container::after
|
|
1490
|
+
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container${hasFocus ? '.active' : ''} > .title .tabs-container > .tab.sizing-shrink:not(.dragged):not(.sticky-compact):hover > .tab-label > .monaco-icon-label-container::after,
|
|
1491
|
+
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container${hasFocus ? '.active' : ''} > .title .tabs-container > .tab.sizing-fixed:not(.dragged):not(.sticky-compact):hover > .tab-label > .monaco-icon-label-container::after {
|
|
1447
1492
|
background: linear-gradient(to left, ${colorDrag}, transparent) !important;
|
|
1448
1493
|
}
|
|
1449
1494
|
`;
|
|
@@ -1461,17 +1506,21 @@ registerThemingParticipant((theme, collector) => {
|
|
|
1461
1506
|
const adjustedColorDrag = editorDragAndDropBackground.flatten(adjustedTabDragBackground);
|
|
1462
1507
|
collector.addRule(`
|
|
1463
1508
|
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container.active > .title .tabs-container > .tab.sizing-shrink.dragged-over:not(.active):not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after,
|
|
1464
|
-
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container:not(.active) > .title .tabs-container > .tab.sizing-shrink.dragged-over:not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after
|
|
1509
|
+
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container:not(.active) > .title .tabs-container > .tab.sizing-shrink.dragged-over:not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after,
|
|
1510
|
+
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container.active > .title .tabs-container > .tab.sizing-fixed.dragged-over:not(.active):not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after,
|
|
1511
|
+
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container:not(.active) > .title .tabs-container > .tab.sizing-fixed.dragged-over:not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after {
|
|
1465
1512
|
background: linear-gradient(to left, ${adjustedColorDrag}, transparent) !important;
|
|
1466
1513
|
}
|
|
1467
1514
|
`);
|
|
1468
1515
|
}
|
|
1469
1516
|
const makeTabBackgroundRule = (color, colorDrag, focused, active) => `
|
|
1470
|
-
.monaco-workbench .part.editor > .content:not(.dragged-over) .editor-group-container${focused ? '.active' : ':not(.active)'} > .title .tabs-container > .tab.sizing-shrink${active ? '.active' : ''}:not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after
|
|
1517
|
+
.monaco-workbench .part.editor > .content:not(.dragged-over) .editor-group-container${focused ? '.active' : ':not(.active)'} > .title .tabs-container > .tab.sizing-shrink${active ? '.active' : ''}:not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after,
|
|
1518
|
+
.monaco-workbench .part.editor > .content:not(.dragged-over) .editor-group-container${focused ? '.active' : ':not(.active)'} > .title .tabs-container > .tab.sizing-fixed${active ? '.active' : ''}:not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after {
|
|
1471
1519
|
background: linear-gradient(to left, ${color}, transparent);
|
|
1472
1520
|
}
|
|
1473
1521
|
|
|
1474
|
-
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container${focused ? '.active' : ':not(.active)'} > .title .tabs-container > .tab.sizing-shrink${active ? '.active' : ''}:not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after
|
|
1522
|
+
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container${focused ? '.active' : ':not(.active)'} > .title .tabs-container > .tab.sizing-shrink${active ? '.active' : ''}:not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after,
|
|
1523
|
+
.monaco-workbench .part.editor > .content.dragged-over .editor-group-container${focused ? '.active' : ':not(.active)'} > .title .tabs-container > .tab.sizing-fixed${active ? '.active' : ''}:not(.dragged):not(.sticky-compact) > .tab-label > .monaco-icon-label-container::after {
|
|
1475
1524
|
background: linear-gradient(to left, ${colorDrag}, transparent);
|
|
1476
1525
|
}
|
|
1477
1526
|
`;
|
|
@@ -6,7 +6,6 @@ import { AbstractTextEditor } from './textEditor.js';
|
|
|
6
6
|
import { TEXT_DIFF_EDITOR_ID, isTextEditorViewState, createTooLargeFileError, EditorExtensions, isEditorInput } from '../../../common/editor.js';
|
|
7
7
|
import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
|
|
8
8
|
import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
|
|
9
|
-
import { DiffNavigator } from 'monaco-editor/esm/vs/editor/browser/widget/diffNavigator.js';
|
|
10
9
|
import { DiffEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/diffEditorWidget.js';
|
|
11
10
|
import { TextDiffEditorModel } from '../../../common/editor/textDiffEditorModel.js';
|
|
12
11
|
import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
|
|
@@ -26,6 +25,7 @@ import { multibyteAwareBtoa } from 'monaco-editor/esm/vs/base/browser/dom.js';
|
|
|
26
25
|
import { TooLargeFileOperationError, ByteSize, IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
27
26
|
import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
|
|
28
27
|
import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
|
|
28
|
+
import { DiffEditorWidget2 } from '../../../../editor/browser/widget/diffEditorWidget2/diffEditorWidget2.js';
|
|
29
29
|
let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
|
|
30
30
|
get scopedContextKeyService() {
|
|
31
31
|
if (!this.diffEditorControl) {
|
|
@@ -51,7 +51,17 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
|
|
|
51
51
|
);
|
|
52
52
|
}
|
|
53
53
|
createEditorControl(parent, configuration) {
|
|
54
|
-
|
|
54
|
+
TextDiffEditor.widgetCounter++;
|
|
55
|
+
let useVersion2 = this.textResourceConfigurationService.getValue(undefined, 'diffEditor.experimental.useVersion2');
|
|
56
|
+
if (useVersion2 === 'first') {
|
|
57
|
+
useVersion2 = TextDiffEditor.widgetCounter === 1;
|
|
58
|
+
}
|
|
59
|
+
if (useVersion2) {
|
|
60
|
+
this.diffEditorControl = this._register(this.instantiationService.createInstance(DiffEditorWidget2, parent, configuration, {}));
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
this.diffEditorControl = this._register(this.instantiationService.createInstance(DiffEditorWidget, parent, configuration, {}));
|
|
64
|
+
}
|
|
55
65
|
}
|
|
56
66
|
updateEditorControlOptions(options) {
|
|
57
67
|
this.diffEditorControl?.updateOptions(options);
|
|
@@ -83,11 +93,9 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
|
|
|
83
93
|
if (options) {
|
|
84
94
|
optionsGotApplied = applyTextEditorOptions(options, control, 1 );
|
|
85
95
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
});
|
|
90
|
-
this.diffNavigatorDisposables.add(this.diffNavigator);
|
|
96
|
+
if (!optionsGotApplied && !hasPreviousViewState) {
|
|
97
|
+
control.revealFirstDiff();
|
|
98
|
+
}
|
|
91
99
|
control.updateOptions({
|
|
92
100
|
readOnly: resolvedDiffEditorModel.modifiedModel?.isReadonly(),
|
|
93
101
|
originalEditable: !resolvedDiffEditorModel.originalModel?.isReadonly()
|
|
@@ -223,9 +231,6 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
|
|
|
223
231
|
languageId: languageId ?? '',
|
|
224
232
|
});
|
|
225
233
|
}
|
|
226
|
-
getDiffNavigator() {
|
|
227
|
-
return this.diffNavigator;
|
|
228
|
-
}
|
|
229
234
|
getControl() {
|
|
230
235
|
return this.diffEditorControl;
|
|
231
236
|
}
|
|
@@ -290,6 +295,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
|
|
|
290
295
|
}
|
|
291
296
|
};
|
|
292
297
|
TextDiffEditor.ID = TEXT_DIFF_EDITOR_ID;
|
|
298
|
+
TextDiffEditor.widgetCounter = 0;
|
|
293
299
|
TextDiffEditor = ( (__decorate([
|
|
294
300
|
( (__param(0, ITelemetryService))),
|
|
295
301
|
( (__param(1, IInstantiationService))),
|
|
@@ -96,7 +96,7 @@ let TextResourceEditor = class TextResourceEditor extends AbstractTextResourceEd
|
|
|
96
96
|
if (e.range.startLineNumber !== 1 || e.range.startColumn !== 1) {
|
|
97
97
|
return;
|
|
98
98
|
}
|
|
99
|
-
if (codeEditor.getOption(
|
|
99
|
+
if (codeEditor.getOption(88 )) {
|
|
100
100
|
return;
|
|
101
101
|
}
|
|
102
102
|
const textModel = codeEditor.getModel();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import n from '../../../../../../../node_modules/rollup-plugin-styles/dist/runtime/inject-css.js';
|
|
2
|
-
var css = ".monaco-workbench .part.statusbar{box-sizing:border-box;cursor:default;display:flex;font-size:12px;height:22px;overflow:hidden;width:100%}.monaco-workbench:not(.reduce-motion) .part.statusbar{transition:background-color .15s ease-out}.monaco-workbench .part.statusbar.status-border-top:after{background-color:var(--status-border-top-color);content:\"\";height:1px;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:5}.monaco-workbench .part.statusbar>.left-items,.monaco-workbench .part.statusbar>.right-items{display:flex}.monaco-workbench .part.statusbar>.right-items{flex-direction:row-reverse;flex-wrap:wrap}.monaco-workbench .part.statusbar>.left-items{flex-grow:1}.monaco-workbench .part.statusbar>.items-container>.statusbar-item{display:inline-block;font-variant-numeric:tabular-nums;height:100%;line-height:22px;max-width:40vw;vertical-align:top}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak{position:relative}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container{height:5px;left:calc(50% - 5px);position:absolute;top:-5px;width:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container:before{border-bottom-style:solid;border-bottom-width:5px;border-left:5px solid transparent;border-right:5px solid transparent;content:\"\";position:fixed}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{margin-left:3px;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label{margin-left:0;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{margin-left:3px;margin-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.left.first-visible-item{padding-left:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.right.last-visible-item{margin-right:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.left.first-visible-item,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.right.last-visible-item{padding-left:0;padding-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color>.statusbar-item-label{margin-left:0;margin-right:0;padding-left:10px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left.has-background-color>.statusbar-item-label{padding-left:3px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right.has-background-color>.statusbar-item-label{padding-left:10px;padding-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{align-items:center;cursor:pointer;display:flex;height:100%;outline-width:0;overflow:hidden;padding:0 5px;text-overflow:ellipsis;white-space:pre}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label
|
|
2
|
+
var css = ".monaco-workbench .part.statusbar{box-sizing:border-box;cursor:default;display:flex;font-size:12px;height:22px;overflow:hidden;width:100%}.monaco-workbench:not(.reduce-motion) .part.statusbar{transition:background-color .15s ease-out}.monaco-workbench .part.statusbar.status-border-top:after{background-color:var(--status-border-top-color);content:\"\";height:1px;left:0;pointer-events:none;position:absolute;top:0;width:100%;z-index:5}.monaco-workbench .part.statusbar>.left-items,.monaco-workbench .part.statusbar>.right-items{display:flex}.monaco-workbench .part.statusbar>.right-items{flex-direction:row-reverse;flex-wrap:wrap}.monaco-workbench .part.statusbar>.left-items{flex-grow:1}.monaco-workbench .part.statusbar>.items-container>.statusbar-item{display:inline-block;font-variant-numeric:tabular-nums;height:100%;line-height:22px;max-width:40vw;vertical-align:top}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak{position:relative}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container{height:5px;left:calc(50% - 5px);position:absolute;top:-5px;width:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-beak>.status-bar-item-beak-container:before{border-bottom-style:solid;border-bottom-width:5px;border-left:5px solid transparent;border-right:5px solid transparent;content:\"\";position:fixed}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{margin-left:3px;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label{margin-left:0;margin-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{margin-left:3px;margin-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.left.first-visible-item{padding-left:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.right.last-visible-item{margin-right:7px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.left.first-visible-item,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color.right.last-visible-item{padding-left:0;padding-right:0}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.has-background-color>.statusbar-item-label{margin-left:0;margin-right:0;padding-left:10px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left.has-background-color>.statusbar-item-label{padding-left:3px;padding-right:10px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right.has-background-color>.statusbar-item-label{padding-left:10px;padding-right:3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>.statusbar-item-label{align-items:center;cursor:pointer;display:flex;height:100%;outline-width:0;overflow:hidden;padding:0 5px;text-overflow:ellipsis;white-space:pre}.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-left>.statusbar-item-label,.monaco-workbench .part.statusbar>.items-container>.statusbar-item.compact-right>.statusbar-item-label{padding:0 3px}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>a:hover:not(.disabled){text-decoration:none}.monaco-workbench .part.statusbar>.items-container>.statusbar-item>a.disabled{cursor:default}.monaco-workbench .part.statusbar>.items-container>.statusbar-item span.codicon{color:inherit;font-size:14px;text-align:center}.monaco-workbench .part.statusbar>.items-container>.statusbar-item .status-bar-info{background-color:var(--vscode-statusBarItem-prominentBackground);color:var(--vscode-statusBarItem-prominentForeground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a.status-bar-info:hover:not(.disabled){background-color:var(--vscode-statusBarItem-prominentHoverBackground)}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a:active:not(.disabled){outline:1px solid var(--vscode-contrastActiveBorder)!important;outline-offset:-1px}.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar>.items-container>.statusbar-item a:active:not(.disabled){background-color:var(--vscode-statusBarItem-activeBackground)!important}.monaco-workbench .part.statusbar>.items-container>.statusbar-item a:hover:not(.disabled){outline:1px dashed var(--vscode-contrastActiveBorder);outline-offset:-1px}.monaco-workbench:not(.hc-light):not(.hc-black) .part.statusbar>.items-container>.statusbar-item a:hover:not(.disabled){background-color:var(--vscode-statusBarItem-hoverBackground)}";
|
|
3
3
|
n(css,{});
|
|
4
4
|
export { css, css as default };
|
|
@@ -43,6 +43,7 @@ class TreeItemCheckbox extends Disposable {
|
|
|
43
43
|
icon: node.checkbox.isChecked ? Codicon.check : undefined,
|
|
44
44
|
...defaultToggleStyles
|
|
45
45
|
}));
|
|
46
|
+
this.setAccessibilityInformation(node.checkbox);
|
|
46
47
|
this.toggle.domNode.classList.add(TreeItemCheckbox.checkboxClass);
|
|
47
48
|
dom.append(this.checkboxContainer, this.toggle.domNode);
|
|
48
49
|
this.registerListener(node);
|
|
@@ -62,6 +63,7 @@ class TreeItemCheckbox extends Disposable {
|
|
|
62
63
|
node.checkbox.isChecked = this.toggle.checked;
|
|
63
64
|
this.toggle.setIcon(this.toggle.checked ? Codicon.check : undefined);
|
|
64
65
|
this.toggle.setTitle(this.createCheckboxTitle(node.checkbox));
|
|
66
|
+
this.setAccessibilityInformation(node.checkbox);
|
|
65
67
|
this.checkboxStateHandler.setCheckboxState(node);
|
|
66
68
|
}
|
|
67
69
|
}
|
|
@@ -69,6 +71,14 @@ class TreeItemCheckbox extends Disposable {
|
|
|
69
71
|
return checkbox.tooltip ? checkbox.tooltip :
|
|
70
72
|
checkbox.isChecked ? ( localize('checked', 'Checked')) : ( localize('unchecked', 'Unchecked'));
|
|
71
73
|
}
|
|
74
|
+
setAccessibilityInformation(checkbox) {
|
|
75
|
+
if (this.toggle && checkbox.accessibilityInformation) {
|
|
76
|
+
this.toggle.domNode.ariaLabel = checkbox.accessibilityInformation.label;
|
|
77
|
+
if (checkbox.accessibilityInformation.role) {
|
|
78
|
+
this.toggle.domNode.role = checkbox.accessibilityInformation.role;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
72
82
|
removeCheckbox() {
|
|
73
83
|
const children = this.checkboxContainer.children;
|
|
74
84
|
for (const child of children) {
|
|
@@ -54,7 +54,7 @@ import { IExtensionService } from '../../../services/extensions/common/extension
|
|
|
54
54
|
import { IHoverService } from '../../../services/hover/browser/hover.js';
|
|
55
55
|
import { ITreeViewsService } from '../../../services/views/browser/treeViewsService.js';
|
|
56
56
|
import { LocalSelectionTransfer, CodeDataTransfers } from 'monaco-editor/esm/vs/platform/dnd/browser/dnd.js';
|
|
57
|
-
import {
|
|
57
|
+
import { toExternalVSDataTransfer } from 'monaco-editor/esm/vs/editor/browser/dnd.js';
|
|
58
58
|
import { TreeItemCheckbox, CheckboxStateHandler } from './checkbox.js';
|
|
59
59
|
import { setTimeout0 } from 'monaco-editor/esm/vs/base/common/platform.js';
|
|
60
60
|
import { TelemetryTrustedValue } from '../../../../platform/telemetry/common/telemetryUtils.js';
|
|
@@ -181,6 +181,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
|
|
|
181
181
|
this._hasIconForLeafNode = false;
|
|
182
182
|
this.focused = false;
|
|
183
183
|
this._canSelectMany = false;
|
|
184
|
+
this._manuallyManageCheckboxes = false;
|
|
184
185
|
this.elementsToRefresh = [];
|
|
185
186
|
this._onDidExpandItem = this._register(( new Emitter()));
|
|
186
187
|
this.onDidExpandItem = this._onDidExpandItem.event;
|
|
@@ -275,6 +276,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
|
|
|
275
276
|
node = node ?? self.root;
|
|
276
277
|
node.children = await (node instanceof Root ? dataProvider.getChildren() : dataProvider.getChildren(node));
|
|
277
278
|
children = node.children ?? [];
|
|
279
|
+
children.forEach(child => child.parent = node);
|
|
278
280
|
}
|
|
279
281
|
if (node instanceof Root) {
|
|
280
282
|
const oldEmpty = this._isEmpty;
|
|
@@ -354,6 +356,12 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
|
|
|
354
356
|
this.tree?.updateOptions({ multipleSelectionSupport: this.canSelectMany });
|
|
355
357
|
}
|
|
356
358
|
}
|
|
359
|
+
get manuallyManageCheckboxes() {
|
|
360
|
+
return this._manuallyManageCheckboxes;
|
|
361
|
+
}
|
|
362
|
+
set manuallyManageCheckboxes(manuallyManageCheckboxes) {
|
|
363
|
+
this._manuallyManageCheckboxes = manuallyManageCheckboxes;
|
|
364
|
+
}
|
|
357
365
|
get hasIconForParentNode() {
|
|
358
366
|
return this._hasIconForParentNode;
|
|
359
367
|
}
|
|
@@ -499,6 +507,65 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
|
|
|
499
507
|
this._register(focusTracker.onDidFocus(() => this.focused = true));
|
|
500
508
|
this._register(focusTracker.onDidBlur(() => this.focused = false));
|
|
501
509
|
}
|
|
510
|
+
updateCheckboxes(items) {
|
|
511
|
+
const additionalItems = [];
|
|
512
|
+
if (!this.manuallyManageCheckboxes) {
|
|
513
|
+
for (const item of items) {
|
|
514
|
+
if (item.checkbox !== undefined) {
|
|
515
|
+
function checkChildren(currentItem) {
|
|
516
|
+
for (const child of (currentItem.children ?? [])) {
|
|
517
|
+
if (child.checkbox !== undefined && currentItem.checkbox !== undefined) {
|
|
518
|
+
child.checkbox.isChecked = currentItem.checkbox.isChecked;
|
|
519
|
+
additionalItems.push(child);
|
|
520
|
+
checkChildren(child);
|
|
521
|
+
}
|
|
522
|
+
}
|
|
523
|
+
}
|
|
524
|
+
checkChildren(item);
|
|
525
|
+
const visitedParents = ( new Set());
|
|
526
|
+
function checkParents(currentItem) {
|
|
527
|
+
if (currentItem.parent && (currentItem.parent.checkbox !== undefined) && currentItem.parent.children) {
|
|
528
|
+
if (( visitedParents.has(currentItem.parent))) {
|
|
529
|
+
return;
|
|
530
|
+
}
|
|
531
|
+
else {
|
|
532
|
+
visitedParents.add(currentItem.parent);
|
|
533
|
+
}
|
|
534
|
+
let someUnchecked = false;
|
|
535
|
+
let someChecked = false;
|
|
536
|
+
for (const child of currentItem.parent.children) {
|
|
537
|
+
if (someUnchecked && someChecked) {
|
|
538
|
+
break;
|
|
539
|
+
}
|
|
540
|
+
if (child.checkbox !== undefined) {
|
|
541
|
+
if (child.checkbox.isChecked) {
|
|
542
|
+
someChecked = true;
|
|
543
|
+
}
|
|
544
|
+
else {
|
|
545
|
+
someUnchecked = true;
|
|
546
|
+
}
|
|
547
|
+
}
|
|
548
|
+
}
|
|
549
|
+
if (someChecked && !someUnchecked) {
|
|
550
|
+
currentItem.parent.checkbox.isChecked = true;
|
|
551
|
+
additionalItems.push(currentItem.parent);
|
|
552
|
+
checkParents(currentItem.parent);
|
|
553
|
+
}
|
|
554
|
+
else if (someUnchecked && !someChecked) {
|
|
555
|
+
currentItem.parent.checkbox.isChecked = false;
|
|
556
|
+
additionalItems.push(currentItem.parent);
|
|
557
|
+
checkParents(currentItem.parent);
|
|
558
|
+
}
|
|
559
|
+
}
|
|
560
|
+
}
|
|
561
|
+
checkParents(item);
|
|
562
|
+
}
|
|
563
|
+
}
|
|
564
|
+
}
|
|
565
|
+
items = items.concat(additionalItems);
|
|
566
|
+
items.forEach(item => this.tree?.rerender(item));
|
|
567
|
+
this._onDidChangeCheckboxState.fire(items);
|
|
568
|
+
}
|
|
502
569
|
createTree() {
|
|
503
570
|
const actionViewItemProvider = createActionViewItem.bind(undefined, this.instantiationService);
|
|
504
571
|
const treeMenus = this._register(this.instantiationService.createInstance(TreeMenus, this.id));
|
|
@@ -507,8 +574,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
|
|
|
507
574
|
const aligner = ( new Aligner(this.themeService));
|
|
508
575
|
const checkboxStateHandler = this._register(( new CheckboxStateHandler()));
|
|
509
576
|
this._register(checkboxStateHandler.onDidChangeCheckboxState(items => {
|
|
510
|
-
|
|
511
|
-
this._onDidChangeCheckboxState.fire(items);
|
|
577
|
+
this.updateCheckboxes(items);
|
|
512
578
|
}));
|
|
513
579
|
const renderer = this.instantiationService.createInstance(TreeRenderer, this.id, treeMenus, this.treeLabels, actionViewItemProvider, aligner, checkboxStateHandler);
|
|
514
580
|
const widgetAriaLabel = this._title;
|
|
@@ -748,9 +814,9 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
|
|
|
748
814
|
}
|
|
749
815
|
try {
|
|
750
816
|
itemOrItems = Array.isArray(itemOrItems) ? itemOrItems : [itemOrItems];
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
}
|
|
817
|
+
for (const element of itemOrItems) {
|
|
818
|
+
await tree.expand(element, false);
|
|
819
|
+
}
|
|
754
820
|
}
|
|
755
821
|
catch (e) {
|
|
756
822
|
}
|
|
@@ -1317,7 +1383,7 @@ let CustomTreeViewDragAndDrop = class CustomTreeViewDragAndDrop {
|
|
|
1317
1383
|
return dndController.handleDrag(itemHandles, uuid, dragCancellationToken).then(additionalDataTransfer => {
|
|
1318
1384
|
if (additionalDataTransfer) {
|
|
1319
1385
|
const unlistedTypes = [];
|
|
1320
|
-
for (const item of additionalDataTransfer
|
|
1386
|
+
for (const item of additionalDataTransfer) {
|
|
1321
1387
|
if ((item[0] !== this.treeMimeType) && (dndController.dragMimeTypes.findIndex(value => value === item[0]) < 0)) {
|
|
1322
1388
|
unlistedTypes.push(item[0]);
|
|
1323
1389
|
}
|
|
@@ -1382,9 +1448,8 @@ let CustomTreeViewDragAndDrop = class CustomTreeViewDragAndDrop {
|
|
|
1382
1448
|
}
|
|
1383
1449
|
}
|
|
1384
1450
|
onDragOver(data, targetElement, targetIndex, originalEvent) {
|
|
1385
|
-
const dataTransfer =
|
|
1386
|
-
|
|
1387
|
-
const types = ( new Set(( Array.from(dataTransfer.entries()).map(x => x[0]))));
|
|
1451
|
+
const dataTransfer = toExternalVSDataTransfer(originalEvent.dataTransfer);
|
|
1452
|
+
const types = ( new Set(Array.from(dataTransfer, x => x[0])));
|
|
1388
1453
|
if (originalEvent.dataTransfer) {
|
|
1389
1454
|
for (const item of originalEvent.dataTransfer.items) {
|
|
1390
1455
|
if (item.kind === 'file' || item.type === DataTransfers.RESOURCES.toLowerCase()) {
|
|
@@ -1437,10 +1502,9 @@ let CustomTreeViewDragAndDrop = class CustomTreeViewDragAndDrop {
|
|
|
1437
1502
|
if (this.treeItemsTransfer.hasData(DraggedTreeItemsIdentifier.prototype)) {
|
|
1438
1503
|
willDropUuid = this.treeItemsTransfer.getData(DraggedTreeItemsIdentifier.prototype)[0].identifier;
|
|
1439
1504
|
}
|
|
1440
|
-
const originalDataTransfer =
|
|
1441
|
-
addExternalEditorsDropData(originalDataTransfer, originalEvent, true);
|
|
1505
|
+
const originalDataTransfer = toExternalVSDataTransfer(originalEvent.dataTransfer, true);
|
|
1442
1506
|
const outDataTransfer = ( new VSDataTransfer());
|
|
1443
|
-
for (const [type, item] of originalDataTransfer
|
|
1507
|
+
for (const [type, item] of originalDataTransfer) {
|
|
1444
1508
|
if (type === this.treeMimeType || dndController.dropMimeTypes.includes(type) || (item.asFile() && dndController.dropMimeTypes.includes(DataTransfers.FILES.toLowerCase()))) {
|
|
1445
1509
|
outDataTransfer.append(type, item);
|
|
1446
1510
|
if (type === this.treeMimeType) {
|
|
@@ -1454,7 +1518,7 @@ let CustomTreeViewDragAndDrop = class CustomTreeViewDragAndDrop {
|
|
|
1454
1518
|
}
|
|
1455
1519
|
const additionalDataTransfer = await this.treeViewsDragAndDropService.removeDragOperationTransfer(willDropUuid);
|
|
1456
1520
|
if (additionalDataTransfer) {
|
|
1457
|
-
for (const [type, item] of additionalDataTransfer
|
|
1521
|
+
for (const [type, item] of additionalDataTransfer) {
|
|
1458
1522
|
outDataTransfer.append(type, item);
|
|
1459
1523
|
}
|
|
1460
1524
|
}
|
|
@@ -552,7 +552,7 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
|
|
|
552
552
|
}
|
|
553
553
|
saveState() {
|
|
554
554
|
this.panes.forEach((view) => view.saveState());
|
|
555
|
-
this.storageService.store(this.visibleViewsStorageId, this.length, 1 ,
|
|
555
|
+
this.storageService.store(this.visibleViewsStorageId, this.length, 1 , 1 );
|
|
556
556
|
}
|
|
557
557
|
onContextMenu(event, viewPane) {
|
|
558
558
|
event.stopPropagation();
|
|
@@ -2,7 +2,7 @@ import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform
|
|
|
2
2
|
import { localize } from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
|
|
4
4
|
import { isMacintosh, isWeb, isNative, isWindows, isLinux } from 'monaco-editor/esm/vs/base/common/platform.js';
|
|
5
|
-
import { workbenchConfigurationNodeBase } from '../common/configuration.js';
|
|
5
|
+
import { workbenchConfigurationNodeBase, securityConfigurationNodeBase } from '../common/configuration.js';
|
|
6
6
|
import { isStandalone } from 'monaco-editor/esm/vs/base/browser/browser.js';
|
|
7
7
|
const registry = ( Registry.as(Extensions.Configuration));
|
|
8
8
|
(function registerConfiguration() {
|
|
@@ -192,7 +192,7 @@ const registry = ( Registry.as(Extensions.Configuration));
|
|
|
192
192
|
},
|
|
193
193
|
'workbench.editor.tabSizing': {
|
|
194
194
|
'type': 'string',
|
|
195
|
-
'enum': ['fit', 'shrink'],
|
|
195
|
+
'enum': ['fit', 'shrink', 'fixed'],
|
|
196
196
|
'default': 'fit',
|
|
197
197
|
'enumDescriptions': [
|
|
198
198
|
( localize(
|
|
@@ -202,11 +202,26 @@ const registry = ( Registry.as(Extensions.Configuration));
|
|
|
202
202
|
( localize(
|
|
203
203
|
'workbench.editor.tabSizing.shrink',
|
|
204
204
|
"Allow tabs to get smaller when the available space is not enough to show all tabs at once."
|
|
205
|
+
)),
|
|
206
|
+
( localize(
|
|
207
|
+
'workbench.editor.tabSizing.fixed',
|
|
208
|
+
"Make all tabs the same size, while allowing them to get smaller when the available space is not enough to show all tabs at once."
|
|
205
209
|
))
|
|
206
210
|
],
|
|
207
211
|
'markdownDescription': ( localize(
|
|
208
212
|
{ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'tabSizing' },
|
|
209
|
-
"Controls the
|
|
213
|
+
"Controls the size of editor tabs. This value is ignored when `#workbench.editor.showTabs#` is disabled."
|
|
214
|
+
))
|
|
215
|
+
},
|
|
216
|
+
'workbench.editor.tabSizingFixedMaxWidth': {
|
|
217
|
+
'type': 'number',
|
|
218
|
+
'default': 160,
|
|
219
|
+
'minimum': 50,
|
|
220
|
+
'markdownDescription': ( localize(
|
|
221
|
+
'workbench.editor.tabSizingFixedMaxWidth',
|
|
222
|
+
"Controls the maximum width of tabs when {0} is set to {1}.",
|
|
223
|
+
'`#workbench.editor.tabSizing#`',
|
|
224
|
+
'`fixed`'
|
|
210
225
|
))
|
|
211
226
|
},
|
|
212
227
|
'workbench.editor.pinnedTabSizing': {
|
|
@@ -229,7 +244,7 @@ const registry = ( Registry.as(Extensions.Configuration));
|
|
|
229
244
|
],
|
|
230
245
|
'markdownDescription': ( localize(
|
|
231
246
|
{ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'pinnedTabSizing' },
|
|
232
|
-
"Controls the
|
|
247
|
+
"Controls the size of pinned editor tabs. Pinned tabs are sorted to the beginning of all opened tabs and typically do not close until unpinned. This value is ignored when `#workbench.editor.showTabs#` is disabled."
|
|
233
248
|
))
|
|
234
249
|
},
|
|
235
250
|
'workbench.editor.splitSizing': {
|
|
@@ -248,7 +263,7 @@ const registry = ( Registry.as(Extensions.Configuration));
|
|
|
248
263
|
],
|
|
249
264
|
'description': ( localize(
|
|
250
265
|
{ comment: ['This is the description for a setting. Values surrounded by single quotes are not to be translated.'], key: 'splitSizing' },
|
|
251
|
-
"Controls the
|
|
266
|
+
"Controls the size of editor groups when splitting them."
|
|
252
267
|
))
|
|
253
268
|
},
|
|
254
269
|
'workbench.editor.splitOnDragAndDrop': {
|
|
@@ -490,9 +505,12 @@ const registry = ( Registry.as(Extensions.Configuration));
|
|
|
490
505
|
},
|
|
491
506
|
'workbench.localHistory.exclude': {
|
|
492
507
|
'type': 'object',
|
|
508
|
+
'patternProperties': {
|
|
509
|
+
'.*': { 'type': 'boolean' }
|
|
510
|
+
},
|
|
493
511
|
'markdownDescription': ( localize(
|
|
494
512
|
'exclude',
|
|
495
|
-
"Configure [glob patterns](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options) for excluding files from the local file history. Changing this setting has no effect on existing local file history entries."
|
|
513
|
+
"Configure paths or [glob patterns](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options) for excluding files from the local file history. Glob patterns are always evaluated relative to the path of the workspace folder unless they are absolute paths. Changing this setting has no effect on existing local file history entries."
|
|
496
514
|
)),
|
|
497
515
|
'scope': 4
|
|
498
516
|
},
|
|
@@ -531,6 +549,14 @@ const registry = ( Registry.as(Extensions.Configuration));
|
|
|
531
549
|
)),
|
|
532
550
|
'default': false
|
|
533
551
|
},
|
|
552
|
+
'workbench.commandPalette.experimental.useSemanticSimilarity': {
|
|
553
|
+
'type': 'boolean',
|
|
554
|
+
'description': ( localize(
|
|
555
|
+
'useSemanticSimilarity',
|
|
556
|
+
"Controls whether the command palette should include similar commands. You must have an extension installed that provides Semantic Similarity."
|
|
557
|
+
)),
|
|
558
|
+
'default': false
|
|
559
|
+
},
|
|
534
560
|
'workbench.quickOpen.closeOnFocusLost': {
|
|
535
561
|
'type': 'boolean',
|
|
536
562
|
'description': ( localize(
|
|
@@ -1105,4 +1131,37 @@ const registry = ( Registry.as(Extensions.Configuration));
|
|
|
1105
1131
|
}
|
|
1106
1132
|
}
|
|
1107
1133
|
});
|
|
1134
|
+
registry.registerConfiguration({
|
|
1135
|
+
...securityConfigurationNodeBase,
|
|
1136
|
+
'properties': {
|
|
1137
|
+
'security.allowedUNCHosts': {
|
|
1138
|
+
'type': 'array',
|
|
1139
|
+
'items': {
|
|
1140
|
+
'type': 'string',
|
|
1141
|
+
'pattern': '^[^\\\\]+$',
|
|
1142
|
+
'patternErrorMessage': ( localize(
|
|
1143
|
+
'security.allowedUNCHosts.patternErrorMessage',
|
|
1144
|
+
'UNC host names must not contain backslashes.'
|
|
1145
|
+
))
|
|
1146
|
+
},
|
|
1147
|
+
'default': [],
|
|
1148
|
+
'markdownDescription': ( localize(
|
|
1149
|
+
'security.allowedUNCHosts',
|
|
1150
|
+
'A set of UNC host names (without leading or trailing backslash, for example `192.168.0.1` or `my-server`) to allow without user confirmation. If a UNC host is being accessed that is not allowed via this setting or has not been acknowledged via user confirmation, an error will occur and the operation stopped. A restart is required when changing this setting. Find out more about this setting at https://aka.ms/vscode-windows-unc.'
|
|
1151
|
+
)),
|
|
1152
|
+
'included': isWeb ? true : isWindows,
|
|
1153
|
+
'scope': 2
|
|
1154
|
+
},
|
|
1155
|
+
'security.restrictUNCAccess': {
|
|
1156
|
+
'type': 'boolean',
|
|
1157
|
+
'default': true,
|
|
1158
|
+
'markdownDescription': ( localize(
|
|
1159
|
+
'security.restrictUNCAccess',
|
|
1160
|
+
'If enabled, only allows access to UNC host names that are allowed by the `#security.allowedUNCHosts#` setting or after user confirmation. Find out more about this setting at https://aka.ms/vscode-windows-unc.'
|
|
1161
|
+
)),
|
|
1162
|
+
'included': isWeb ? true : isWindows,
|
|
1163
|
+
'scope': 2
|
|
1164
|
+
}
|
|
1165
|
+
}
|
|
1166
|
+
});
|
|
1108
1167
|
})();
|
|
@@ -5,4 +5,11 @@ const workbenchConfigurationNodeBase = ( Object.freeze({
|
|
|
5
5
|
'title': ( localize('workbenchConfigurationTitle', "Workbench")),
|
|
6
6
|
'type': 'object',
|
|
7
7
|
}));
|
|
8
|
-
|
|
8
|
+
const securityConfigurationNodeBase = ( Object.freeze({
|
|
9
|
+
'id': 'security',
|
|
10
|
+
'scope': 1 ,
|
|
11
|
+
'title': ( localize('securityConfigurationTitle', "Security")),
|
|
12
|
+
'type': 'object',
|
|
13
|
+
'order': 7
|
|
14
|
+
}));
|
|
15
|
+
export { securityConfigurationNodeBase, workbenchConfigurationNodeBase };
|