@codingame/monaco-vscode-search-service-override 1.82.6 → 1.83.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "1.82.6",
+  "version": "1.83.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -13,12 +13,12 @@
   },
   "type": "module",
   "private": false,
-  "description": "VSCode public API plugged on the monaco editor - search service-override meta package",
+  "description": "VSCode public API plugged on the monaco editor - search service-override",
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.82.6",
-    "monaco-editor": "0.43.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.83.1",
+    "monaco-editor": "0.44.0"
   }
 }

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

@@ -36,7 +36,7 @@ import { SymbolsQuickAccessProvider } from './symbolsQuickAccess.js';
 import { DefaultQuickAccessFilterValue, Extensions } from 'monaco-editor/esm/vs/platform/quickinput/common/quickAccess.js';
 import { GotoSymbolQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
 import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
-import { once } from 'monaco-editor/esm/vs/base/common/functional.js';
+import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { getIEditor } from 'monaco-editor/esm/vs/editor/browser/editorBrowser.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
@@ -108,7 +108,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
             }
             set(picker) {
                 this.picker = picker;
-                once(picker.onDispose)(() => {
+                Event.once(picker.onDispose)(() => {
                     if (picker === this.picker) {
                         this.picker = undefined;
                     }
@@ -180,7 +180,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 editorDecorationsDisposable.value = this.decorateAndRevealSymbolRange(item);
             }
         }));
-        disposables.add(once(picker.onDidHide)(({ reason }) => {
+        disposables.add(Event.once(picker.onDidHide)(({ reason }) => {
             if (reason === QuickInputHideReason.Gesture) {
                 this.pickState.restoreEditorViewState();
             }

package/vscode/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { ResourceSet } from 'monaco-editor/esm/vs/base/common/map.js';
 import { basenameOrAuthority, dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { localize } from 'monaco-editor/esm/vs/nls.js';
@@ -95,7 +96,8 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         const result = this.searchModel.search(query, undefined, token);
         const getAsyncResults = async () => {
             await result.asyncResults;
-            return this.searchModel.searchResult.matches().filter(e => result.syncResults.indexOf(e) === -1);
+            const syncResultURIs = ( new ResourceSet(( result.syncResults.map(e => e.resource))));
+            return this.searchModel.searchResult.matches().filter(e => !( syncResultURIs.has(e.resource)));
         };
         return {
             syncResults: this.searchModel.searchResult.matches(),

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

@@ -4,6 +4,9 @@ import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/
 import { category } from './searchActionsBase.js';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 import { TEXT_SEARCH_QUICK_ACCESS_PREFIX } from './quickTextSearch/textSearchQuickAccess.js';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { getSelectionTextFromEditor } from './searchView.js';
 
 registerAction2(class TextSearchQuickAccessAction extends Action2 {
     constructor() {
@@ -19,6 +22,23 @@ registerAction2(class TextSearchQuickAccessAction extends Action2 {
     }
     async run(accessor, match) {
         const quickInputService = accessor.get(IQuickInputService);
-        quickInputService.quickAccess.show(TEXT_SEARCH_QUICK_ACCESS_PREFIX);
+        const searchText = getSearchText(accessor) ?? '';
+        quickInputService.quickAccess.show(TEXT_SEARCH_QUICK_ACCESS_PREFIX + searchText, { preserveValue: !!searchText });
     }
 });
+function getSearchText(accessor) {
+    const editorService = accessor.get(IEditorService);
+    const configurationService = accessor.get(IConfigurationService);
+    const activeEditor = editorService.activeTextEditorControl;
+    if (!activeEditor) {
+        return null;
+    }
+    if (!activeEditor.hasTextFocus()) {
+        return null;
+    }
+    const seedSearchStringFromSelection = configurationService.getValue('editor.find.seedSearchStringFromSelection');
+    if (!seedSearchStringFromSelection) {
+        return null;
+    }
+    return getSelectionTextFromEditor(false, activeEditor);
+}

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

@@ -1096,37 +1096,11 @@ let SearchView = class SearchView extends ViewPane {
                 editor = editor.getModifiedEditor();
             }
         }
-        if (!isCodeEditor(editor) || !editor.hasModel()) {
+        if (!editor) {
             return null;
         }
-        const range = editor.getSelection();
-        if (!range) {
-            return null;
-        }
-        if (range.isEmpty() && this.searchConfig.seedWithNearestWord && allowUnselectedWord) {
-            const wordAtPosition = editor.getModel().getWordAtPosition(range.getStartPosition());
-            if (wordAtPosition) {
-                return wordAtPosition.word;
-            }
-        }
-        if (!range.isEmpty()) {
-            let searchText = '';
-            for (let i = range.startLineNumber; i <= range.endLineNumber; i++) {
-                let lineText = editor.getModel().getLineContent(i);
-                if (i === range.endLineNumber) {
-                    lineText = lineText.substring(0, range.endColumn - 1);
-                }
-                if (i === range.startLineNumber) {
-                    lineText = lineText.substring(range.startColumn - 1);
-                }
-                if (i !== range.startLineNumber) {
-                    lineText = '\n' + lineText;
-                }
-                searchText += lineText;
-            }
-            return searchText;
-        }
-        return null;
+        const allowUnselected = this.searchConfig.seedWithNearestWord && allowUnselectedWord;
+        return getSelectionTextFromEditor(allowUnselected, editor);
     }
     showsFileTypes() {
         return this.queryDetails.classList.contains('more');
@@ -1802,6 +1776,9 @@ let SearchView = class SearchView extends ViewPane {
         super.saveState();
     }
     _saveSearchHistoryService() {
+        if (this.searchWidget === undefined) {
+            return;
+        }
         const history = Object.create(null);
         const searchHistory = this.searchWidget.getSearchHistory();
         if (searchHistory && searchHistory.length) {
@@ -1914,5 +1891,38 @@ function getEditorSelectionFromMatch(element, viewModel) {
     }
     return undefined;
 }
+function getSelectionTextFromEditor(allowUnselectedWord, editor) {
+    if (!isCodeEditor(editor) || !editor.hasModel()) {
+        return null;
+    }
+    const range = editor.getSelection();
+    if (!range) {
+        return null;
+    }
+    if (range.isEmpty()) {
+        if (allowUnselectedWord) {
+            const wordAtPosition = editor.getModel().getWordAtPosition(range.getStartPosition());
+            return wordAtPosition?.word ?? null;
+        }
+        else {
+            return null;
+        }
+    }
+    let searchText = '';
+    for (let i = range.startLineNumber; i <= range.endLineNumber; i++) {
+        let lineText = editor.getModel().getLineContent(i);
+        if (i === range.endLineNumber) {
+            lineText = lineText.substring(0, range.endColumn - 1);
+        }
+        if (i === range.startLineNumber) {
+            lineText = lineText.substring(range.startColumn - 1);
+        }
+        if (i !== range.startLineNumber) {
+            lineText = '\n' + lineText;
+        }
+        searchText += lineText;
+    }
+    return searchText;
+}
 
-export { SearchView, getEditorSelectionFromMatch };
+export { SearchView, getEditorSelectionFromMatch, getSelectionTextFromEditor };

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.js

@@ -8,6 +8,7 @@ import { createTextBufferFactoryFromStream } from 'monaco-editor/esm/vs/editor/c
 import { SearchEditorWorkingCopyTypeId } from './constants.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
+import { SEARCH_RESULT_LANGUAGE_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 
 class SearchConfigurationModel {
     constructor(config) {
@@ -47,7 +48,7 @@ class SearchEditorModelFactory {
                             return backup;
                         }
                         return Promise.resolve({
-                            resultsModel: modelService.getModel(resource) ?? modelService.createModel('', languageService.createById('search-result'), resource),
+                            resultsModel: modelService.getModel(resource) ?? modelService.createModel('', languageService.createById(SEARCH_RESULT_LANGUAGE_ID), resource),
                             configurationModel: ( new SearchConfigurationModel(config))
                         });
                     })();
@@ -74,7 +75,7 @@ class SearchEditorModelFactory {
                             return backup;
                         }
                         return Promise.resolve({
-                            resultsModel: modelService.createModel(contents ?? '', languageService.createById('search-result'), resource),
+                            resultsModel: modelService.createModel(contents ?? '', languageService.createById(SEARCH_RESULT_LANGUAGE_ID), resource),
                             configurationModel: ( new SearchConfigurationModel(config))
                         });
                     })();
@@ -102,7 +103,7 @@ class SearchEditorModelFactory {
                         }
                         const { text, config } = await instantiationService.invokeFunction(parseSavedSearchEditor, existingFile);
                         return ({
-                            resultsModel: modelService.createModel(text ?? '', languageService.createById('search-result'), resource),
+                            resultsModel: modelService.createModel(text ?? '', languageService.createById(SEARCH_RESULT_LANGUAGE_ID), resource),
                             configurationModel: ( new SearchConfigurationModel(config))
                         });
                     })();
@@ -116,14 +117,14 @@ class SearchEditorModelFactory {
         let model = modelService.getModel(resource);
         if (!model && backup) {
             const factory = await createTextBufferFactoryFromStream(backup.value);
-            model = modelService.createModel(factory, languageService.createById('search-result'), resource);
+            model = modelService.createModel(factory, languageService.createById(SEARCH_RESULT_LANGUAGE_ID), resource);
         }
         if (model) {
             const existingFile = model.getValue();
             const { text, config } = parseSerializedSearchEditor(existingFile);
             modelService.destroyModel(resource);
             return ({
-                resultsModel: modelService.createModel(text ?? '', languageService.createById('search-result'), resource),
+                resultsModel: modelService.createModel(text ?? '', languageService.createById(SEARCH_RESULT_LANGUAGE_ID), resource),
                 configurationModel: ( new SearchConfigurationModel(config))
             });
         }

package/vscode/src/vs/workbench/services/search/common/searchService.js

@@ -15,7 +15,7 @@ import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/c
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { deserializeSearchError, SearchErrorCode, FileMatch, pathIncludedInQuery, isFileMatch, isProgressMessage } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { deserializeSearchError, SearchErrorCode, SEARCH_RESULT_LANGUAGE_ID, FileMatch, pathIncludedInQuery, isFileMatch, isProgressMessage } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { editorMatchesToTextSearchResults, addContextToEditorMatches } from 'vscode/vscode/vs/workbench/services/search/common/searchHelpers';
 
 let SearchService = class SearchService extends Disposable {
@@ -316,7 +316,7 @@ let SearchService = class SearchService extends Disposable {
                 if (!originalResource) {
                     return;
                 }
-                if (model.getLanguageId() === 'search-result' && !(query.includePattern && query.includePattern['**/*.code-search'])) {
+                if (model.getLanguageId() === SEARCH_RESULT_LANGUAGE_ID && !(query.includePattern && query.includePattern['**/*.code-search'])) {
                     return;
                 }
                 if (originalResource.scheme !== Schemas.untitled && !this.fileService.hasProvider(originalResource)) {