@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
|
@@ -0,0 +1,355 @@
|
|
|
1
|
+
import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.es6.js';
|
|
2
|
+
import * as arrays from 'monaco-editor/esm/vs/base/common/arrays.js';
|
|
3
|
+
import { DeferredPromise } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
4
|
+
import { CancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
|
|
5
|
+
import { Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
6
|
+
import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
|
|
7
|
+
import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
8
|
+
import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
|
|
9
|
+
import { isNumber } from 'monaco-editor/esm/vs/base/common/types.js';
|
|
10
|
+
import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
|
|
11
|
+
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
12
|
+
import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
13
|
+
import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
|
|
14
|
+
import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
|
|
15
|
+
import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
|
|
16
|
+
import { IEditorService } from '../../editor/common/editorService.js';
|
|
17
|
+
import { IExtensionService } from '../../extensions/common/extensions.js';
|
|
18
|
+
import { deserializeSearchError, pathIncludedInQuery, isFileMatch, isProgressMessage, SearchErrorCode, FileMatch } from './search.js';
|
|
19
|
+
import { editorMatchesToTextSearchResults, addContextToEditorMatches } from './searchHelpers.js';
|
|
20
|
+
let SearchService = class SearchService extends Disposable {
|
|
21
|
+
constructor(modelService, editorService, telemetryService, logService, extensionService, fileService, uriIdentityService) {
|
|
22
|
+
super();
|
|
23
|
+
this.modelService = modelService;
|
|
24
|
+
this.editorService = editorService;
|
|
25
|
+
this.telemetryService = telemetryService;
|
|
26
|
+
this.logService = logService;
|
|
27
|
+
this.extensionService = extensionService;
|
|
28
|
+
this.fileService = fileService;
|
|
29
|
+
this.uriIdentityService = uriIdentityService;
|
|
30
|
+
this.fileSearchProviders = ( new Map());
|
|
31
|
+
this.textSearchProviders = ( new Map());
|
|
32
|
+
this.deferredFileSearchesByScheme = ( new Map());
|
|
33
|
+
this.deferredTextSearchesByScheme = ( new Map());
|
|
34
|
+
this.loggedSchemesMissingProviders = ( new Set());
|
|
35
|
+
}
|
|
36
|
+
registerSearchResultProvider(scheme, type, provider) {
|
|
37
|
+
let list;
|
|
38
|
+
let deferredMap;
|
|
39
|
+
if (type === 0 ) {
|
|
40
|
+
list = this.fileSearchProviders;
|
|
41
|
+
deferredMap = this.deferredFileSearchesByScheme;
|
|
42
|
+
}
|
|
43
|
+
else if (type === 1 ) {
|
|
44
|
+
list = this.textSearchProviders;
|
|
45
|
+
deferredMap = this.deferredTextSearchesByScheme;
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
throw new Error('Unknown SearchProviderType');
|
|
49
|
+
}
|
|
50
|
+
list.set(scheme, provider);
|
|
51
|
+
if (( deferredMap.has(scheme))) {
|
|
52
|
+
deferredMap.get(scheme).complete(provider);
|
|
53
|
+
deferredMap.delete(scheme);
|
|
54
|
+
}
|
|
55
|
+
return toDisposable(() => {
|
|
56
|
+
list.delete(scheme);
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
async textSearch(query, token, onProgress, notebookURIs) {
|
|
60
|
+
const localResults = this.getLocalResults(query);
|
|
61
|
+
if (onProgress) {
|
|
62
|
+
arrays.coalesce([...( localResults.results.values())]).forEach(onProgress);
|
|
63
|
+
}
|
|
64
|
+
const onProviderProgress = (progress) => {
|
|
65
|
+
if (isFileMatch(progress)) {
|
|
66
|
+
if (!( localResults.results.has(progress.resource)) && !(notebookURIs && ( notebookURIs.has(progress.resource))) && onProgress) {
|
|
67
|
+
onProgress(progress);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
else if (onProgress) {
|
|
71
|
+
onProgress(progress);
|
|
72
|
+
}
|
|
73
|
+
if (isProgressMessage(progress)) {
|
|
74
|
+
this.logService.debug('SearchService#search', progress.message);
|
|
75
|
+
}
|
|
76
|
+
};
|
|
77
|
+
const otherResults = await this.doSearch(query, token, onProviderProgress);
|
|
78
|
+
return {
|
|
79
|
+
...otherResults,
|
|
80
|
+
...{
|
|
81
|
+
limitHit: otherResults.limitHit || localResults.limitHit
|
|
82
|
+
},
|
|
83
|
+
results: [...otherResults.results, ...arrays.coalesce([...( localResults.results.values())])]
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
fileSearch(query, token) {
|
|
87
|
+
return this.doSearch(query, token);
|
|
88
|
+
}
|
|
89
|
+
doSearch(query, token, onProgress) {
|
|
90
|
+
this.logService.trace('SearchService#search', JSON.stringify(query));
|
|
91
|
+
const schemesInQuery = this.getSchemesInQuery(query);
|
|
92
|
+
const providerActivations = [Promise.resolve(null)];
|
|
93
|
+
schemesInQuery.forEach(scheme => providerActivations.push(this.extensionService.activateByEvent(`onSearch:${scheme}`)));
|
|
94
|
+
providerActivations.push(this.extensionService.activateByEvent('onSearch:file'));
|
|
95
|
+
const providerPromise = (async () => {
|
|
96
|
+
await Promise.all(providerActivations);
|
|
97
|
+
await this.extensionService.whenInstalledExtensionsRegistered();
|
|
98
|
+
if (token && token.isCancellationRequested) {
|
|
99
|
+
return Promise.reject(( new CancellationError()));
|
|
100
|
+
}
|
|
101
|
+
const progressCallback = (item) => {
|
|
102
|
+
if (token && token.isCancellationRequested) {
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
onProgress?.(item);
|
|
106
|
+
};
|
|
107
|
+
const exists = await Promise.all(( query.folderQueries.map(query => this.fileService.exists(query.folder))));
|
|
108
|
+
query.folderQueries = query.folderQueries.filter((_, i) => exists[i]);
|
|
109
|
+
let completes = await this.searchWithProviders(query, progressCallback, token);
|
|
110
|
+
completes = arrays.coalesce(completes);
|
|
111
|
+
if (!completes.length) {
|
|
112
|
+
return {
|
|
113
|
+
limitHit: false,
|
|
114
|
+
results: [],
|
|
115
|
+
messages: [],
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
return {
|
|
119
|
+
limitHit: completes[0] && completes[0].limitHit,
|
|
120
|
+
stats: completes[0].stats,
|
|
121
|
+
messages: arrays.coalesce(arrays.flatten(( completes.map(i => i.messages)))).filter(arrays.uniqueFilter(message => message.type + message.text + message.trusted)),
|
|
122
|
+
results: arrays.flatten(( completes.map((c) => c.results)))
|
|
123
|
+
};
|
|
124
|
+
})();
|
|
125
|
+
return ( new Promise((resolve, reject) => {
|
|
126
|
+
if (token) {
|
|
127
|
+
token.onCancellationRequested(() => {
|
|
128
|
+
reject(( new CancellationError()));
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
providerPromise.then(resolve, reject);
|
|
132
|
+
}));
|
|
133
|
+
}
|
|
134
|
+
getSchemesInQuery(query) {
|
|
135
|
+
const schemes = ( new Set());
|
|
136
|
+
query.folderQueries?.forEach(fq => schemes.add(fq.folder.scheme));
|
|
137
|
+
query.extraFileResources?.forEach(extraFile => schemes.add(extraFile.scheme));
|
|
138
|
+
return schemes;
|
|
139
|
+
}
|
|
140
|
+
async waitForProvider(queryType, scheme) {
|
|
141
|
+
const deferredMap = queryType === 1 ?
|
|
142
|
+
this.deferredFileSearchesByScheme :
|
|
143
|
+
this.deferredTextSearchesByScheme;
|
|
144
|
+
if (( deferredMap.has(scheme))) {
|
|
145
|
+
return deferredMap.get(scheme).p;
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
const deferred = ( new DeferredPromise());
|
|
149
|
+
deferredMap.set(scheme, deferred);
|
|
150
|
+
return deferred.p;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
async searchWithProviders(query, onProviderProgress, token) {
|
|
154
|
+
const e2eSW = StopWatch.create(false);
|
|
155
|
+
const searchPs = [];
|
|
156
|
+
const fqs = this.groupFolderQueriesByScheme(query);
|
|
157
|
+
const someSchemeHasProvider = ( [...( fqs.keys())].some(scheme => {
|
|
158
|
+
return query.type === 1 ?
|
|
159
|
+
( this.fileSearchProviders.has(scheme)) :
|
|
160
|
+
( this.textSearchProviders.has(scheme));
|
|
161
|
+
}));
|
|
162
|
+
await Promise.all(( [...( fqs.keys())].map(async (scheme) => {
|
|
163
|
+
const schemeFQs = fqs.get(scheme);
|
|
164
|
+
let provider = query.type === 1 ?
|
|
165
|
+
this.fileSearchProviders.get(scheme) :
|
|
166
|
+
this.textSearchProviders.get(scheme);
|
|
167
|
+
if (!provider) {
|
|
168
|
+
if (someSchemeHasProvider) {
|
|
169
|
+
if (!( this.loggedSchemesMissingProviders.has(scheme))) {
|
|
170
|
+
this.logService.warn(`No search provider registered for scheme: ${scheme}. Another scheme has a provider, not waiting for ${scheme}`);
|
|
171
|
+
this.loggedSchemesMissingProviders.add(scheme);
|
|
172
|
+
}
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
if (!( this.loggedSchemesMissingProviders.has(scheme))) {
|
|
177
|
+
this.logService.warn(`No search provider registered for scheme: ${scheme}, waiting`);
|
|
178
|
+
this.loggedSchemesMissingProviders.add(scheme);
|
|
179
|
+
}
|
|
180
|
+
provider = await this.waitForProvider(query.type, scheme);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
const oneSchemeQuery = {
|
|
184
|
+
...query,
|
|
185
|
+
...{
|
|
186
|
+
folderQueries: schemeFQs
|
|
187
|
+
}
|
|
188
|
+
};
|
|
189
|
+
searchPs.push(query.type === 1 ?
|
|
190
|
+
provider.fileSearch(oneSchemeQuery, token) :
|
|
191
|
+
provider.textSearch(oneSchemeQuery, onProviderProgress, token));
|
|
192
|
+
})));
|
|
193
|
+
return Promise.all(searchPs).then(completes => {
|
|
194
|
+
const endToEndTime = e2eSW.elapsed();
|
|
195
|
+
this.logService.trace(`SearchService#search: ${endToEndTime}ms`);
|
|
196
|
+
completes.forEach(complete => {
|
|
197
|
+
this.sendTelemetry(query, endToEndTime, complete);
|
|
198
|
+
});
|
|
199
|
+
return completes;
|
|
200
|
+
}, err => {
|
|
201
|
+
const endToEndTime = e2eSW.elapsed();
|
|
202
|
+
this.logService.trace(`SearchService#search: ${endToEndTime}ms`);
|
|
203
|
+
const searchError = deserializeSearchError(err);
|
|
204
|
+
this.logService.trace(`SearchService#searchError: ${searchError.message}`);
|
|
205
|
+
this.sendTelemetry(query, endToEndTime, undefined, searchError);
|
|
206
|
+
throw searchError;
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
groupFolderQueriesByScheme(query) {
|
|
210
|
+
const queries = ( new Map());
|
|
211
|
+
query.folderQueries.forEach(fq => {
|
|
212
|
+
const schemeFQs = queries.get(fq.folder.scheme) || [];
|
|
213
|
+
schemeFQs.push(fq);
|
|
214
|
+
queries.set(fq.folder.scheme, schemeFQs);
|
|
215
|
+
});
|
|
216
|
+
return queries;
|
|
217
|
+
}
|
|
218
|
+
sendTelemetry(query, endToEndTime, complete, err) {
|
|
219
|
+
const fileSchemeOnly = query.folderQueries.every(fq => fq.folder.scheme === Schemas.file);
|
|
220
|
+
const otherSchemeOnly = query.folderQueries.every(fq => fq.folder.scheme !== Schemas.file);
|
|
221
|
+
const scheme = fileSchemeOnly ? Schemas.file :
|
|
222
|
+
otherSchemeOnly ? 'other' :
|
|
223
|
+
'mixed';
|
|
224
|
+
if (query.type === 1 && complete && complete.stats) {
|
|
225
|
+
const fileSearchStats = complete.stats;
|
|
226
|
+
if (fileSearchStats.fromCache) {
|
|
227
|
+
const cacheStats = fileSearchStats.detailStats;
|
|
228
|
+
this.telemetryService.publicLog2('cachedSearchComplete', {
|
|
229
|
+
reason: query._reason,
|
|
230
|
+
resultCount: fileSearchStats.resultCount,
|
|
231
|
+
workspaceFolderCount: query.folderQueries.length,
|
|
232
|
+
endToEndTime: endToEndTime,
|
|
233
|
+
sortingTime: fileSearchStats.sortingTime,
|
|
234
|
+
cacheWasResolved: cacheStats.cacheWasResolved,
|
|
235
|
+
cacheLookupTime: cacheStats.cacheLookupTime,
|
|
236
|
+
cacheFilterTime: cacheStats.cacheFilterTime,
|
|
237
|
+
cacheEntryCount: cacheStats.cacheEntryCount,
|
|
238
|
+
scheme
|
|
239
|
+
});
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
const searchEngineStats = fileSearchStats.detailStats;
|
|
243
|
+
this.telemetryService.publicLog2('searchComplete', {
|
|
244
|
+
reason: query._reason,
|
|
245
|
+
resultCount: fileSearchStats.resultCount,
|
|
246
|
+
workspaceFolderCount: query.folderQueries.length,
|
|
247
|
+
endToEndTime: endToEndTime,
|
|
248
|
+
sortingTime: fileSearchStats.sortingTime,
|
|
249
|
+
fileWalkTime: searchEngineStats.fileWalkTime,
|
|
250
|
+
directoriesWalked: searchEngineStats.directoriesWalked,
|
|
251
|
+
filesWalked: searchEngineStats.filesWalked,
|
|
252
|
+
cmdTime: searchEngineStats.cmdTime,
|
|
253
|
+
cmdResultCount: searchEngineStats.cmdResultCount,
|
|
254
|
+
scheme
|
|
255
|
+
});
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
else if (query.type === 2 ) {
|
|
259
|
+
let errorType;
|
|
260
|
+
if (err) {
|
|
261
|
+
errorType = err.code === SearchErrorCode.regexParseError ? 'regex' :
|
|
262
|
+
err.code === SearchErrorCode.unknownEncoding ? 'encoding' :
|
|
263
|
+
err.code === SearchErrorCode.globParseError ? 'glob' :
|
|
264
|
+
err.code === SearchErrorCode.invalidLiteral ? 'literal' :
|
|
265
|
+
err.code === SearchErrorCode.other ? 'other' :
|
|
266
|
+
err.code === SearchErrorCode.canceled ? 'canceled' :
|
|
267
|
+
'unknown';
|
|
268
|
+
}
|
|
269
|
+
this.telemetryService.publicLog2('textSearchComplete', {
|
|
270
|
+
reason: query._reason,
|
|
271
|
+
workspaceFolderCount: query.folderQueries.length,
|
|
272
|
+
endToEndTime: endToEndTime,
|
|
273
|
+
scheme,
|
|
274
|
+
error: errorType,
|
|
275
|
+
});
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
getLocalResults(query) {
|
|
279
|
+
const localResults = ( new ResourceMap(uri => this.uriIdentityService.extUri.getComparisonKey(uri)));
|
|
280
|
+
let limitHit = false;
|
|
281
|
+
if (query.type === 2 ) {
|
|
282
|
+
const canonicalToOriginalResources = ( new ResourceMap());
|
|
283
|
+
for (const editorInput of this.editorService.editors) {
|
|
284
|
+
const canonical = EditorResourceAccessor.getCanonicalUri(editorInput, { supportSideBySide: SideBySideEditor.PRIMARY });
|
|
285
|
+
const original = EditorResourceAccessor.getOriginalUri(editorInput, { supportSideBySide: SideBySideEditor.PRIMARY });
|
|
286
|
+
if (canonical) {
|
|
287
|
+
canonicalToOriginalResources.set(canonical, original ?? canonical);
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
const models = this.modelService.getModels();
|
|
291
|
+
models.forEach((model) => {
|
|
292
|
+
const resource = model.uri;
|
|
293
|
+
if (!resource) {
|
|
294
|
+
return;
|
|
295
|
+
}
|
|
296
|
+
if (limitHit) {
|
|
297
|
+
return;
|
|
298
|
+
}
|
|
299
|
+
const originalResource = canonicalToOriginalResources.get(resource);
|
|
300
|
+
if (!originalResource) {
|
|
301
|
+
return;
|
|
302
|
+
}
|
|
303
|
+
if (model.getLanguageId() === 'search-result' && !(query.includePattern && query.includePattern['**/*.code-search'])) {
|
|
304
|
+
return;
|
|
305
|
+
}
|
|
306
|
+
if (originalResource.scheme !== Schemas.untitled && !this.fileService.hasProvider(originalResource)) {
|
|
307
|
+
return;
|
|
308
|
+
}
|
|
309
|
+
if (originalResource.scheme === 'git') {
|
|
310
|
+
return;
|
|
311
|
+
}
|
|
312
|
+
if (!this.matches(originalResource, query)) {
|
|
313
|
+
return;
|
|
314
|
+
}
|
|
315
|
+
const askMax = isNumber(query.maxResults) ? query.maxResults + 1 : Number.MAX_SAFE_INTEGER;
|
|
316
|
+
let matches = model.findMatches(query.contentPattern.pattern, false, !!query.contentPattern.isRegExp, !!query.contentPattern.isCaseSensitive, query.contentPattern.isWordMatch ? query.contentPattern.wordSeparators : null, false, askMax);
|
|
317
|
+
if (matches.length) {
|
|
318
|
+
if (askMax && matches.length >= askMax) {
|
|
319
|
+
limitHit = true;
|
|
320
|
+
matches = matches.slice(0, askMax - 1);
|
|
321
|
+
}
|
|
322
|
+
const fileMatch = ( new FileMatch(originalResource));
|
|
323
|
+
localResults.set(originalResource, fileMatch);
|
|
324
|
+
const textSearchResults = editorMatchesToTextSearchResults(matches, model, query.previewOptions);
|
|
325
|
+
fileMatch.results = addContextToEditorMatches(textSearchResults, model, query);
|
|
326
|
+
}
|
|
327
|
+
else {
|
|
328
|
+
localResults.set(originalResource, null);
|
|
329
|
+
}
|
|
330
|
+
});
|
|
331
|
+
}
|
|
332
|
+
return {
|
|
333
|
+
results: localResults,
|
|
334
|
+
limitHit
|
|
335
|
+
};
|
|
336
|
+
}
|
|
337
|
+
matches(resource, query) {
|
|
338
|
+
return pathIncludedInQuery(query, resource.fsPath);
|
|
339
|
+
}
|
|
340
|
+
async clearCache(cacheKey) {
|
|
341
|
+
const clearPs = ( Array.from(( this.fileSearchProviders.values()))
|
|
342
|
+
.map(provider => provider && provider.clearCache(cacheKey)));
|
|
343
|
+
await Promise.all(clearPs);
|
|
344
|
+
}
|
|
345
|
+
};
|
|
346
|
+
SearchService = ( __decorate([
|
|
347
|
+
( __param(0, IModelService)),
|
|
348
|
+
( __param(1, IEditorService)),
|
|
349
|
+
( __param(2, ITelemetryService)),
|
|
350
|
+
( __param(3, ILogService)),
|
|
351
|
+
( __param(4, IExtensionService)),
|
|
352
|
+
( __param(5, IFileService)),
|
|
353
|
+
( __param(6, IUriIdentityService))
|
|
354
|
+
], SearchService));
|
|
355
|
+
export { SearchService };
|
|
@@ -0,0 +1,309 @@
|
|
|
1
|
+
import { flatten, mapArrayOrNot } from 'monaco-editor/esm/vs/base/common/arrays.js';
|
|
2
|
+
import { isThenable } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
3
|
+
import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
|
|
4
|
+
import { toErrorMessage } from 'monaco-editor/esm/vs/base/common/errorMessage.js';
|
|
5
|
+
import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
6
|
+
import * as path from 'monaco-editor/esm/vs/base/common/path.js';
|
|
7
|
+
import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
8
|
+
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
9
|
+
import { resolvePatternsForProvider, QueryGlobTester, hasSiblingPromiseFn } from './search.js';
|
|
10
|
+
class TextSearchManager {
|
|
11
|
+
constructor(query, provider, fileUtils, processType) {
|
|
12
|
+
this.query = query;
|
|
13
|
+
this.provider = provider;
|
|
14
|
+
this.fileUtils = fileUtils;
|
|
15
|
+
this.processType = processType;
|
|
16
|
+
this.collector = null;
|
|
17
|
+
this.isLimitHit = false;
|
|
18
|
+
this.resultCount = 0;
|
|
19
|
+
}
|
|
20
|
+
search(onProgress, token) {
|
|
21
|
+
const folderQueries = this.query.folderQueries || [];
|
|
22
|
+
const tokenSource = ( new CancellationTokenSource());
|
|
23
|
+
token.onCancellationRequested(() => tokenSource.cancel());
|
|
24
|
+
return ( new Promise((resolve, reject) => {
|
|
25
|
+
this.collector = ( new TextSearchResultsCollector(onProgress));
|
|
26
|
+
let isCanceled = false;
|
|
27
|
+
const onResult = (result, folderIdx) => {
|
|
28
|
+
if (isCanceled) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
if (!this.isLimitHit) {
|
|
32
|
+
const resultSize = this.resultSize(result);
|
|
33
|
+
if (extensionResultIsMatch(result) && typeof this.query.maxResults === 'number' && this.resultCount + resultSize > this.query.maxResults) {
|
|
34
|
+
this.isLimitHit = true;
|
|
35
|
+
isCanceled = true;
|
|
36
|
+
tokenSource.cancel();
|
|
37
|
+
result = this.trimResultToSize(result, this.query.maxResults - this.resultCount);
|
|
38
|
+
}
|
|
39
|
+
const newResultSize = this.resultSize(result);
|
|
40
|
+
this.resultCount += newResultSize;
|
|
41
|
+
if (newResultSize > 0 || !extensionResultIsMatch(result)) {
|
|
42
|
+
this.collector.add(result, folderIdx);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
Promise.all(( folderQueries.map((fq, i) => {
|
|
47
|
+
return this.searchInFolder(fq, r => onResult(r, i), tokenSource.token);
|
|
48
|
+
}))).then(results => {
|
|
49
|
+
tokenSource.dispose();
|
|
50
|
+
this.collector.flush();
|
|
51
|
+
const someFolderHitLImit = ( results.some(result => !!result && !!result.limitHit));
|
|
52
|
+
resolve({
|
|
53
|
+
limitHit: this.isLimitHit || someFolderHitLImit,
|
|
54
|
+
messages: flatten(( results.map(result => {
|
|
55
|
+
if (!result?.message) {
|
|
56
|
+
return [];
|
|
57
|
+
}
|
|
58
|
+
if (Array.isArray(result.message)) {
|
|
59
|
+
return result.message;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
return [result.message];
|
|
63
|
+
}
|
|
64
|
+
}))),
|
|
65
|
+
stats: {
|
|
66
|
+
type: this.processType
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
}, (err) => {
|
|
70
|
+
tokenSource.dispose();
|
|
71
|
+
const errMsg = toErrorMessage(err);
|
|
72
|
+
reject(( new Error(errMsg)));
|
|
73
|
+
});
|
|
74
|
+
}));
|
|
75
|
+
}
|
|
76
|
+
resultSize(result) {
|
|
77
|
+
if (extensionResultIsMatch(result)) {
|
|
78
|
+
return Array.isArray(result.ranges) ?
|
|
79
|
+
result.ranges.length :
|
|
80
|
+
1;
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
return 0;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
trimResultToSize(result, size) {
|
|
87
|
+
const rangesArr = Array.isArray(result.ranges) ? result.ranges : [result.ranges];
|
|
88
|
+
const matchesArr = Array.isArray(result.preview.matches) ? result.preview.matches : [result.preview.matches];
|
|
89
|
+
return {
|
|
90
|
+
ranges: rangesArr.slice(0, size),
|
|
91
|
+
preview: {
|
|
92
|
+
matches: matchesArr.slice(0, size),
|
|
93
|
+
text: result.preview.text
|
|
94
|
+
},
|
|
95
|
+
uri: result.uri
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
async searchInFolder(folderQuery, onResult, token) {
|
|
99
|
+
const queryTester = ( new QueryGlobTester(this.query, folderQuery));
|
|
100
|
+
const testingPs = [];
|
|
101
|
+
const progress = {
|
|
102
|
+
report: (result) => {
|
|
103
|
+
if (!this.validateProviderResult(result)) {
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
const hasSibling = folderQuery.folder.scheme === Schemas.file ?
|
|
107
|
+
hasSiblingPromiseFn(() => {
|
|
108
|
+
return this.fileUtils.readdir(resources.dirname(result.uri));
|
|
109
|
+
}) :
|
|
110
|
+
undefined;
|
|
111
|
+
const relativePath = resources.relativePath(folderQuery.folder, result.uri);
|
|
112
|
+
if (relativePath) {
|
|
113
|
+
const included = queryTester.includedInQuery(relativePath, path.basename(relativePath), hasSibling);
|
|
114
|
+
if (isThenable(included)) {
|
|
115
|
+
testingPs.push(included.then(isIncluded => {
|
|
116
|
+
if (isIncluded) {
|
|
117
|
+
onResult(result);
|
|
118
|
+
}
|
|
119
|
+
}));
|
|
120
|
+
}
|
|
121
|
+
else if (included) {
|
|
122
|
+
onResult(result);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
};
|
|
127
|
+
const searchOptions = this.getSearchOptionsForFolder(folderQuery);
|
|
128
|
+
const result = await this.provider.provideTextSearchResults(patternInfoToQuery(this.query.contentPattern), searchOptions, progress, token);
|
|
129
|
+
if (testingPs.length) {
|
|
130
|
+
await Promise.all(testingPs);
|
|
131
|
+
}
|
|
132
|
+
return result;
|
|
133
|
+
}
|
|
134
|
+
validateProviderResult(result) {
|
|
135
|
+
if (extensionResultIsMatch(result)) {
|
|
136
|
+
if (Array.isArray(result.ranges)) {
|
|
137
|
+
if (!Array.isArray(result.preview.matches)) {
|
|
138
|
+
console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same type.');
|
|
139
|
+
return false;
|
|
140
|
+
}
|
|
141
|
+
if (result.preview.matches.length !== result.ranges.length) {
|
|
142
|
+
console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
|
|
143
|
+
return false;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
if (Array.isArray(result.preview.matches)) {
|
|
148
|
+
console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
|
|
149
|
+
return false;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
return true;
|
|
154
|
+
}
|
|
155
|
+
getSearchOptionsForFolder(fq) {
|
|
156
|
+
const includes = resolvePatternsForProvider(this.query.includePattern, fq.includePattern);
|
|
157
|
+
const excludes = resolvePatternsForProvider(this.query.excludePattern, fq.excludePattern);
|
|
158
|
+
const options = {
|
|
159
|
+
folder: ( URI.from(fq.folder)),
|
|
160
|
+
excludes,
|
|
161
|
+
includes,
|
|
162
|
+
useIgnoreFiles: !fq.disregardIgnoreFiles,
|
|
163
|
+
useGlobalIgnoreFiles: !fq.disregardGlobalIgnoreFiles,
|
|
164
|
+
useParentIgnoreFiles: !fq.disregardParentIgnoreFiles,
|
|
165
|
+
followSymlinks: !fq.ignoreSymlinks,
|
|
166
|
+
encoding: fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding),
|
|
167
|
+
maxFileSize: this.query.maxFileSize,
|
|
168
|
+
maxResults: this.query.maxResults,
|
|
169
|
+
previewOptions: this.query.previewOptions,
|
|
170
|
+
afterContext: this.query.afterContext,
|
|
171
|
+
beforeContext: this.query.beforeContext
|
|
172
|
+
};
|
|
173
|
+
options.usePCRE2 = this.query.usePCRE2;
|
|
174
|
+
return options;
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
function patternInfoToQuery(patternInfo) {
|
|
178
|
+
return {
|
|
179
|
+
isCaseSensitive: patternInfo.isCaseSensitive || false,
|
|
180
|
+
isRegExp: patternInfo.isRegExp || false,
|
|
181
|
+
isWordMatch: patternInfo.isWordMatch || false,
|
|
182
|
+
isMultiline: patternInfo.isMultiline || false,
|
|
183
|
+
pattern: patternInfo.pattern
|
|
184
|
+
};
|
|
185
|
+
}
|
|
186
|
+
class TextSearchResultsCollector {
|
|
187
|
+
constructor(_onResult) {
|
|
188
|
+
this._onResult = _onResult;
|
|
189
|
+
this._currentFolderIdx = -1;
|
|
190
|
+
this._currentFileMatch = null;
|
|
191
|
+
this._batchedCollector = ( new BatchedCollector(512, items => this.sendItems(items)));
|
|
192
|
+
}
|
|
193
|
+
add(data, folderIdx) {
|
|
194
|
+
if (this._currentFileMatch && (this._currentFolderIdx !== folderIdx || !resources.isEqual(this._currentUri, data.uri))) {
|
|
195
|
+
this.pushToCollector();
|
|
196
|
+
this._currentFileMatch = null;
|
|
197
|
+
}
|
|
198
|
+
if (!this._currentFileMatch) {
|
|
199
|
+
this._currentFolderIdx = folderIdx;
|
|
200
|
+
this._currentFileMatch = {
|
|
201
|
+
resource: data.uri,
|
|
202
|
+
results: []
|
|
203
|
+
};
|
|
204
|
+
}
|
|
205
|
+
this._currentFileMatch.results.push(extensionResultToFrontendResult(data));
|
|
206
|
+
}
|
|
207
|
+
pushToCollector() {
|
|
208
|
+
const size = this._currentFileMatch && this._currentFileMatch.results ?
|
|
209
|
+
this._currentFileMatch.results.length :
|
|
210
|
+
0;
|
|
211
|
+
this._batchedCollector.addItem(this._currentFileMatch, size);
|
|
212
|
+
}
|
|
213
|
+
flush() {
|
|
214
|
+
this.pushToCollector();
|
|
215
|
+
this._batchedCollector.flush();
|
|
216
|
+
}
|
|
217
|
+
sendItems(items) {
|
|
218
|
+
this._onResult(items);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
function extensionResultToFrontendResult(data) {
|
|
222
|
+
if (extensionResultIsMatch(data)) {
|
|
223
|
+
return {
|
|
224
|
+
preview: {
|
|
225
|
+
matches: mapArrayOrNot(data.preview.matches, m => ({
|
|
226
|
+
startLineNumber: m.start.line,
|
|
227
|
+
startColumn: m.start.character,
|
|
228
|
+
endLineNumber: m.end.line,
|
|
229
|
+
endColumn: m.end.character
|
|
230
|
+
})),
|
|
231
|
+
text: data.preview.text
|
|
232
|
+
},
|
|
233
|
+
ranges: mapArrayOrNot(data.ranges, r => ({
|
|
234
|
+
startLineNumber: r.start.line,
|
|
235
|
+
startColumn: r.start.character,
|
|
236
|
+
endLineNumber: r.end.line,
|
|
237
|
+
endColumn: r.end.character
|
|
238
|
+
}))
|
|
239
|
+
};
|
|
240
|
+
}
|
|
241
|
+
else {
|
|
242
|
+
return {
|
|
243
|
+
text: data.text,
|
|
244
|
+
lineNumber: data.lineNumber
|
|
245
|
+
};
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
function extensionResultIsMatch(data) {
|
|
249
|
+
return !!data.preview;
|
|
250
|
+
}
|
|
251
|
+
class BatchedCollector {
|
|
252
|
+
constructor(maxBatchSize, cb) {
|
|
253
|
+
this.maxBatchSize = maxBatchSize;
|
|
254
|
+
this.cb = cb;
|
|
255
|
+
this.totalNumberCompleted = 0;
|
|
256
|
+
this.batch = [];
|
|
257
|
+
this.batchSize = 0;
|
|
258
|
+
}
|
|
259
|
+
addItem(item, size) {
|
|
260
|
+
if (!item) {
|
|
261
|
+
return;
|
|
262
|
+
}
|
|
263
|
+
this.addItemToBatch(item, size);
|
|
264
|
+
}
|
|
265
|
+
addItems(items, size) {
|
|
266
|
+
if (!items) {
|
|
267
|
+
return;
|
|
268
|
+
}
|
|
269
|
+
this.addItemsToBatch(items, size);
|
|
270
|
+
}
|
|
271
|
+
addItemToBatch(item, size) {
|
|
272
|
+
this.batch.push(item);
|
|
273
|
+
this.batchSize += size;
|
|
274
|
+
this.onUpdate();
|
|
275
|
+
}
|
|
276
|
+
addItemsToBatch(item, size) {
|
|
277
|
+
this.batch = this.batch.concat(item);
|
|
278
|
+
this.batchSize += size;
|
|
279
|
+
this.onUpdate();
|
|
280
|
+
}
|
|
281
|
+
onUpdate() {
|
|
282
|
+
if (this.totalNumberCompleted < BatchedCollector.START_BATCH_AFTER_COUNT) {
|
|
283
|
+
this.flush();
|
|
284
|
+
}
|
|
285
|
+
else if (this.batchSize >= this.maxBatchSize) {
|
|
286
|
+
this.flush();
|
|
287
|
+
}
|
|
288
|
+
else if (!this.timeoutHandle) {
|
|
289
|
+
this.timeoutHandle = setTimeout(() => {
|
|
290
|
+
this.flush();
|
|
291
|
+
}, BatchedCollector.TIMEOUT);
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
flush() {
|
|
295
|
+
if (this.batchSize) {
|
|
296
|
+
this.totalNumberCompleted += this.batchSize;
|
|
297
|
+
this.cb(this.batch);
|
|
298
|
+
this.batch = [];
|
|
299
|
+
this.batchSize = 0;
|
|
300
|
+
if (this.timeoutHandle) {
|
|
301
|
+
clearTimeout(this.timeoutHandle);
|
|
302
|
+
this.timeoutHandle = 0;
|
|
303
|
+
}
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
BatchedCollector.TIMEOUT = 4000;
|
|
308
|
+
BatchedCollector.START_BATCH_AFTER_COUNT = 50;
|
|
309
|
+
export { BatchedCollector, TextSearchManager, TextSearchResultsCollector, extensionResultIsMatch };
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import n from '../../../../../../../node_modules/rollup-plugin-styles/dist/runtime/inject-css.js';
|
|
2
|
+
var css = ".workbench-suggest-widget{display:flex;flex-direction:column;left:0;position:absolute;top:0;width:430px;z-index:40}.workbench-suggest-widget.message{align-items:center;flex-direction:row}.monaco-workbench .workbench-suggest-details,.workbench-suggest-widget{background-color:var(--vscode-editorSuggestWidget-background);border-color:var(--vscode-editorSuggestWidget-border);border-style:solid;border-width:1px;flex:0 1 auto;width:100%}.monaco-workbench.hc-black .workbench-suggest-details,.monaco-workbench.hc-black .workbench-suggest-widget,.monaco-workbench.hc-light .workbench-suggest-details,.monaco-workbench.hc-light .workbench-suggest-widget{border-width:2px}.monaco-workbench .workbench-suggest-widget.with-status-bar .suggest-status-bar{display:flex}.monaco-workbench .workbench-suggest-widget .suggest-status-bar .left{padding-right:8px}.monaco-workbench .workbench-suggest-widget.with-status-bar .suggest-status-bar .action-label{color:var(--vscode-editorSuggestWidgetStatus-foreground)}.monaco-workbench .workbench-suggest-widget.with-status-bar .suggest-status-bar .action-item:not(:last-of-type) .action-label{margin-right:0}.monaco-workbench .workbench-suggest-widget.with-status-bar .suggest-status-bar .action-item:not(:last-of-type) .action-label:after{content:\", \";margin-right:.3em}.monaco-workbench .workbench-suggest-widget.with-status-bar .monaco-list .monaco-list-row.focused.string-label>.contents>.main>.right>.readMore,.monaco-workbench .workbench-suggest-widget.with-status-bar .monaco-list .monaco-list-row>.contents>.main>.right>.readMore{display:none}.workbench-suggest-widget .monaco-list .monaco-list-row{background-position:2px 2px;background-repeat:no-repeat;-mox-box-sizing:border-box;box-sizing:border-box;cursor:pointer;display:flex;padding-right:10px;touch-action:none;white-space:nowrap}.workbench-suggest-widget .monaco-list .monaco-list-row.focused{color:var(--vscode-editorSuggestWidget-selectedForeground)}.workbench-suggest-widget .monaco-list .monaco-list-row.focused .codicon{color:var(--vscode-editorSuggestWidget-selectedIconForeground)}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents{flex:1;height:100%;overflow:hidden;padding-left:2px}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main{display:flex;justify-content:space-between;overflow:hidden;text-overflow:ellipsis;white-space:pre}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.left,.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.right{display:flex}.workbench-suggest-widget .monaco-list .monaco-list-row:not(.focused)>.contents>.main .monaco-icon-label{color:var(--vscode-editorSuggestWidget-foreground)}.workbench-suggest-widget:not(.frozen) .monaco-highlighted-label .highlight{font-weight:700}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main .monaco-highlighted-label .highlight{color:var(--vscode-editorSuggestWidget-highlightForeground)}.workbench-suggest-widget .monaco-list .monaco-list-row.focused>.contents>.main .monaco-highlighted-label .highlight{color:var(--vscode-editorSuggestWidget-focusHighlightForeground)}.workbench-suggest-widget .monaco-list .monaco-list-row .monaco-icon-label.deprecated{opacity:.66;text-decoration:unset}.workbench-suggest-widget .monaco-list .monaco-list-row .monaco-icon-label.deprecated>.monaco-icon-label-container>.monaco-icon-name-container{text-decoration:line-through}.workbench-suggest-widget .monaco-list .monaco-list-row .monaco-icon-label:before{height:100%}.workbench-suggest-widget .monaco-list .monaco-list-row .icon{background-position:50%;background-repeat:no-repeat;background-size:80%;display:block;height:16px;margin-left:2px;width:16px}.workbench-suggest-widget .monaco-list .monaco-list-row .icon.hide{display:none}.workbench-suggest-widget .monaco-list .monaco-list-row .suggest-icon{align-items:center;display:flex;margin-right:4px}.workbench-suggest-widget.no-icons .monaco-list .monaco-list-row .icon,.workbench-suggest-widget.no-icons .monaco-list .monaco-list-row .suggest-icon:before{display:none}.workbench-suggest-widget .monaco-list .monaco-list-row .icon.customcolor .colorspan{border:.1em solid #000;display:inline-block;height:.7em;margin:0 0 0 .3em;width:.7em}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.right>.details-label{opacity:.7}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.left>.signature-label{opacity:.6;overflow:hidden;text-overflow:ellipsis}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.left>.qualifier-label{align-self:center;font-size:85%;line-height:normal;margin-left:12px;opacity:.4;overflow:hidden;text-overflow:ellipsis}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.right>.details-label{font-size:85%;margin-left:1.1em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.right>.details-label>.monaco-tokenized-source{display:inline}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.right>.details-label{display:none}.workbench-suggest-widget .monaco-list .monaco-list-row:not(.string-label)>.contents>.main>.right>.details-label,.workbench-suggest-widget.docs-side .monaco-list .monaco-list-row.focused:not(.string-label)>.contents>.main>.right>.details-label,.workbench-suggest-widget:not(.shows-details) .monaco-list .monaco-list-row.focused>.contents>.main>.right>.details-label{display:inline}.workbench-suggest-widget:not(.docs-side) .monaco-list .monaco-list-row.focused:hover>.contents>.main>.right.can-expand-details>.details-label{width:calc(100% - 26px)}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.left{flex-grow:1;flex-shrink:1;overflow:hidden}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.left>.monaco-icon-label{flex-shrink:0}.workbench-suggest-widget .monaco-list .monaco-list-row:not(.string-label)>.contents>.main>.left>.monaco-icon-label{max-width:100%}.workbench-suggest-widget .monaco-list .monaco-list-row.string-label>.contents>.main>.left>.monaco-icon-label{flex-shrink:1}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.right{flex-shrink:4;max-width:70%;overflow:hidden}.workbench-suggest-widget .monaco-list .monaco-list-row>.contents>.main>.right>.readMore{display:inline-block;height:18px;position:absolute;right:10px;visibility:hidden;width:18px}";
|
|
3
|
+
n(css,{});
|
|
4
|
+
export { css, css as default };
|