@codingame/monaco-vscode-api 3.2.2 → 4.0.0

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js

@@ -19,12 +19,24 @@ import { IContextMenuService, IContextViewService } from '../../../../platform/c
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
-import { asCssVariable, badgeBackground, badgeForeground, contrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import { badgeBackground, badgeForeground } from '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { isWorkspaceFolder, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { settingsScopeDropDownIcon, settingsEditIcon } from './preferencesIcons.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends BaseActionViewItem {
     constructor(action, contextService, contextMenuService) {
         super(null, action);
@@ -62,6 +74,7 @@ let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends Ba
             'aria-haspopup': 'true',
             'tabindex': '0'
         }, this.labelElement, this.detailsElement, this.dropDownElement);
+        this.anchorElementHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.anchorElement, ''));
         this._register(addDisposableListener(this.anchorElement, EventType.MOUSE_DOWN, e => EventHelper.stop(e)));
         this._register(addDisposableListener(this.anchorElement, EventType.CLICK, e => this.onClick(e)));
         this._register(addDisposableListener(this.container, EventType.KEY_UP, e => this.onKeyUp(e)));
@@ -110,7 +123,7 @@ let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends Ba
         const workspace = this.contextService.getWorkspace();
         if (this._folder) {
             this.labelElement.textContent = this._folder.name;
-            this.anchorElement.title = this._folder.name;
+            this.anchorElementHover.update(this._folder.name);
             const detailsText = this.labelWithCount(this._action.label, total);
             this.detailsElement.textContent = detailsText;
             this.dropDownElement.classList.toggle('hide', workspace.folders.length === 1 || !this._action.checked);
@@ -119,7 +132,7 @@ let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends Ba
             const labelText = this.labelWithCount(this._action.label, total);
             this.labelElement.textContent = labelText;
             this.detailsElement.textContent = '';
-            this.anchorElement.title = this._action.label;
+            this.anchorElementHover.update(this._action.label);
             this.dropDownElement.classList.remove('hide');
         }
         this.anchorElement.classList.toggle('checked', this._action.checked);
@@ -213,7 +226,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
                 'settingsSwitcherBarAriaLabel',
                 "Settings Switcher"
             )),
-            actionViewItemProvider: (action) => action.id === 'folderSettings' ? this.folderSettings : undefined
+            actionViewItemProvider: (action, options) => action.id === 'folderSettings' ? this.folderSettings : undefined
         })));
         this.userLocalSettings = ( new Action(
             'userSettings',

package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js

@@ -1,6 +1,16 @@
 import { Color, RGBA } from '../../../../base/common/color.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { registerColor, transparent, selectBackground, selectForeground, selectBorder, editorWidgetBorder, checkboxBackground, checkboxForeground, checkboxBorder, inputBackground, inputForeground, inputBorder, listHoverBackground, focusBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
+import { focusBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorWidgetBorder } from '../../../../platform/theme/common/colors/editorColors.js';
+import { selectBackground, selectForeground, selectBorder, checkboxBackground, checkboxForeground, checkboxBorder, inputBackground, inputForeground, inputBorder } from '../../../../platform/theme/common/colors/inputColors.js';
+import { listHoverBackground } from '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { PANEL_BORDER } from '../../../common/theme.js';
 const settingsHeaderForeground = registerColor('settings.headerForeground', { light: '#444444', dark: '#e7e7e7', hcDark: '#ffffff', hcLight: '#292929' }, ( localizeWithPath(
     'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry',

package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js

@@ -10,7 +10,7 @@ import { IWorkbenchEnvironmentService } from '../../../services/environment/comm
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
 import { UrlFinder } from './urlFinder.js';
-import Severity from '../../../../base/common/severity.js';
+import Severity$1 from '../../../../base/common/severity.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { ITerminalService } from '../../terminal/browser/terminal.js';
@@ -238,15 +238,31 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
             this.configurationService.updateValue(PORT_AUTO_FALLBACK_SETTING, 0, 5 );
         }
     }
+    getPortAutoFallbackNumber() {
+        const fallbackAt = this.configurationService.inspect(PORT_AUTO_FALLBACK_SETTING);
+        if ((fallbackAt.value !== undefined) && (fallbackAt.value === 0 || (fallbackAt.value !== fallbackAt.defaultValue))) {
+            return fallbackAt.value;
+        }
+        const inspectSource = this.configurationService.inspect(PORT_AUTO_SOURCE_SETTING);
+        if (inspectSource.applicationValue === PORT_AUTO_SOURCE_SETTING_PROCESS ||
+            inspectSource.userValue === PORT_AUTO_SOURCE_SETTING_PROCESS ||
+            inspectSource.userLocalValue === PORT_AUTO_SOURCE_SETTING_PROCESS ||
+            inspectSource.userRemoteValue === PORT_AUTO_SOURCE_SETTING_PROCESS ||
+            inspectSource.workspaceFolderValue === PORT_AUTO_SOURCE_SETTING_PROCESS ||
+            inspectSource.workspaceValue === PORT_AUTO_SOURCE_SETTING_PROCESS) {
+            return 0;
+        }
+        return fallbackAt.value ?? 20;
+    }
     listenForPorts() {
-        let fallbackAt = this.configurationService.getValue(PORT_AUTO_FALLBACK_SETTING);
+        let fallbackAt = this.getPortAutoFallbackNumber();
         if (fallbackAt === 0) {
             this.portListener?.dispose();
             return;
         }
         if (this.procForwarder && !this.portListener && (this.configurationService.getValue(PORT_AUTO_SOURCE_SETTING) === PORT_AUTO_SOURCE_SETTING_PROCESS)) {
             this.portListener = this._register(this.remoteExplorerService.tunnelModel.onForwardPort(async () => {
-                fallbackAt = this.configurationService.getValue(PORT_AUTO_FALLBACK_SETTING);
+                fallbackAt = this.getPortAutoFallbackNumber();
                 if (fallbackAt === 0) {
                     this.portListener?.dispose();
                     return;
@@ -259,7 +275,7 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
                             'remote.autoForwardPortsSource.fallback',
                             "Over 20 ports have been automatically forwarded. The `process` based automatic port forwarding has been switched to `hybrid` in settings. Some ports may no longer be detected."
                         )),
-                        severity: Severity.Warning,
+                        severity: Severity$1.Warning,
                         actions: {
                             primary: [
                                 ( new Action('switchBack', ( localizeWithPath(
@@ -300,8 +316,10 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
         this.outputForwarder?.dispose();
         this.outputForwarder = undefined;
         if (environment?.os !== 3 ) {
-            ( Registry.as(Extensions$1.Configuration))
-                .registerDefaultConfigurations([{ overrides: { 'remote.autoForwardPortsSource': PORT_AUTO_SOURCE_SETTING_OUTPUT } }]);
+            if (this.configurationService.inspect(PORT_AUTO_SOURCE_SETTING).default?.value !== PORT_AUTO_SOURCE_SETTING_OUTPUT) {
+                ( Registry.as(Extensions$1.Configuration))
+                    .registerDefaultConfigurations([{ overrides: { 'remote.autoForwardPortsSource': PORT_AUTO_SOURCE_SETTING_OUTPUT } }]);
+            }
             this.outputForwarder = this._register(( new OutputAutomaticPortForwarding(
                 this.terminalService,
                 this.notificationService,
@@ -522,7 +540,7 @@ class OnAutoForwardedAction extends Disposable {
             choices.push(this.makePublicChoice(tunnel));
         }
         message += this.linkMessage();
-        this.lastNotification = this.notificationService.prompt(Severity.Info, message, choices, { neverShowAgain: { id: 'remote.tunnelsView.autoForwardNeverShow', isSecondary: true } });
+        this.lastNotification = this.notificationService.prompt(Severity$1.Info, message, choices, { neverShowAgain: { id: 'remote.tunnelsView.autoForwardNeverShow', isSecondary: true } });
         this.lastShownPort = tunnel.tunnelRemotePort;
         this.lastNotifyTime = ( new Date());
         this.lastNotification.onDidClose(() => {
@@ -586,7 +604,7 @@ class OnAutoForwardedAction extends Disposable {
                 }
                 this.lastNotification?.close();
                 this.lastShownPort = newTunnel.tunnelRemotePort;
-                this.lastNotification = this.notificationService.prompt(Severity.Info, (await this.basicMessage(newTunnel)) + this.linkMessage(), [this.openBrowserChoice(newTunnel), this.openPreviewChoice(tunnel)], { neverShowAgain: { id: 'remote.tunnelsView.autoForwardNeverShow', isSecondary: true } });
+                this.lastNotification = this.notificationService.prompt(Severity$1.Info, (await this.basicMessage(newTunnel)) + this.linkMessage(), [this.openBrowserChoice(newTunnel), this.openPreviewChoice(tunnel)], { neverShowAgain: { id: 'remote.tunnelsView.autoForwardNeverShow', isSecondary: true } });
                 this.lastNotification.onDidClose(() => {
                     this.lastNotification = undefined;
                     this.lastShownPort = undefined;

package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js

@@ -35,17 +35,27 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { labelPortIcon, forwardPortIcon, stopForwardIcon, copyAddressIcon, openBrowserIcon, openPreviewIcon, privatePortIcon, forwardedPortWithProcessIcon, forwardedPortWithoutProcessIcon, portsViewIcon } from './remoteIcons.js';
 import { IExternalUriOpenerService } from '../../externalUriOpener/common/externalUriOpenerService.js';
-import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { WorkbenchTable } from '../../../../platform/list/browser/listService.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
-import { registerColor } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { STATUS_BAR_REMOTE_ITEM_BACKGROUND } from '../../../common/theme.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { defaultButtonStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { makeAddress, forwardedPortsViewEnabled, parseAddress, TunnelCloseReason, mapHasAddressLocalhostOrAllInterfaces, TunnelSource } from '../../../services/remote/common/tunnelModel.js';
-import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegate.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 var TunnelPanel_1;
 const openPreviewEnabledContext = ( new RawContextKey('openPreviewEnabled', false));
 class TunnelTreeVirtualDelegate {
@@ -366,7 +376,7 @@ let ActionBarRenderer = class ActionBarRenderer extends Disposable {
         this.commandService = commandService;
         this.configurationService = configurationService;
         this.templateId = 'actionbar';
-        this._hoverDelegate = this._register(getDefaultHoverDelegate('mouse', true));
+        this._hoverDelegate = getDefaultHoverDelegate('mouse');
     }
     set actionRunner(actionRunner) {
         this._actionRunner = actionRunner;
@@ -1439,9 +1449,9 @@ var OpenPortInPreviewAction;
         if (tunnel) {
             const remoteHost = tunnel.remoteHost.includes(':') ? `[${tunnel.remoteHost}]` : tunnel.remoteHost;
             const sourceUri = ( URI.parse(`http://${remoteHost}:${tunnel.remotePort}`));
-            const opener = await externalOpenerService.getOpener(tunnel.localUri, { sourceUri }, ( new CancellationTokenSource()).token);
+            const opener = await externalOpenerService.getOpener(tunnel.localUri, { sourceUri }, CancellationToken.None);
             if (opener) {
-                return opener.openExternalUri(tunnel.localUri, { sourceUri }, ( new CancellationTokenSource()).token);
+                return opener.openExternalUri(tunnel.localUri, { sourceUri }, CancellationToken.None);
             }
             return openerService.open(tunnel.localUri);
         }

package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js

@@ -6,7 +6,17 @@ import { SelectActionViewItem } from '../../../../base/browser/ui/actionbar/acti
 import { defaultSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { peekViewTitleBackground } from '../../../../editor/contrib/peekView/browser/peekView.js';
-import { editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 let SwitchQuickDiffViewItem = class SwitchQuickDiffViewItem extends SelectActionViewItem {
     constructor(action, providers, selected, contextViewService, themeService) {
         const items = ( providers.map(provider => ({ provider, text: provider })));

package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js

@@ -11,7 +11,17 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { ISCMService } from '../common/scm.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
 import { IThemeService, themeColorFromId } from '../../../../platform/theme/common/themeService.js';
-import { registerColor, editorErrorForeground, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorErrorForeground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { registerEditorAction, registerEditorContribution, EditorAction } from '../../../../editor/browser/editorExtensions.js';
 import { getOuterEditor, PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from '../../../../editor/contrib/peekView/browser/peekView.js';
@@ -20,13 +30,13 @@ import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.j
 import { Position } from '../../../../editor/common/core/position.js';
 import { rot } from '../../../../base/common/numbers.js';
 import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/embeddedCodeEditorWidget.js';
+import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
 import { Action, ActionRunner } from '../../../../base/common/actions.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { basename } from '../../../../base/common/resources.js';
 import { MenuRegistry, MenuId, IMenuService, MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { shouldSynchronizeModel, OverviewRulerLane, MinimapPosition } from '../../../../editor/common/model.js';
+import { shouldSynchronizeModel, OverviewRulerLane } from '../../../../editor/common/model.js';
 import { sortedDiff, equals } from '../../../../base/common/arrays.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { createStyleSheet, prepend, $ } from '../../../../base/browser/dom.js';
@@ -951,7 +961,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
         if (options.minimap.active) {
             decorationOptions.minimap = {
                 color: themeColorFromId(options.minimap.color),
-                position: MinimapPosition.Gutter
+                position: 2
             };
         }
         return ModelDecorationOptions.createDynamic(decorationOptions);
@@ -1373,11 +1383,11 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
         this.onDidChangeConfiguration();
         const onDidChangeDiffWidthConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsGutterWidth'));
-        onDidChangeDiffWidthConfiguration(this.onDidChangeDiffWidthConfiguration, this);
+        this._register(onDidChangeDiffWidthConfiguration(this.onDidChangeDiffWidthConfiguration, this));
         this.onDidChangeDiffWidthConfiguration();
         const onDidChangeDiffVisibilityConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsGutterVisibility'));
-        onDidChangeDiffVisibilityConfiguration(this.onDidChangeDiffVisibiltiyConfiguration, this);
-        this.onDidChangeDiffVisibiltiyConfiguration();
+        this._register(onDidChangeDiffVisibilityConfiguration(this.onDidChangeDiffVisibilityConfiguration, this));
+        this.onDidChangeDiffVisibilityConfiguration();
     }
     onDidChangeConfiguration() {
         const enabled = this.configurationService.getValue('scm.diffDecorations') !== 'none';
@@ -1395,7 +1405,7 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         }
         this.setViewState({ ...this.viewState, width });
     }
-    onDidChangeDiffVisibiltiyConfiguration() {
+    onDidChangeDiffVisibilityConfiguration() {
         const visibility = this.configurationService.getValue('scm.diffDecorationsGutterVisibility');
         this.setViewState({ ...this.viewState, visibility });
     }

package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.js

@@ -0,0 +1,235 @@
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { CancellationToken } from '../../../../../base/common/cancellation.js';
+import { ResourceSet, ResourceMap } from '../../../../../base/common/map.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ILogService } from '../../../../../platform/log/common/log.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
+import { INotebookService } from '../../../notebook/common/notebookService.js';
+import { contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from './searchNotebookHelpers.js';
+import { pathIncludedInQuery, ISearchService } from '../../../../services/search/common/search.js';
+import { coalesce } from '../../../../../base/common/arrays.js';
+import { isNumber } from '../../../../../base/common/types.js';
+import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { QueryBuilder } from '../../../../services/search/common/queryBuilder.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+let NotebookSearchService = class NotebookSearchService {
+    constructor(uriIdentityService, notebookEditorService, logService, notebookService, configurationService, editorResolverService, searchService, instantiationService) {
+        this.uriIdentityService = uriIdentityService;
+        this.notebookEditorService = notebookEditorService;
+        this.logService = logService;
+        this.notebookService = notebookService;
+        this.configurationService = configurationService;
+        this.editorResolverService = editorResolverService;
+        this.searchService = searchService;
+        this.queryBuilder = instantiationService.createInstance(QueryBuilder);
+    }
+    notebookSearch(query, token, searchInstanceID, onProgress) {
+        if (query.type !== 2 ) {
+            return {
+                openFilesToScan: ( new ResourceSet()),
+                completeData: Promise.resolve({
+                    messages: [],
+                    limitHit: false,
+                    results: [],
+                }),
+                allScannedFiles: Promise.resolve(( new ResourceSet())),
+            };
+        }
+        const localNotebookWidgets = this.getLocalNotebookWidgets();
+        const localNotebookFiles = ( localNotebookWidgets.map(widget => widget.viewModel.uri));
+        const getAllResults = () => {
+            const searchStart = Date.now();
+            const localResultPromise = this.getLocalNotebookResults(query, token ?? CancellationToken.None, localNotebookWidgets, searchInstanceID);
+            const searchLocalEnd = Date.now();
+            const experimentalNotebooksEnabled = this.configurationService.getValue('search').experimental?.closedNotebookRichContentResults ?? false;
+            let closedResultsPromise = Promise.resolve(undefined);
+            if (experimentalNotebooksEnabled) {
+                closedResultsPromise = this.getClosedNotebookResults(query, ( new ResourceSet(
+                    localNotebookFiles,
+                    uri => this.uriIdentityService.extUri.getComparisonKey(uri)
+                )), token ?? CancellationToken.None);
+            }
+            const promise = Promise.all([localResultPromise, closedResultsPromise]);
+            return {
+                completeData: promise.then((resolvedPromise) => {
+                    const openNotebookResult = resolvedPromise[0];
+                    const closedNotebookResult = resolvedPromise[1];
+                    const resolved = resolvedPromise.filter((e) => !!e);
+                    const resultArray = [...( openNotebookResult.results.values()), ...(closedNotebookResult?.results.values() ?? [])];
+                    const results = coalesce(resultArray);
+                    if (onProgress) {
+                        results.forEach(onProgress);
+                    }
+                    this.logService.trace(`local notebook search time | ${searchLocalEnd - searchStart}ms`);
+                    return {
+                        messages: [],
+                        limitHit: resolved.reduce((prev, cur) => prev || cur.limitHit, false),
+                        results,
+                    };
+                }),
+                allScannedFiles: promise.then(resolvedPromise => {
+                    const openNotebookResults = resolvedPromise[0];
+                    const closedNotebookResults = resolvedPromise[1];
+                    const results = coalesce([...( openNotebookResults.results.keys()), ...(closedNotebookResults?.results.keys() ?? [])]);
+                    return ( new ResourceSet(results, uri => this.uriIdentityService.extUri.getComparisonKey(uri)));
+                })
+            };
+        };
+        const promiseResults = getAllResults();
+        return {
+            openFilesToScan: ( new ResourceSet(localNotebookFiles)),
+            completeData: promiseResults.completeData,
+            allScannedFiles: promiseResults.allScannedFiles
+        };
+    }
+    async doesFileExist(includes, folderQueries, token) {
+        const promises = ( includes.map(async (includePattern) => {
+            const query = this.queryBuilder.file(( folderQueries.map(e => e.folder)), {
+                includePattern: includePattern.startsWith('/') ? includePattern : '**/' + includePattern,
+                exists: true
+            });
+            return this.searchService.fileSearch(query, token).then((ret) => {
+                if (!ret.limitHit) {
+                    throw Error('File not found');
+                }
+            });
+        }));
+        return Promise.any(promises).then(() => true).catch(() => false);
+    }
+    async getClosedNotebookResults(textQuery, scannedFiles, token) {
+        const userAssociations = this.editorResolverService.getAllUserAssociations();
+        const allPriorityInfo = ( new Map());
+        const contributedNotebookTypes = this.notebookService.getContributedNotebookTypes();
+        userAssociations.forEach(association => {
+            if (!association.filenamePattern) {
+                return;
+            }
+            const info = {
+                isFromSettings: true,
+                filenamePatterns: [association.filenamePattern]
+            };
+            const existingEntry = allPriorityInfo.get(association.viewType);
+            if (existingEntry) {
+                allPriorityInfo.set(association.viewType, existingEntry.concat(info));
+            }
+            else {
+                allPriorityInfo.set(association.viewType, [info]);
+            }
+        });
+        const promises = [];
+        contributedNotebookTypes.forEach((notebook) => {
+            if (notebook.selectors.length > 0) {
+                promises.push((async () => {
+                    const includes = ( notebook.selectors.map((selector) => {
+                        const globPattern = selector.include || selector;
+                        return ( globPattern.toString());
+                    }));
+                    const isInWorkspace = await this.doesFileExist(includes, textQuery.folderQueries, token);
+                    if (isInWorkspace) {
+                        const canResolve = await this.notebookService.canResolve(notebook.id);
+                        if (!canResolve) {
+                            return undefined;
+                        }
+                        const serializer = (await this.notebookService.withNotebookDataProvider(notebook.id)).serializer;
+                        return await serializer.searchInNotebooks(textQuery, token, allPriorityInfo);
+                    }
+                    else {
+                        return undefined;
+                    }
+                })());
+            }
+        });
+        const start = Date.now();
+        const searchComplete = coalesce(await Promise.all(promises));
+        const results = searchComplete.flatMap(e => e.results);
+        let limitHit = ( searchComplete.some(e => e.limitHit));
+        const uniqueResults = ( new ResourceMap(uri => this.uriIdentityService.extUri.getComparisonKey(uri)));
+        let numResults = 0;
+        for (const result of results) {
+            if (textQuery.maxResults && numResults >= textQuery.maxResults) {
+                limitHit = true;
+                break;
+            }
+            if (!( scannedFiles.has(result.resource)) && !( uniqueResults.has(result.resource))) {
+                uniqueResults.set(result.resource, result.cellResults.length > 0 ? result : null);
+                numResults++;
+            }
+        }
+        const end = Date.now();
+        this.logService.trace(`query: ${textQuery.contentPattern.pattern}`);
+        this.logService.trace(`closed notebook search time | ${end - start}ms`);
+        return {
+            results: uniqueResults,
+            limitHit
+        };
+    }
+    async getLocalNotebookResults(query, token, widgets, searchID) {
+        const localResults = ( new ResourceMap(uri => this.uriIdentityService.extUri.getComparisonKey(uri)));
+        let limitHit = false;
+        for (const widget of widgets) {
+            if (!widget.hasModel()) {
+                continue;
+            }
+            const askMax = isNumber(query.maxResults) ? query.maxResults + 1 : Number.MAX_SAFE_INTEGER;
+            const uri = widget.viewModel.uri;
+            if (!pathIncludedInQuery(query, uri.fsPath)) {
+                continue;
+            }
+            let matches = await widget
+                .find(query.contentPattern.pattern, {
+                regex: query.contentPattern.isRegExp,
+                wholeWord: query.contentPattern.isWordMatch,
+                caseSensitive: query.contentPattern.isCaseSensitive,
+                includeMarkupInput: query.contentPattern.notebookInfo?.isInNotebookMarkdownInput ?? true,
+                includeMarkupPreview: query.contentPattern.notebookInfo?.isInNotebookMarkdownPreview ?? true,
+                includeCodeInput: query.contentPattern.notebookInfo?.isInNotebookCellInput ?? true,
+                includeOutput: query.contentPattern.notebookInfo?.isInNotebookCellOutput ?? true,
+            }, token, false, true, searchID);
+            if (matches.length) {
+                if (askMax && matches.length >= askMax) {
+                    limitHit = true;
+                    matches = matches.slice(0, askMax - 1);
+                }
+                const cellResults = ( matches.map(match => {
+                    const contentResults = contentMatchesToTextSearchMatches(match.contentMatches, match.cell);
+                    const webviewResults = webviewMatchesToTextSearchMatches(match.webviewMatches);
+                    return {
+                        cell: match.cell,
+                        index: match.index,
+                        contentResults: contentResults,
+                        webviewResults: webviewResults,
+                    };
+                }));
+                const fileMatch = {
+                    resource: uri, cellResults: cellResults
+                };
+                localResults.set(uri, fileMatch);
+            }
+            else {
+                localResults.set(uri, null);
+            }
+        }
+        return {
+            results: localResults,
+            limitHit
+        };
+    }
+    getLocalNotebookWidgets() {
+        const notebookWidgets = this.notebookEditorService.retrieveAllExistingWidgets();
+        return ( notebookWidgets
+            .map(widget => widget.value))
+            .filter((val) => !!val && val.hasModel());
+    }
+};
+NotebookSearchService = ( __decorate([
+    ( __param(0, IUriIdentityService)),
+    ( __param(1, INotebookEditorService)),
+    ( __param(2, ILogService)),
+    ( __param(3, INotebookService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IEditorResolverService)),
+    ( __param(6, ISearchService)),
+    ( __param(7, IInstantiationService))
+], NotebookSearchService));
+export { NotebookSearchService };