@codingame/monaco-vscode-search-service-override 9.0.3 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "9.0.3",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -29,6 +29,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0"
   }
 }

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

@@ -4,7 +4,6 @@ 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';
@@ -28,7 +27,7 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
         this.onCancel = this._onCancel.event;
         options = {
             ...{
-                ariaLabel: ( localize(10827, "input"))
+                ariaLabel: ( localize(10916, "input"))
             },
             ...options,
         };
@@ -117,11 +116,11 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
     }
     onInputKeyUp(keyboardEvent) {
         switch (keyboardEvent.keyCode) {
-            case KeyCode.Enter:
+            case 3 :
                 this.onSearchSubmit();
                 this._onSubmit.fire(false);
                 return;
-            case KeyCode.Escape:
+            case 9 :
                 this._onCancel.fire();
                 return;
         }
@@ -155,7 +154,7 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
     renderSubcontrols(controlsDiv) {
         this.useSearchInEditorsBox = this._register(( (new Toggle({
             icon: Codicon.book,
-            title: ( localize(10828, "Search only in Open Editors")),
+            title: ( localize(10917, "Search only in Open Editors")),
             isChecked: false,
             hoverDelegate: getDefaultHoverDelegate('element'),
             ...defaultToggleStyles
@@ -199,7 +198,7 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
         this.useExcludesAndIgnoreFilesBox = this._register(( (new Toggle({
             icon: Codicon.exclude,
             actionClassName: 'useExcludesAndIgnoreFiles',
-            title: ( localize(10829, "Use Exclude Settings and Ignore Files")),
+            title: ( localize(10918, "Use Exclude Settings and Ignore Files")),
             isChecked: true,
             hoverDelegate: getDefaultHoverDelegate('element'),
             ...defaultToggleStyles

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

@@ -83,12 +83,12 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         picker.buttons = [{
                 location: QuickInputButtonLocation.Inline,
                 iconClass: ThemeIcon.asClassName(Codicon.goToSearch),
-                tooltip: ( localize(8468, "See in Search Panel"))
+                tooltip: ( localize(8544, "See in Search Panel"))
             }];
         this.editorViewState.reset();
-        disposables.add(picker.onDidTriggerButton(() => {
+        disposables.add(picker.onDidTriggerButton(async () => {
             if (this.searchModel.searchResult.count() > 0) {
-                this.moveToSearchViewlet(undefined);
+                await this.moveToSearchViewlet(undefined);
             }
             else {
                 this._viewsService.openView(VIEW_ID, true);
@@ -154,17 +154,17 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             this.currentAsyncSearch = result.asyncResults;
             await result.asyncResults;
             const syncResultURIs = ( (new ResourceSet( (result.syncResults.map(e => e.resource)))));
-            return this.searchModel.searchResult.matches().filter(e => !( (syncResultURIs.has(e.resource))));
+            return this.searchModel.searchResult.matches(false).filter(e => !( (syncResultURIs.has(e.resource))));
         };
         return {
-            syncResults: this.searchModel.searchResult.matches(),
+            syncResults: this.searchModel.searchResult.matches(false),
             asyncResults: getAsyncResults()
         };
     }
-    moveToSearchViewlet(currentElem) {
+    async moveToSearchViewlet(currentElem) {
         this._viewsService.openView(VIEW_ID, false);
         const viewlet = this._viewsService.getActiveViewWithId(VIEW_ID);
-        viewlet.replaceSearchModel(this.searchModel, this.currentAsyncSearch);
+        await viewlet.replaceSearchModel(this.searchModel, this.currentAsyncSearch);
         this.searchModel = this._instantiationService.createInstance(SearchModel);
         this.searchModel.location = SearchModelLocation.QUICK_ACCESS;
         const viewer = viewlet?.getControl();
@@ -197,10 +197,10 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     type: 'separator',
                 });
                 picks.push({
-                    label: ( localize(8469, "See More Files")),
+                    label: ( localize(8545, "See More Files")),
                     iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                     accept: async () => {
-                        this.moveToSearchViewlet(matches[limit]);
+                        await this.moveToSearchViewlet(matches[limit]);
                     }
                 });
                 break;
@@ -214,7 +214,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 description,
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(searchOpenInFileIcon),
-                        tooltip: ( localize(8470, "Open File"))
+                        tooltip: ( localize(8546, "Open File"))
                     }],
                 trigger: async () => {
                     await this.handleAccept(fileMatch, {});
@@ -226,10 +226,10 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 const element = results[matchIndex];
                 if (matchIndex === MAX_RESULTS_PER_FILE) {
                     picks.push({
-                        label: ( localize(8471, "More")),
+                        label: ( localize(8547, "More")),
                         iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                         accept: async () => {
-                            this.moveToSearchViewlet(element);
+                            await this.moveToSearchViewlet(element);
                         }
                     });
                     break;
@@ -247,7 +247,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(searchActivityBarIcon),
-                            tooltip: ( localize(8472, "See in Search Panel")),
+                            tooltip: ( localize(8548, "See in Search Panel")),
                         }],
                     ariaLabel: `Match at location ${element.range().startLineNumber}:${element.range().startColumn} - ${previewText}`,
                     accept: async (keyMods, event) => {
@@ -258,8 +258,8 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                             forcePinned: event.inBackground
                         });
                     },
-                    trigger: () => {
-                        this.moveToSearchViewlet(element);
+                    trigger: async () => {
+                        await this.moveToSearchViewlet(element);
                         return TriggerAction.CLOSE_PICKER;
                     },
                     match: element
@@ -285,7 +285,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         if (contentPattern === '') {
             this.searchModel.searchResult.clear();
             return [{
-                    label: ( localize(8473, "Enter a term to search for across your files."))
+                    label: ( localize(8549, "Enter a term to search for across your files."))
                 }];
         }
         const conditionalTokenCts = disposables.add(( (new CancellationTokenSource())));
@@ -310,7 +310,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             picks: syncResult,
             additionalPicks: allMatches.asyncResults
                 .then(asyncResults => (asyncResults.length + syncResult.length === 0) ? [{
-                    label: ( localize(8474, "No matching results"))
+                    label: ( localize(8550, "No matching results"))
                 }] : this._getPicksFromMatches(asyncResults, MAX_FILES_SHOWN - matches.length))
                 .then(picks => {
                 if (picks.length > 0) {

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

@@ -1,10 +1,9 @@
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ReplacePreviewContentProvider } from './replaceService.js';
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 
 function registerContributions() {
-    registerWorkbenchContribution2(ReplacePreviewContentProvider.ID, ReplacePreviewContentProvider, WorkbenchPhase.BlockStartup );
+    registerWorkbenchContribution2(ReplacePreviewContentProvider.ID, ReplacePreviewContentProvider, 1 );
 }
 
 export { registerContributions };

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

@@ -9,7 +9,6 @@ import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/langu
 import { Match, MatchInNotebook, FileMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { ISearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel.service';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { createTextBufferFactoryFromSnapshot } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
@@ -60,7 +59,7 @@ let ReplacePreviewModel = class ReplacePreviewModel extends Disposable {
     }
     async resolve(replacePreviewUri) {
         const fileResource = toFileResource(replacePreviewUri);
-        const fileMatch = this.searchWorkbenchService.searchModel.searchResult.matches().filter(match => ( (match.resource.toString())) === ( (fileResource.toString())))[0];
+        const fileMatch = this.searchWorkbenchService.searchModel.searchResult.matches(false).filter(match => ( (match.resource.toString())) === ( (fileResource.toString())))[0];
         const ref = this._register(await this.textModelResolverService.createModelReference(fileResource));
         const sourceModel = ref.object.textEditorModel;
         const sourceModelLanguageId = sourceModel.getLanguageId();
@@ -87,7 +86,7 @@ ReplacePreviewModel = ( (__decorate([
 ], ReplacePreviewModel)));
 let ReplaceService = class ReplaceService {
     static { ReplaceService_1 = this; }
-    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( localize(3364, "Search and Replace"))); }
+    static { this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource('searchReplace.source', ( localize(3400, "Search and Replace"))); }
     constructor(textFileService, editorService, textModelResolverService, bulkEditorService, labelService, notebookEditorModelResolverService) {
         this.textFileService = textFileService;
         this.editorService = editorService;
@@ -125,7 +124,7 @@ let ReplaceService = class ReplaceService {
         const editor = await this.editorService.openEditor({
             original: { resource: fileMatch.resource },
             modified: { resource: toReplaceResource(fileMatch.resource) },
-            label: ( localize(3365, "{0} ↔ {1} (Replace Preview)", fileMatch.name(), fileMatch.name())),
+            label: ( localize(3401, "{0} ↔ {1} (Replace Preview)", fileMatch.name(), fileMatch.name())),
             description: this.labelService.getUriLabel(dirname(fileMatch.resource), { relative: true }),
             options: {
                 preserveFocus,
@@ -142,7 +141,7 @@ let ReplaceService = class ReplaceService {
         if (editor) {
             const editorControl = editor.getControl();
             if (element instanceof Match && editorControl) {
-                editorControl.revealLineInCenter(element.range().startLineNumber, ScrollType.Immediate);
+                editorControl.revealLineInCenter(element.range().startLineNumber, 1 );
             }
         }
     }
@@ -178,15 +177,15 @@ let ReplaceService = class ReplaceService {
     createEdits(arg, resource = null) {
         const edits = [];
         if (arg instanceof Match) {
-            if (arg instanceof MatchInNotebook) {
-                if (!arg.isReadonly()) {
+            if (!arg.isReadonly()) {
+                if (arg instanceof MatchInNotebook) {
                     const match = arg;
                     edits.push(this.createEdit(match, match.replaceString, match.cell?.uri));
                 }
-            }
-            else {
-                const match = arg;
-                edits.push(this.createEdit(match, match.replaceString, resource));
+                else {
+                    const match = arg;
+                    edits.push(this.createEdit(match, match.replaceString, resource));
+                }
             }
         }
         if (arg instanceof FileMatch) {