@codingame/monaco-vscode-search-service-override 2.2.2 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "2.2.2",
+  "version": "3.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.1.0",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

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

@@ -23,6 +23,8 @@ import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/searc
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { EditorViewState } from 'vscode/vscode/vs/workbench/browser/quickaccess';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history';
+import { Sequencer } from 'vscode/vscode/vs/base/common/async';
 
 const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '%';
 const DEFAULT_TEXT_QUERY_BUILDER_OPTIONS = {
@@ -49,7 +51,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             }
         };
     }
-    constructor(_instantiationService, _contextService, _editorService, _labelService, _viewsService, _configurationService) {
+    constructor(_instantiationService, _contextService, _editorService, _labelService, _viewsService, _configurationService, _historyService) {
         super(TEXT_SEARCH_QUICK_ACCESS_PREFIX, { canAcceptInBackground: true, shouldSkipTrimPickFilter: true });
         this._instantiationService = _instantiationService;
         this._contextService = _contextService;
@@ -57,6 +59,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         this._labelService = _labelService;
         this._viewsService = _viewsService;
         this._configurationService = _configurationService;
+        this._historyService = _historyService;
         this.currentAsyncSearch = Promise.resolve({
             results: [],
             messages: []
@@ -65,6 +68,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         this.queryBuilder = this._instantiationService.createInstance(QueryBuilder);
         this.searchModel = this._instantiationService.createInstance(SearchModel);
         this.searchModel.location = SearchModelLocation.QUICK_ACCESS;
+        this.editorSequencer = ( new Sequencer());
     }
     dispose() {
         this.searchModel.dispose();
@@ -91,15 +95,24 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             const [item] = picker.activeItems;
             if (item?.match) {
                 this.editorViewState.set();
-                this._editorService.openEditor({
-                    resource: item.match.parent().resource,
-                    options: { preserveFocus: true, revealIfOpened: true, ignoreError: true, selection: item.match.range() }
+                const itemMatch = item.match;
+                this.editorSequencer.queue(async () => {
+                    const disposable = this._historyService.suspendTracking();
+                    try {
+                        await this._editorService.openEditor({
+                            resource: itemMatch.parent().resource,
+                            options: { preserveFocus: true, revealIfOpened: true, ignoreError: true, selection: itemMatch.range() }
+                        });
+                    }
+                    finally {
+                        disposable.dispose();
+                    }
                 });
             }
         }));
         disposables.add(Event.once(picker.onDidHide)(({ reason }) => {
             if (reason === QuickInputHideReason.Gesture) {
-                this.editorViewState.restore();
+                this.editorViewState.restore(true);
             }
             this.searchModel.searchResult.toggleHighlights(false);
         }));
@@ -322,7 +335,8 @@ TextSearchQuickAccess = ( __decorate([
     ( __param(2, IEditorService)),
     ( __param(3, ILabelService)),
     ( __param(4, IViewsService)),
-    ( __param(5, IConfigurationService))
+    ( __param(5, IConfigurationService)),
+    ( __param(6, IHistoryService))
 ], TextSearchQuickAccess));
 
 export { TEXT_SEARCH_QUICK_ACCESS_PREFIX, TextSearchQuickAccess };

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

@@ -1,9 +1,8 @@
 import { ReplacePreviewContentProvider } from './replaceService.js';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 
 function registerContributions() {
-    ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ReplacePreviewContentProvider, 1 );
+    registerWorkbenchContribution2(ReplacePreviewContentProvider.ID, ReplacePreviewContentProvider, 1 );
 }
 
 export { registerContributions };

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

@@ -30,6 +30,7 @@ const toFileResource = (replaceResource) => {
     return replaceResource.with({ scheme: JSON.parse(replaceResource.query)['scheme'], fragment: '', query: '' });
 };
 let ReplacePreviewContentProvider = class ReplacePreviewContentProvider {
+    static { this.ID = 'workbench.contrib.replacePreviewContentProvider'; }
     constructor(instantiationService, textModelResolverService) {
         this.instantiationService = instantiationService;
         this.textModelResolverService = textModelResolverService;

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

@@ -1,31 +1,25 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { AbstractGotoLineQuickAccessProvider } from 'vscode/vscode/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { Extensions as Extensions$3 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
+import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { defaultQuickAccessContextKeyValue } from 'vscode/vscode/vs/workbench/browser/quickaccess';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { Extensions, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions } from 'vscode/vscode/vs/workbench/common/views';
 import { GotoSymbolQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess';
 import { AnythingQuickAccessProvider } from './anythingQuickAccess.js';
 import { registerContributions } from './replaceContributions.js';
-import { registerContributions as registerContributions$1 } from './notebookSearch/notebookSearchContributions.js';
 import { searchViewIcon } from './searchIcons.js';
 import { SearchView } from './searchView.js';
-import { registerContributions as registerContributions$2 } from './searchWidget.js';
+import { registerContributions as registerContributions$1 } from './searchWidget.js';
 import { SymbolsQuickAccessProvider } from './symbolsQuickAccess.js';
 import { VIEWLET_ID, VIEW_ID, SEARCH_EXCLUDE_CONFIG } from 'vscode/vscode/vs/workbench/services/search/common/search';
-import { Extensions as Extensions$4 } from 'vscode/vscode/vs/workbench/common/configuration';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { assertType } from 'vscode/vscode/vs/base/common/types';
 import { getWorkspaceSymbols } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
-import { ShowAllSymbolsActionId, QuickTextSearchActionId } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import './searchActionsCopy.js';
 import 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsFind';
 import './searchActionsNav.js';
@@ -37,7 +31,6 @@ import { TextSearchQuickAccess, TEXT_SEARCH_QUICK_ACCESS_PREFIX } from './quickT
 
 registerContributions();
 registerContributions$1();
-registerContributions$2();
 const SEARCH_MODE_CONFIG = 'search.mode';
 const viewContainer = ( Registry.as(Extensions.ViewContainersRegistry)).registerViewContainer({
     id: VIEWLET_ID,
@@ -80,22 +73,7 @@ const viewDescriptor = {
     }
 };
 ( Registry.as(Extensions.ViewsRegistry)).registerViews([viewDescriptor], viewContainer);
-let RegisterSearchViewContribution = class RegisterSearchViewContribution {
-    constructor(configurationService, viewDescriptorService) {
-        const data = configurationService.inspect('search.location');
-        if (data.value === 'panel') {
-            viewDescriptorService.moveViewToLocation(viewDescriptor, 1 , 'search.location');
-        }
-        ( Registry.as(Extensions$4.ConfigurationMigration))
-            .registerConfigurationMigrations([{ key: 'search.location', migrateFn: (value) => ({ value: undefined }) }]);
-    }
-};
-RegisterSearchViewContribution = ( __decorate([
-    ( __param(0, IConfigurationService)),
-    ( __param(1, IViewDescriptorService))
-], RegisterSearchViewContribution));
-( Registry.as(Extensions$1.Workbench)).registerWorkbenchContribution(RegisterSearchViewContribution, 1 );
-const quickAccessRegistry = ( Registry.as(Extensions$2.Quickaccess));
+const quickAccessRegistry = ( Registry.as(Extensions$1.Quickaccess));
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: AnythingQuickAccessProvider,
     prefix: AnythingQuickAccessProvider.PREFIX,
@@ -130,7 +108,7 @@ quickAccessRegistry.registerQuickAccessProvider({
         'vs/workbench/contrib/search/browser/search.contribution',
         'symbolsQuickAccess',
         "Go to Symbol in Workspace"
-    )), commandId: ShowAllSymbolsActionId }]
+    )), commandId: "workbench.action.showAllSymbols"  }]
 });
 quickAccessRegistry.registerQuickAccessProvider({
     ctor: TextSearchQuickAccess,
@@ -148,12 +126,12 @@ quickAccessRegistry.registerQuickAccessProvider({
                 'textSearchPickerHelp',
                 "Search for Text (Experimental)"
             )),
-            commandId: QuickTextSearchActionId,
+            commandId: "workbench.action.experimental.quickTextSearch" ,
             commandCenterOrder: 65,
         }
     ]
 });
-const configurationRegistry = ( Registry.as(Extensions$3.Configuration));
+const configurationRegistry = ( Registry.as(Extensions$2.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'search',
     order: 13,

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

@@ -1,8 +1,8 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
-import { CopyMatchCommandId, FileMatchOrMatchFocusKey, CopyPathCommandId, FileMatchOrFolderMatchWithResourceFocusKey, CopyAllCommandId, HasSearchResults } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { FileMatch, FolderMatchWithResource, Match, FolderMatch, searchMatchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { category, getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
@@ -11,24 +11,21 @@ import { isWindows } from 'vscode/vscode/vs/base/common/platform';
 registerAction2(class CopyMatchCommandAction extends Action2 {
     constructor() {
         super({
-            id: CopyMatchCommandId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsCopy',
-                    'copyMatchLabel',
-                    "Copy"
-                )),
-                original: 'Copy'
-            },
+            id: "search.action.copyMatch" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsCopy',
+                'copyMatchLabel',
+                "Copy"
+            )),
             category,
             keybinding: {
                 weight: 200 ,
-                when: FileMatchOrMatchFocusKey,
+                when: SearchContext.FileMatchOrMatchFocusKey,
                 primary: 2048  | 33 ,
             },
             menu: [{
                     id: MenuId.SearchContext,
-                    when: FileMatchOrMatchFocusKey,
+                    when: SearchContext.FileMatchOrMatchFocusKey,
                     group: 'search_2',
                     order: 1
                 }]
@@ -41,19 +38,16 @@ registerAction2(class CopyMatchCommandAction extends Action2 {
 registerAction2(class CopyPathCommandAction extends Action2 {
     constructor() {
         super({
-            id: CopyPathCommandId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsCopy',
-                    'copyPathLabel',
-                    "Copy Path"
-                )),
-                original: 'Copy Path'
-            },
+            id: "search.action.copyPath" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsCopy',
+                'copyPathLabel',
+                "Copy Path"
+            )),
             category,
             keybinding: {
                 weight: 200 ,
-                when: FileMatchOrFolderMatchWithResourceFocusKey,
+                when: SearchContext.FileMatchOrFolderMatchWithResourceFocusKey,
                 primary: 2048  | 512  | 33 ,
                 win: {
                     primary: 1024  | 512  | 33
@@ -61,7 +55,7 @@ registerAction2(class CopyPathCommandAction extends Action2 {
             },
             menu: [{
                     id: MenuId.SearchContext,
-                    when: FileMatchOrFolderMatchWithResourceFocusKey,
+                    when: SearchContext.FileMatchOrFolderMatchWithResourceFocusKey,
                     group: 'search_2',
                     order: 2
                 }]
@@ -74,19 +68,16 @@ registerAction2(class CopyPathCommandAction extends Action2 {
 registerAction2(class CopyAllCommandAction extends Action2 {
     constructor() {
         super({
-            id: CopyAllCommandId,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/contrib/search/browser/searchActionsCopy',
-                    'copyAllLabel',
-                    "Copy All"
-                )),
-                original: 'Copy All'
-            },
+            id: "search.action.copyAll" ,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/search/browser/searchActionsCopy',
+                'copyAllLabel',
+                "Copy All"
+            )),
             category,
             menu: [{
                     id: MenuId.SearchContext,
-                    when: HasSearchResults,
+                    when: SearchContext.HasSearchResults,
                     group: 'search_2',
                     order: 3
                 }]