@codingame/monaco-vscode-search-service-override 11.1.2 → 12.0.1

package/index.d.ts

@@ -1 +1,2 @@
-export { default } from 'vscode/service-override/search';
+import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/index.js

@@ -1 +1,70 @@
-export { default } from './search.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search.service';
+import { SearchService } from './vscode/src/vs/workbench/services/search/common/searchService.js';
+import { SearchViewModelWorkbenchService } from './vscode/src/vs/workbench/contrib/search/browser/searchTreeModel/searchModel.js';
+import { ISearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchViewModelWorkbenchService.service';
+import { SearchHistoryService } from './vscode/src/vs/workbench/contrib/search/common/searchHistoryService.js';
+import { ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService.service';
+import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
+import { ReplaceService } from './vscode/src/vs/workbench/contrib/search/browser/replaceService.js';
+import { LocalFileSearchWorkerClient } from './vscode/src/vs/workbench/services/search/browser/searchService.js';
+import './vscode/src/vs/workbench/contrib/search/browser/search.contribution.js';
+import './vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.js';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { SearchProviderType } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import 'vscode/vscode/vs/nls';
+import 'vscode/vscode/vs/base/common/charCode';
+import 'vscode/vscode/vs/base/common/marshallingIds';
+import 'vscode/vscode/vs/base/common/path';
+import 'vscode/vscode/vs/base/common/platform';
+import 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/base/common/resources';
+import 'vscode/vscode/vs/platform/files/common/files';
+import 'vscode/vscode/vs/platform/files/browser/webFileSystemAccess';
+import 'vscode/vscode/vs/platform/log/common/log';
+
+function isHTMLFileSystemProvider(provider) {
+    return provider.directories != null;
+}
+let CustomSearchService = class CustomSearchService extends SearchService {
+    constructor(modelService, editorService, telemetryService, logService, extensionService, fileService, instantiationService, uriIdentityService) {
+        super(modelService, editorService, telemetryService, logService, extensionService, fileService, uriIdentityService);
+        this.instantiationService = instantiationService;
+        if (isHTMLFileSystemProvider(fileService.getProvider(Schemas.file))) {
+            const searchProvider = this.instantiationService.createInstance(LocalFileSearchWorkerClient);
+            this.registerSearchResultProvider(Schemas.file, SearchProviderType.file, searchProvider);
+            this.registerSearchResultProvider(Schemas.file, SearchProviderType.text, searchProvider);
+        }
+    }
+};
+CustomSearchService = __decorate([
+    __param(0, IModelService),
+    __param(1, IEditorService),
+    __param(2, ITelemetryService),
+    __param(3, ILogService),
+    __param(4, IExtensionService),
+    __param(5, IFileService),
+    __param(6, IInstantiationService),
+    __param(7, IUriIdentityService)
+], CustomSearchService);
+function getServiceOverride() {
+    return {
+        [ISearchService.toString()]: new SyncDescriptor(CustomSearchService, [], true),
+        [ISearchViewModelWorkbenchService.toString()]: new SyncDescriptor(SearchViewModelWorkbenchService, [], true),
+        [ISearchHistoryService.toString()]: new SyncDescriptor(SearchHistoryService, [], true),
+        [IReplaceService.toString()]: new SyncDescriptor(ReplaceService, [], true)
+    };
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "11.1.2",
+  "version": "12.0.1",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - search service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,29 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - search service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-1ae7d696-d960-5ac6-97a3-9fe7c8c3a793-common": "12.0.1",
+    "@codingame/monaco-vscode-219d9a5f-b446-507b-a188-1178a0867c75-common": "12.0.1",
+    "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common": "12.0.1",
+    "@codingame/monaco-vscode-3cf6a388-482f-5484-a806-0525ad9ad8af-common": "12.0.1",
+    "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common": "12.0.1",
+    "@codingame/monaco-vscode-45a408c6-90ed-5d8b-801d-f3f69c7a97f2-common": "12.0.1",
+    "@codingame/monaco-vscode-4ead9d5f-54da-5c5a-b093-32be4a84d711-common": "12.0.1",
+    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "12.0.1",
+    "@codingame/monaco-vscode-56402b83-4a60-5b15-86f9-71fe99c32744-common": "12.0.1",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "12.0.1",
+    "@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common": "12.0.1",
+    "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "12.0.1",
+    "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "12.0.1",
+    "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common": "12.0.1",
+    "@codingame/monaco-vscode-cc9ccbec-e2a1-599d-84ae-46f5efc666e3-common": "12.0.1",
+    "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "12.0.1",
+    "@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common": "12.0.1",
+    "@codingame/monaco-vscode-ea14e352-8f1c-5569-b79a-8a96a53e8abe-common": "12.0.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.1"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,14 +45,15 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
     },
     "./worker": {
       "default": "./worker.js"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.2",
-    "@codingame/monaco-vscode-chat-interactive-notebook-search-common": "11.1.2"
   }
 }

package/vscode/src/vs/workbench/contrib/search/browser/AISearch/aiSearchModel.d.ts

@@ -0,0 +1,75 @@
+import { Emitter, Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { ITextModel } from "vscode/vscode/vs/editor/common/model";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { ILabelService } from "vscode/vscode/vs/platform/label/common/label.service";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IAITextQuery, IFileMatch } from "vscode/vscode/vs/workbench/services/search/common/search";
+import { NotebookEditorWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget";
+import { FileMatchImpl } from "../searchTreeModel/fileMatch.js";
+import { ISearchResult, ISearchTreeFolderMatchWorkspaceRoot, ISearchTreeFolderMatch, ISearchTreeFolderMatchWithResource, ITextSearchHeading, IChangeEvent, ISearchModel, ISearchTreeFileMatch } from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
+import { TextSearchHeadingImpl } from "../searchTreeModel/textSearchHeading.js";
+export declare class AITextSearchHeadingImpl extends TextSearchHeadingImpl<IAITextQuery> {
+    constructor(parent: ISearchResult, instantiationService: IInstantiationService, uriIdentityService: IUriIdentityService);
+    name(): string;
+    id(): string;
+    get isAIContributed(): boolean;
+    get query(): IAITextQuery | null;
+    set query(query: IAITextQuery | null);
+    private _createBaseFolderMatch;
+    private createWorkspaceRootWithResourceImpl;
+}
+export declare class AIFolderMatchWorkspaceRootImpl extends Disposable implements ISearchTreeFolderMatchWorkspaceRoot {
+    private _resource;
+    private _index;
+    private _query;
+    private _parent;
+    private instantiationService;
+    protected _onChange: Emitter<IChangeEvent>;
+    readonly onChange: Event<IChangeEvent>;
+    private _onDispose;
+    readonly onDispose: Event<void>;
+    private readonly _id;
+    private _name;
+    protected _unDisposedFileMatches: Map<string, ISearchTreeFileMatch>;
+    protected _fileMatches: Map<string, ISearchTreeFileMatch>;
+    constructor(_resource: URI, _id: string, _index: number, _query: IAITextQuery, _parent: ITextSearchHeading, instantiationService: IInstantiationService, labelService: ILabelService);
+    get resource(): URI;
+    id(): string;
+    index(): number;
+    name(): string;
+    count(): number;
+    doAddFile(fileMatch: ISearchTreeFileMatch): void;
+    private latestRank;
+    createAndConfigureFileMatch(rawFileMatch: IFileMatch<URI>, searchInstanceID: string): FileMatchImpl;
+    isAIContributed(): boolean;
+    private onFileChange;
+    get hasChildren(): boolean;
+    parent(): ISearchTreeFolderMatch | ITextSearchHeading;
+    matches(): (ISearchTreeFileMatch | ISearchTreeFolderMatchWithResource)[];
+    allDownstreamFileMatches(): ISearchTreeFileMatch[];
+    remove(matches: ISearchTreeFileMatch | ISearchTreeFolderMatchWithResource | (ISearchTreeFileMatch | ISearchTreeFolderMatchWithResource)[]): void;
+    addFileMatch(raw: IFileMatch[], silent: boolean, searchInstanceID: string): void;
+    isEmpty(): boolean;
+    clear(clearingAll?: boolean): void;
+    get showHighlights(): boolean;
+    get searchModel(): ISearchModel;
+    get _searchResult(): ISearchResult;
+    get query(): IAITextQuery | null;
+    getDownstreamFileMatch(uri: URI): ISearchTreeFileMatch | null;
+    replaceAll(): Promise<any>;
+    recursiveFileCount(): number;
+    doRemoveFile(fileMatches: ISearchTreeFileMatch[], dispose?: boolean, trigger?: boolean, keepReadonly?: boolean): void;
+    replace(match: ISearchTreeFileMatch): Promise<any>;
+    replacingAll: boolean;
+    bindModel(model: ITextModel): void;
+    unbindNotebookEditorWidget(editor: NotebookEditorWidget, resource: URI): void;
+    bindNotebookEditorWidget(editor: NotebookEditorWidget, resource: URI): Promise<void>;
+    hasOnlyReadOnlyMatches(): boolean;
+    fileMatchesIterator(): IterableIterator<ISearchTreeFileMatch>;
+    folderMatchesIterator(): IterableIterator<ISearchTreeFolderMatchWithResource>;
+    recursiveMatchCount(): number;
+    private disposeMatches;
+    dispose(): void;
+}

package/vscode/src/vs/workbench/contrib/search/browser/AISearch/aiSearchModel.js

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -9,7 +10,7 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 import { resultIsMatch } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
 import { FileMatchImpl } from '../searchTreeModel/fileMatch.js';
-import { TEXT_SEARCH_HEADING_PREFIX, AI_TEXT_SEARCH_RESULT_ID, FOLDER_MATCH_PREFIX, getFileMatches, FILE_MATCH_PREFIX } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
+import { TEXT_SEARCH_HEADING_PREFIX, AI_TEXT_SEARCH_RESULT_ID, FOLDER_MATCH_PREFIX, getFileMatches, FILE_MATCH_PREFIX } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
 import { TextSearchHeadingImpl } from '../searchTreeModel/textSearchHeading.js';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { textSearchResultToMatches } from '../searchTreeModel/match.js';

package/vscode/src/vs/workbench/contrib/search/browser/media/searchview.css.js

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".search-view{display:flex;flex-direction:column;height:100%}.search-view .results{flex-grow:1;min-height:0}.search-view .search-widgets-container{margin:0 12px 0 2px;padding-bottom:6px;padding-top:6px}.search-view .search-widget .toggle-replace-button{align-items:center;background-color:unset;background-position:50%;background-repeat:no-repeat;box-sizing:border-box;color:inherit;cursor:pointer;display:flex;height:100%;justify-content:center;left:0;position:absolute;top:0;width:16px}.monaco-workbench .search-view .search-widget .toggle-replace-button:hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-workbench .search-view .search-widget .toggle-replace-button:active{background-color:var(--vscode-toolbar-activeBackground)}.search-view .search-widget .replace-container,.search-view .search-widget .search-container{margin-left:18px}.search-view .search-widget .monaco-inputbox>.ibwrapper{height:100%}.search-view .search-widget .monaco-inputbox>.ibwrapper>.mirror,.search-view .search-widget .monaco-inputbox>.ibwrapper>textarea.input{padding:3px 0 3px 6px}.search-view .search-widget .monaco-inputbox>.ibwrapper>textarea.input{height:26px;overflow:initial}.search-view .search-widget .monaco-findInput .monaco-scrollable-element .scrollbar{opacity:0}.search-view .monaco-inputbox>.ibwrapper>textarea.input{scrollbar-width:none}.search-view .monaco-inputbox>.ibwrapper>textarea.input::-webkit-scrollbar{display:none}.search-view .monaco-findInput{display:inline-block;vertical-align:middle;width:100%}.search-view .search-widget .replace-container{display:inline-flex;margin-top:6px;position:relative}.search-view .search-widget .replace-input{display:flex;position:relative;vertical-align:middle;width:auto!important}.search-view .search-widget .replace-input>.controls{position:absolute;right:2px;top:3px}.search-view .search-widget .replace-container.disabled{display:none}.search-view .search-widget .replace-container .monaco-action-bar{height:25px;margin-left:4px}.search-view .query-details{margin:0 0 0 18px;min-height:1em;position:relative}.search-view .query-details .more{color:inherit;cursor:pointer;height:16px;position:absolute;right:-2px;width:25px;z-index:2}.search-view .query-details .file-types{display:none}.search-view .query-details .file-types>.monaco-inputbox{height:25px;width:100%}.search-view .query-details.more .file-types{display:inherit}.search-view .query-details.more .file-types:last-child{padding-bottom:4px}.search-view .query-details.more h4{font-size:11px;font-weight:400;margin:0;overflow:hidden;padding:4px 0 0;text-overflow:ellipsis;white-space:nowrap}.search-view .messages{color:var(--vscode-search-resultsInfoForeground);cursor:default;margin-top:-5px}.search-view .message{overflow-wrap:break-word;padding:0 22px 8px}.search-view .message p:first-child{margin-bottom:0;margin-top:0;padding-bottom:4px;user-select:text;-webkit-user-select:text}.search-view .message a{color:var(--vscode-textLink-foreground)}.search-view .message a:active,.search-view .message a:hover{color:var(--vscode-textLink-activeForeground)}.search-view .filematch,.search-view .foldermatch,.search-view .textsearchresult{display:flex;height:100%;line-height:22px;padding:0;position:relative}.search-view .textsearchresult{font-weight:500}.search-view .textsearchresult .monaco-icon-label .codicon{font-size:12px;padding-right:3px;position:relative;top:1px}.pane-body:not(.wide) .search-view .filematch .monaco-icon-label,.pane-body:not(.wide) .search-view .foldermatch .monaco-icon-label,.pane-body:not(.wide) .search-view .monaco-list .monaco-list-row.focused .filematch .monaco-icon-label,.pane-body:not(.wide) .search-view .monaco-list .monaco-list-row.focused .foldermatch .monaco-icon-label,.pane-body:not(.wide) .search-view .monaco-list .monaco-list-row:hover:not(.highlighted) .filematch .monaco-icon-label,.pane-body:not(.wide) .search-view .monaco-list .monaco-list-row:hover:not(.highlighted) .foldermatch .monaco-icon-label{flex:1}.pane-body.wide .search-view .filematch .badge,.pane-body.wide .search-view .foldermatch .badge{margin-left:10px}.search-view .linematch{display:flex;line-height:22px;overflow:hidden;position:relative}.search-view .linematch>.match{overflow:hidden;text-overflow:ellipsis;white-space:pre}.search-view .linematch .matchLineNum{display:none;font-size:.9em;margin-left:7px;margin-right:4px;opacity:.7}.search-view .linematch .matchLineNum.show{display:block}.pane-body.wide .search-view .monaco-list .monaco-list-row .filematch .actionBarContainer,.pane-body.wide .search-view .monaco-list .monaco-list-row .foldermatch .actionBarContainer,.search-view .monaco-list .monaco-list-row .linematch .actionBarContainer{flex:1 0 auto}.pane-body:not(.wide) .search-view .monaco-list .monaco-list-row .filematch .actionBarContainer,.pane-body:not(.wide) .search-view .monaco-list .monaco-list-row .foldermatch .actionBarContainer{flex:0 0 auto}.pane-body:not(.wide) .search-view .monaco-list .monaco-list-row .linematch .actionBarContainer,.search-view.actions-right .monaco-list .monaco-list-row .filematch .actionBarContainer,.search-view.actions-right .monaco-list .monaco-list-row .foldermatch .actionBarContainer,.search-view.actions-right .monaco-list .monaco-list-row .linematch .actionBarContainer{text-align:right}.search-view .monaco-list .monaco-list-row .monaco-action-bar{display:none;line-height:1em;padding:0 .8em 0 .4em}.search-view .monaco-list .monaco-list-row .monaco-action-bar .action-item{margin:0}.search-view .monaco-list .monaco-list-row.focused .monaco-action-bar,.search-view .monaco-list .monaco-list-row.selected .monaco-action-bar,.search-view .monaco-list .monaco-list-row:hover:not(.highlighted) .monaco-action-bar{display:inline-block}.search-view .monaco-list .monaco-list-row .monaco-action-bar .action-item{margin-right:.2em}.search-view .monaco-list .monaco-list-row .monaco-action-bar .action-label{padding:2px}.monaco-workbench.hc-black .search-view .monaco-list .monaco-list-row .monaco-action-bar .action-label,.monaco-workbench.hc-light .search-view .monaco-list .monaco-list-row .monaco-action-bar .action-label{margin-top:2px}.search-view .monaco-count-badge{margin-right:12px}.pane-body:not(.wide) .search-view>.results>.monaco-list .monaco-list-row.focused .filematch .monaco-count-badge,.pane-body:not(.wide) .search-view>.results>.monaco-list .monaco-list-row.focused .foldermatch .monaco-count-badge,.pane-body:not(.wide) .search-view>.results>.monaco-list .monaco-list-row.focused .linematch .monaco-count-badge,.pane-body:not(.wide) .search-view>.results>.monaco-list .monaco-list-row:hover .filematch .monaco-count-badge,.pane-body:not(.wide) .search-view>.results>.monaco-list .monaco-list-row:hover .foldermatch .monaco-count-badge,.pane-body:not(.wide) .search-view>.results>.monaco-list .monaco-list-row:hover .linematch .monaco-count-badge{display:none}.search-view .replace.findInFileMatch{background-color:var(--vscode-diffEditor-removedTextBackground);border:1px solid var(--vscode-diffEditor-removedTextBackground);text-decoration:line-through}.monaco-workbench.hc-dark .search-view .replace.findInFileMatch,.monaco-workbench.hc-light .search-view .replace.findInFileMatch{border:1px dashed var(--vscode-diffEditor-removedTextBackground)}.search-view .findInFileMatch,.search-view .replaceMatch{white-space:pre}.search-view .findInFileMatch{background-color:var(--vscode-editor-findMatchHighlightBackground);border:1px solid var(--vscode-editor-findMatchHighlightBorder)}.monaco-workbench.hc-dark .search-view .findInFileMatch,.monaco-workbench.hc-light .search-view .findInFileMatch{border:1px dashed var(--vscode-editor-findMatchHighlightBorder)}.search-view .replaceMatch{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench.hc-black .search-view .findInFileMatch,.monaco-workbench.hc-black .search-view .replaceMatch,.monaco-workbench.hc-light .search-view .findInFileMatch,.monaco-workbench.hc-light .search-view .replaceMatch{background:none!important;box-sizing:border-box}.search-view .replaceMatch:not(:empty){border:1px solid var(--vscode-diffEditor-insertedLineBackground)}.monaco-workbench.hc-dark .search-view .replaceMatch:not(:empty),.monaco-workbench.hc-light .search-view .replaceMatch:not(:empty){border:1px dashed var(--vscode-diffEditor-insertedLineBackground)}.monaco-workbench.hc-black .search-view .filematch,.monaco-workbench.hc-black .search-view .foldermatch,.monaco-workbench.hc-black .search-view .linematch,.monaco-workbench.hc-light .search-view .filematch,.monaco-workbench.hc-light .search-view .foldermatch,.monaco-workbench.hc-light .search-view .linematch{line-height:20px}.monaco-workbench.vs .search-panel .search-view .monaco-inputbox{border:1px solid transparent}.text-search-provider-messages .providerMessage{padding-top:4px}.text-search-provider-messages .providerMessage .codicon{padding-right:3px;position:relative;top:3px}.monaco-workbench .search-view .monaco-list.element-focused .monaco-list-row.focused.selected:not(.highlighted) .action-label:focus{outline-color:var(--vscode-list-activeSelectionForeground)}.monaco-workbench .search-container .monaco-custom-toggle.disabled{background-color:inherit!important;cursor:default;opacity:.3;pointer-events:none;user-select:none;-webkit-user-select:none}.monaco-workbench .search-container .find-filter-button{box-sizing:border-box;color:inherit;cursor:pointer;float:left;margin-left:2px;user-select:none;-webkit-user-select:none}";
 n(css,{});

package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchModel.d.ts

@@ -0,0 +1,84 @@
+import { IModelService } from "vscode/vscode/vs/editor/common/services/model";
+import { ILabelService } from "vscode/vscode/vs/platform/label/common/label.service";
+import { ISearchRange, ITextSearchMatch, IPatternInfo, ITextSearchPreviewOptions, IFileMatch } from "vscode/vscode/vs/workbench/services/search/common/search";
+import { ICellViewModel } from "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { NotebookEditorWidget } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorWidget";
+import { INotebookEditorService } from "vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service";
+import { INotebookCellMatchNoModel } from "vscode/vscode/vs/workbench/contrib/search/common/searchNotebookHelpers";
+import { INotebookCellMatchWithModel } from "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common/vscode/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers";
+import { ISearchTreeMatch, ISearchTreeFolderMatch, ISearchTreeFolderMatchWorkspaceRoot } from "@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon";
+import { IReplaceService } from "vscode/vscode/vs/workbench/contrib/search/browser/replace.service";
+import { FileMatchImpl } from "../searchTreeModel/fileMatch.js";
+import { ICellMatch, IMatchInNotebook, INotebookFileInstanceMatch } from "@codingame/monaco-vscode-45a408c6-90ed-5d8b-801d-f3f69c7a97f2-common/vscode/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchModelBase";
+import { MatchImpl } from "../searchTreeModel/match.js";
+export declare class MatchInNotebook extends MatchImpl implements IMatchInNotebook {
+    private readonly _cellParent;
+    private _webviewIndex;
+    constructor(_cellParent: ICellMatch, _fullPreviewLines: string[], _fullPreviewRange: ISearchRange, _documentRange: ISearchRange, webviewIndex?: number);
+    parent(): INotebookFileInstanceMatch;
+    get cellParent(): ICellMatch;
+    private notebookMatchTypeString;
+    isWebviewMatch(): boolean;
+    get isReadonly(): boolean;
+    get cellIndex(): number;
+    get webviewIndex(): number | undefined;
+    get cell(): ICellViewModel | undefined;
+}
+export declare class CellMatch implements ICellMatch {
+    private readonly _parent;
+    private _cell;
+    private readonly _cellIndex;
+    private _contentMatches;
+    private _webviewMatches;
+    private _context;
+    constructor(_parent: INotebookFileInstanceMatch, _cell: ICellViewModel | undefined, _cellIndex: number);
+    hasCellViewModel(): boolean;
+    get context(): Map<number, string>;
+    matches(): MatchInNotebook[];
+    get contentMatches(): MatchInNotebook[];
+    get webviewMatches(): MatchInNotebook[];
+    remove(matches: MatchInNotebook | MatchInNotebook[]): void;
+    clearAllMatches(): void;
+    addContentMatches(textSearchMatches: ITextSearchMatch[]): void;
+    addContext(textSearchMatches: ITextSearchMatch[]): void;
+    addWebviewMatches(textSearchMatches: ITextSearchMatch[]): void;
+    setCellModel(cell: ICellViewModel): void;
+    get parent(): INotebookFileInstanceMatch;
+    get id(): string;
+    get cellIndex(): number;
+    get cell(): ICellViewModel | undefined;
+}
+export declare class NotebookCompatibleFileMatch extends FileMatchImpl implements INotebookFileInstanceMatch {
+    private readonly searchInstanceID;
+    private readonly notebookEditorService;
+    private _notebookEditorWidget;
+    private _editorWidgetListener;
+    private _notebookUpdateScheduler;
+    private _lastEditorWidgetIdForUpdate;
+    constructor(_query: IPatternInfo, _previewOptions: ITextSearchPreviewOptions | undefined, _maxResults: number | undefined, _parent: ISearchTreeFolderMatch, rawMatch: IFileMatch, _closestRoot: ISearchTreeFolderMatchWorkspaceRoot | null, searchInstanceID: string, modelService: IModelService, replaceService: IReplaceService, labelService: ILabelService, notebookEditorService: INotebookEditorService);
+    private _cellMatches;
+    get cellContext(): Map<string, Map<number, string>>;
+    getCellMatch(cellID: string): ICellMatch | undefined;
+    addCellMatch(rawCell: INotebookCellMatchNoModel | INotebookCellMatchWithModel): void;
+    addWebviewMatchesToCell(cellID: string, webviewMatches: ITextSearchMatch[]): void;
+    addContentMatchesToCell(cellID: string, contentMatches: ITextSearchMatch[]): void;
+    private revealCellRange;
+    bindNotebookEditorWidget(widget: NotebookEditorWidget): void;
+    unbindNotebookEditorWidget(widget?: NotebookEditorWidget): void;
+    updateNotebookHighlights(): void;
+    private _addNotebookHighlights;
+    private _removeNotebookHighlights;
+    private updateNotebookMatches;
+    private setNotebookFindMatchDecorationsUsingCellMatches;
+    updateMatchesForEditorWidget(): Promise<void>;
+    showMatch(match: MatchInNotebook): Promise<void>;
+    private highlightCurrentFindMatchDecoration;
+    matches(): ISearchTreeMatch[];
+    protected removeMatch(match: ISearchTreeMatch): void;
+    cellMatches(): ICellMatch[];
+    createMatches(): void;
+    get hasChildren(): boolean;
+    setSelectedMatch(match: ISearchTreeMatch | null): void;
+    dispose(): void;
+}
+export declare function textSearchMatchesToNotebookMatches(textSearchMatches: ITextSearchMatch[], cell: CellMatch): MatchInNotebook[];

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
@@ -7,17 +8,17 @@ import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { resultIsMatch } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { getTextSearchMatchWithModelContext } from '../../../../services/search/common/searchHelpers.js';
-import { FindMatchDecorationModel } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/findMatchDecorationModel';
-import { CellFindMatchModel } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/findModel';
+import { FindMatchDecorationModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/findMatchDecorationModel';
+import { CellFindMatchModel } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/contrib/find/findModel';
 import { INotebookEditorService } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { NotebookCellsChangeType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { CellSearchModel } from 'vscode/vscode/vs/workbench/contrib/search/common/cellSearchModel';
 import { rawCellPrefix, isINotebookFileMatchNoModel } from 'vscode/vscode/vs/workbench/contrib/search/common/searchNotebookHelpers';
-import { isINotebookCellMatchWithModel, contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches, isINotebookFileMatchWithModel } from 'vscode/vscode/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers';
-import { MATCH_PREFIX } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
+import { isINotebookCellMatchWithModel, contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches, isINotebookFileMatchWithModel } from '@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common/vscode/vs/workbench/contrib/search/browser/notebookSearch/searchNotebookHelpers';
+import { MATCH_PREFIX } from '@codingame/monaco-vscode-42931eb9-e564-530c-bafc-fa23ab43a070-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
 import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
 import { FileMatchImpl } from '../searchTreeModel/fileMatch.js';
-import { isIMatchInNotebook } from 'vscode/vscode/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchModelBase';
+import { isIMatchInNotebook } from '@codingame/monaco-vscode-45a408c6-90ed-5d8b-801d-f3f69c7a97f2-common/vscode/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchModelBase';
 import { MatchImpl, textSearchResultToMatches } from '../searchTreeModel/match.js';
 
 class MatchInNotebook extends MatchImpl {

package/vscode/src/vs/workbench/contrib/search/browser/patternInputWidget.d.ts

@@ -0,0 +1,74 @@
+import * as dom from "vscode/vscode/vs/base/browser/dom";
+import { IContextViewProvider } from "vscode/vscode/vs/base/browser/ui/contextview/contextview";
+import { HistoryInputBox, IInputBoxStyles } from "vscode/vscode/vs/base/browser/ui/inputbox/inputBox";
+import { Widget } from "vscode/vscode/vs/base/browser/ui/widget";
+import { Event as CommonEvent } from "vscode/vscode/vs/base/common/event";
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+export interface IOptions {
+    placeholder?: string;
+    showPlaceholderOnFocus?: boolean;
+    tooltip?: string;
+    width?: number;
+    ariaLabel?: string;
+    history?: string[];
+    inputBoxStyles: IInputBoxStyles;
+}
+export declare class PatternInputWidget extends Widget {
+    private contextViewProvider;
+    private readonly contextKeyService;
+    protected readonly configurationService: IConfigurationService;
+    private readonly keybindingService;
+    static OPTION_CHANGE: string;
+    inputFocusTracker: dom.IFocusTracker;
+    private width;
+    private domNode;
+    protected inputBox: HistoryInputBox;
+    private _onSubmit;
+    onSubmit: CommonEvent<boolean>;
+    private _onCancel;
+    onCancel: CommonEvent<void>;
+    constructor(parent: HTMLElement, contextViewProvider: IContextViewProvider, options: IOptions, contextKeyService: IContextKeyService, configurationService: IConfigurationService, keybindingService: IKeybindingService);
+    dispose(): void;
+    setWidth(newWidth: number): void;
+    getValue(): string;
+    setValue(value: string): void;
+    select(): void;
+    focus(): void;
+    inputHasFocus(): boolean;
+    private setInputWidth;
+    protected getSubcontrolsWidth(): number;
+    getHistory(): string[];
+    clearHistory(): void;
+    prependHistory(history: string[]): void;
+    clear(): void;
+    onSearchSubmit(): void;
+    showNextTerm(): void;
+    showPreviousTerm(): void;
+    private render;
+    protected renderSubcontrols(_controlsDiv: HTMLDivElement): void;
+    private onInputKeyUp;
+}
+export declare class IncludePatternInputWidget extends PatternInputWidget {
+    private _onChangeSearchInEditorsBoxEmitter;
+    onChangeSearchInEditorsBox: CommonEvent<void>;
+    constructor(parent: HTMLElement, contextViewProvider: IContextViewProvider, options: IOptions, contextKeyService: IContextKeyService, configurationService: IConfigurationService, keybindingService: IKeybindingService);
+    private useSearchInEditorsBox;
+    dispose(): void;
+    onlySearchInOpenEditors(): boolean;
+    setOnlySearchInOpenEditors(value: boolean): void;
+    protected getSubcontrolsWidth(): number;
+    protected renderSubcontrols(controlsDiv: HTMLDivElement): void;
+}
+export declare class ExcludePatternInputWidget extends PatternInputWidget {
+    private _onChangeIgnoreBoxEmitter;
+    onChangeIgnoreBox: CommonEvent<void>;
+    constructor(parent: HTMLElement, contextViewProvider: IContextViewProvider, options: IOptions, contextKeyService: IContextKeyService, configurationService: IConfigurationService, keybindingService: IKeybindingService);
+    private useExcludesAndIgnoreFilesBox;
+    dispose(): void;
+    useExcludesAndIgnoreFiles(): boolean;
+    setUseExcludesAndIgnoreFiles(value: boolean): void;
+    protected getSubcontrolsWidth(): number;
+    protected renderSubcontrols(controlsDiv: HTMLDivElement): void;
+}

package/vscode/src/vs/workbench/contrib/search/browser/patternInputWidget.js

@@ -1,9 +1,11 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { trackFocus } from 'vscode/vscode/vs/base/browser/dom';
 import { Toggle } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
 import { Widget } from 'vscode/vscode/vs/base/browser/ui/widget';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { localize } from 'vscode/vscode/vs/nls';
 import { ContextScopedHistoryInputBox } from 'vscode/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
 import { showHistoryKeybindingHint } from 'vscode/vscode/vs/platform/history/browser/historyWidgetKeybindingHint';
@@ -21,13 +23,13 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
         this.contextKeyService = contextKeyService;
         this.configurationService = configurationService;
         this.keybindingService = keybindingService;
-        this._onSubmit = this._register(( (new Emitter())));
+        this._onSubmit = this._register(( new Emitter()));
         this.onSubmit = this._onSubmit.event;
-        this._onCancel = this._register(( (new Emitter())));
+        this._onCancel = this._register(( new Emitter()));
         this.onCancel = this._onCancel.event;
         options = {
             ...{
-                ariaLabel: ( localize(11042, "input"))
+                ariaLabel: ( localize(8575, "input"))
             },
             ...options,
         };
@@ -91,7 +93,8 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
     render(options) {
         this.domNode = document.createElement('div');
         this.domNode.classList.add('monaco-findInput');
-        this.inputBox = ( (new ContextScopedHistoryInputBox(this.domNode, this.contextViewProvider, {
+        const history = options.history || [];
+        this.inputBox = ( new ContextScopedHistoryInputBox(this.domNode, this.contextViewProvider, {
             placeholder: options.placeholder,
             showPlaceholderOnFocus: options.showPlaceholderOnFocus,
             tooltip: options.tooltip,
@@ -99,10 +102,10 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
             validationOptions: {
                 validation: undefined
             },
-            history: options.history || [],
+            history: ( new Set(history)),
             showHistoryHint: () => showHistoryKeybindingHint(this.keybindingService),
             inputBoxStyles: options.inputBoxStyles
-        }, this.contextKeyService)));
+        }, this.contextKeyService));
         this._register(this.inputBox.onDidChange(() => this._onSubmit.fire(true)));
         this.inputFocusTracker = trackFocus(this.inputBox.inputElement);
         this.onkeyup(this.inputBox.inputElement, (keyboardEvent) => this.onInputKeyUp(keyboardEvent));
@@ -116,25 +119,25 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
     }
     onInputKeyUp(keyboardEvent) {
         switch (keyboardEvent.keyCode) {
-            case 3 :
+            case KeyCode.Enter:
                 this.onSearchSubmit();
                 this._onSubmit.fire(false);
                 return;
-            case 9 :
+            case KeyCode.Escape:
                 this._onCancel.fire();
                 return;
         }
     }
 };
-PatternInputWidget = ( (__decorate([
-    ( (__param(3, IContextKeyService))),
-    ( (__param(4, IConfigurationService))),
-    ( (__param(5, IKeybindingService)))
-], PatternInputWidget)));
+PatternInputWidget = ( __decorate([
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IKeybindingService))
+], PatternInputWidget));
 let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternInputWidget {
     constructor(parent, contextViewProvider, options, contextKeyService, configurationService, keybindingService) {
         super(parent, contextViewProvider, options, contextKeyService, configurationService, keybindingService);
-        this._onChangeSearchInEditorsBoxEmitter = this._register(( (new Emitter())));
+        this._onChangeSearchInEditorsBoxEmitter = this._register(( new Emitter()));
         this.onChangeSearchInEditorsBox = this._onChangeSearchInEditorsBoxEmitter.event;
     }
     dispose() {
@@ -152,13 +155,13 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
         return super.getSubcontrolsWidth() + this.useSearchInEditorsBox.width();
     }
     renderSubcontrols(controlsDiv) {
-        this.useSearchInEditorsBox = this._register(( (new Toggle({
+        this.useSearchInEditorsBox = this._register(( new Toggle({
             icon: Codicon.book,
-            title: ( localize(11043, "Search only in Open Editors")),
+            title: ( localize(8576, "Search only in Open Editors")),
             isChecked: false,
             hoverDelegate: getDefaultHoverDelegate('element'),
             ...defaultToggleStyles
-        }))));
+        })));
         this._register(this.useSearchInEditorsBox.onChange(viaKeyboard => {
             this._onChangeSearchInEditorsBoxEmitter.fire();
             if (!viaKeyboard) {
@@ -169,15 +172,15 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
         super.renderSubcontrols(controlsDiv);
     }
 };
-IncludePatternInputWidget = ( (__decorate([
-    ( (__param(3, IContextKeyService))),
-    ( (__param(4, IConfigurationService))),
-    ( (__param(5, IKeybindingService)))
-], IncludePatternInputWidget)));
+IncludePatternInputWidget = ( __decorate([
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IKeybindingService))
+], IncludePatternInputWidget));
 let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternInputWidget {
     constructor(parent, contextViewProvider, options, contextKeyService, configurationService, keybindingService) {
         super(parent, contextViewProvider, options, contextKeyService, configurationService, keybindingService);
-        this._onChangeIgnoreBoxEmitter = this._register(( (new Emitter())));
+        this._onChangeIgnoreBoxEmitter = this._register(( new Emitter()));
         this.onChangeIgnoreBox = this._onChangeIgnoreBoxEmitter.event;
     }
     dispose() {
@@ -195,14 +198,14 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
         return super.getSubcontrolsWidth() + this.useExcludesAndIgnoreFilesBox.width();
     }
     renderSubcontrols(controlsDiv) {
-        this.useExcludesAndIgnoreFilesBox = this._register(( (new Toggle({
+        this.useExcludesAndIgnoreFilesBox = this._register(( new Toggle({
             icon: Codicon.exclude,
             actionClassName: 'useExcludesAndIgnoreFiles',
-            title: ( localize(11044, "Use Exclude Settings and Ignore Files")),
+            title: ( localize(8577, "Use Exclude Settings and Ignore Files")),
             isChecked: true,
             hoverDelegate: getDefaultHoverDelegate('element'),
             ...defaultToggleStyles
-        }))));
+        })));
         this._register(this.useExcludesAndIgnoreFilesBox.onChange(viaKeyboard => {
             this._onChangeIgnoreBoxEmitter.fire();
             if (!viaKeyboard) {
@@ -213,10 +216,10 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
         super.renderSubcontrols(controlsDiv);
     }
 };
-ExcludePatternInputWidget = ( (__decorate([
-    ( (__param(3, IContextKeyService))),
-    ( (__param(4, IConfigurationService))),
-    ( (__param(5, IKeybindingService)))
-], ExcludePatternInputWidget)));
+ExcludePatternInputWidget = ( __decorate([
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IKeybindingService))
+], ExcludePatternInputWidget));
 
 export { ExcludePatternInputWidget, IncludePatternInputWidget, PatternInputWidget };