@codingame/monaco-vscode-search-service-override 4.5.2 → 5.0.1

package/package.json

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

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

@@ -50,6 +50,7 @@ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ASK_QUICK_QUESTION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
 import { IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ICustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService.service';
 
 var AnythingQuickAccessProvider_1;
 const _moduleId = "vs/workbench/contrib/search/browser/anythingQuickAccess";
@@ -72,7 +73,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         }
         return undefined;
     }
-    constructor(instantiationService, searchService, contextService, pathService, environmentService, fileService, labelService, modelService, languageService, workingCopyService, configurationService, editorService, historyService, filesConfigurationService, textModelService, uriIdentityService, quickInputService, keybindingService, quickChatService, logService) {
+    constructor(instantiationService, searchService, contextService, pathService, environmentService, fileService, labelService, modelService, languageService, workingCopyService, configurationService, editorService, historyService, filesConfigurationService, textModelService, uriIdentityService, quickInputService, keybindingService, quickChatService, logService, customEditorLabelService) {
         super(AnythingQuickAccessProvider_1.PREFIX, {
             canAcceptInBackground: true,
             noResultsPick: AnythingQuickAccessProvider_1.NO_RESULTS_PICK
@@ -97,6 +98,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         this.keybindingService = keybindingService;
         this.quickChatService = quickChatService;
         this.logService = logService;
+        this.customEditorLabelService = customEditorLabelService;
         this.pickState = this._register(new (class extends Disposable {
             constructor(provider, instantiationService) {
                 super();
@@ -650,8 +652,9 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         }
         else {
             resource = URI.isUri(resourceOrEditor) ? resourceOrEditor : resourceOrEditor.resource;
-            label = basenameOrAuthority(resource);
-            description = this.labelService.getUriLabel(dirname(resource), { relative: true });
+            const customLabel = this.customEditorLabelService.getName(resource);
+            label = customLabel || basenameOrAuthority(resource);
+            description = this.labelService.getUriLabel(!!customLabel ? resource : dirname(resource), { relative: true });
             isDirty = this.workingCopyService.isDirty(resource) && !this.filesConfigurationService.hasShortAutoSaveDelay(resource);
             extraClasses = [];
         }
@@ -754,7 +757,8 @@ AnythingQuickAccessProvider = AnythingQuickAccessProvider_1 = ( (__decorate([
     ( (__param(16, IQuickInputService))),
     ( (__param(17, IKeybindingService))),
     ( (__param(18, IQuickChatService))),
-    ( (__param(19, ILogService)))
+    ( (__param(19, ILogService))),
+    ( (__param(20, ICustomEditorLabelService)))
 ], AnythingQuickAccessProvider)));
 
 export { AnythingQuickAccessProvider };

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

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.dirty-anything:before{content:\"\\ea76\";font-family:codicon}";
+var css = ".quick-input-list .quick-input-list-entry.has-actions:hover .quick-input-list-entry-action-bar .action-label.dirty-anything:before{content:var(--vscode-icon-x-content);font-family:var(--vscode-icon-x-font-family)}";
 n(css,{});
 
 export { css, css as default };

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

@@ -81,7 +81,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             picker.valueSelection = [TEXT_SEARCH_QUICK_ACCESS_PREFIX.length, picker.value.length];
         }
         picker.customButton = true;
-        picker.customLabel = '$(link-external)';
+        picker.customLabel = '$(go-to-search)';
         this.editorViewState.reset();
         disposables.add(picker.onDidCustom(() => {
             if (this.searchModel.searchResult.count() > 0) {
@@ -123,9 +123,10 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         const searchConfig = this._configurationService.getValue().search;
         return {
             openEditorPinned: !editorConfig?.enablePreviewFromQuickOpen || !editorConfig?.enablePreview,
-            preserveInput: searchConfig.experimental.quickAccess.preserveInput,
+            preserveInput: searchConfig.quickAccess.preserveInput,
             maxResults: searchConfig.maxResults,
             smartCase: searchConfig.smartCase,
+            sortOrder: searchConfig.sortOrder,
         };
     }
     get defaultFilterValue() {
@@ -173,8 +174,18 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             viewlet.searchAndReplaceWidget.focus();
         }
     }
-    _getPicksFromMatches(matches, limit) {
-        matches = matches.sort(searchComparer);
+    _getPicksFromMatches(matches, limit, firstFile) {
+        matches = matches.sort((a, b) => {
+            if (firstFile) {
+                if (firstFile === a.resource) {
+                    return -1;
+                }
+                else if (firstFile === b.resource) {
+                    return 1;
+                }
+            }
+            return searchComparer(a, b, this.configuration.sortOrder);
+        });
         const files = matches.length > limit ? matches.slice(0, limit) : matches;
         const picks = [];
         for (let fileIndex = 0; fileIndex < matches.length; fileIndex++) {
@@ -285,7 +296,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
             return null;
         }
         const matches = allMatches.syncResults;
-        const syncResult = this._getPicksFromMatches(matches, MAX_FILES_SHOWN);
+        const syncResult = this._getPicksFromMatches(matches, MAX_FILES_SHOWN, this._editorService.activeEditor?.resource);
         if (syncResult.length > 0) {
             this.searchModel.searchResult.toggleHighlights(true);
         }

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

@@ -32,6 +32,7 @@ import './searchActionsSymbol.js';
 import './searchActionsTopBar.js';
 import './searchActionsTextQuickAccess.js';
 import { TextSearchQuickAccess, TEXT_SEARCH_QUICK_ACCESS_PREFIX } from './quickTextSearch/textSearchQuickAccess.js';
+import { Extensions as Extensions$3 } from 'vscode/vscode/vs/workbench/common/configuration';
 
 const _moduleId = "vs/workbench/contrib/search/browser/search.contribution";
 registerContributions();
@@ -95,12 +96,12 @@ quickAccessRegistry.registerQuickAccessProvider({
     ctor: TextSearchQuickAccess,
     prefix: TEXT_SEARCH_QUICK_ACCESS_PREFIX,
     contextKey: 'inTextSearchPicker',
-    placeholder: ( localizeWithPath(_moduleId, 6, "Search for text in your workspace files (experimental).")),
+    placeholder: ( localizeWithPath(_moduleId, 6, "Search for text in your workspace files.")),
     helpEntries: [
         {
-            description: ( localizeWithPath(_moduleId, 7, "Search for Text (Experimental)")),
-            commandId: "workbench.action.experimental.quickTextSearch" ,
-            commandCenterOrder: 65,
+            description: ( localizeWithPath(_moduleId, 7, "Search for Text")),
+            commandId: "workbench.action.quickTextSearch" ,
+            commandCenterOrder: 25,
         }
     ]
 });
@@ -248,10 +249,10 @@ configurationRegistry.registerConfiguration({
             default: true
         },
         'search.quickOpen.history.filterSortOrder': {
-            'type': 'string',
-            'enum': ['default', 'recency'],
-            'default': 'default',
-            'enumDescriptions': [
+            type: 'string',
+            enum: ['default', 'recency'],
+            default: 'default',
+            enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
                     25,
@@ -263,7 +264,7 @@ configurationRegistry.registerConfiguration({
                     'History entries are sorted by recency. More recently opened entries appear first.'
                 ))
             ],
-            'description': ( localizeWithPath(
+            description: ( localizeWithPath(
                 _moduleId,
                 27,
                 "Controls sorting order of editor history in quick open when filtering."
@@ -471,10 +472,10 @@ configurationRegistry.registerConfiguration({
             ))
         },
         'search.sortOrder': {
-            'type': 'string',
-            'enum': ["default" , "fileNames" , "type" , "modified" , "countDescending" , "countAscending" ],
-            'default': "default" ,
-            'enumDescriptions': [
+            type: 'string',
+            enum: ["default" , "fileNames" , "type" , "modified" , "countDescending" , "countAscending" ],
+            default: "default" ,
+            enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
                     56,
@@ -502,7 +503,7 @@ configurationRegistry.registerConfiguration({
                 )),
                 ( localizeWithPath(_moduleId, 61, "Results are sorted by count per file, in ascending order."))
             ],
-            'description': ( localizeWithPath(_moduleId, 62, "Controls sorting order of search results."))
+            description: ( localizeWithPath(_moduleId, 62, "Controls sorting order of search results."))
         },
         'search.decorations.colors': {
             type: 'boolean',
@@ -523,32 +524,32 @@ configurationRegistry.registerConfiguration({
             default: true
         },
         'search.defaultViewMode': {
-            'type': 'string',
-            'enum': ["tree" , "list" ],
-            'default': "list" ,
-            'enumDescriptions': [
+            type: 'string',
+            enum: ["tree" , "list" ],
+            default: "list" ,
+            enumDescriptions: [
                 ( localizeWithPath(_moduleId, 65, "Shows search results as a tree.")),
                 ( localizeWithPath(_moduleId, 66, "Shows search results as a list."))
             ],
-            'description': ( localizeWithPath(_moduleId, 67, "Controls the default search result view mode."))
+            description: ( localizeWithPath(_moduleId, 67, "Controls the default search result view mode."))
         },
-        'search.experimental.closedNotebookRichContentResults': {
+        'search.quickAccess.preserveInput': {
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
                 68,
-                "Show notebook editor rich content results for closed notebooks. Please refresh your search results after changing this setting."
+                "Controls whether the last typed input to Quick Search should be restored when opening it the next time."
             )),
             default: false
         },
-        'search.experimental.quickAccess.preserveInput': {
-            'type': 'boolean',
-            'description': ( localizeWithPath(
+        'search.experimental.closedNotebookRichContentResults': {
+            type: 'boolean',
+            description: ( localizeWithPath(
                 _moduleId,
                 69,
-                "Controls whether the last typed input to Quick Search should be restored when opening it the next time."
+                "Show notebook editor rich content results for closed notebooks. Please refresh your search results after changing this setting."
             )),
-            'default': false
+            default: false
         },
     }
 });
@@ -560,3 +561,11 @@ CommandsRegistry.registerCommand('_executeWorkspaceSymbolProvider', async functi
          (result.map(item => item.symbol))
     );
 });
+( (Registry.as(Extensions$3.ConfigurationMigration)))
+    .registerConfigurationMigrations([{
+        key: 'search.experimental.quickAccess.preserveInput',
+        migrateFn: (value, _accessor) => ([
+            ['search.quickAccess.preserveInput', { value }],
+            ['search.experimental.quickAccess.preserveInput', { value: undefined }]
+        ])
+    }]);

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

@@ -11,8 +11,8 @@ const _moduleId = "vs/workbench/contrib/search/browser/searchActionsTextQuickAcc
 registerAction2(class TextSearchQuickAccessAction extends Action2 {
     constructor() {
         super({
-            id: "workbench.action.experimental.quickTextSearch" ,
-            title: ( localize2WithPath(_moduleId, 0, "Quick Search (Experimental)")),
+            id: "workbench.action.quickTextSearch" ,
+            title: ( localize2WithPath(_moduleId, 0, "Quick Search")),
             category,
             f1: true
         });

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

@@ -9,17 +9,16 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 const _moduleId = "vs/workbench/contrib/search/browser/searchFindInput";
 const NLS_AI_TOGGLE_LABEL = ( localizeWithPath(_moduleId, 0, "Use AI"));
 class SearchFindInput extends ContextScopedFindInput {
-    constructor(container, contextViewProvider, options, contextKeyService, contextMenuService, instantiationService, filters, _shouldShowAIButton,
+    constructor(container, contextViewProvider, options, contextKeyService, contextMenuService, instantiationService, filters, shouldShowAIButton,
     filterStartVisiblitity) {
         super(container, contextViewProvider, options, contextKeyService);
         this.contextMenuService = contextMenuService;
         this.instantiationService = instantiationService;
         this.filters = filters;
-        this._shouldShowAIButton = _shouldShowAIButton;
         this._filterChecked = false;
-        this._visible = false;
         this._onDidChangeAIToggle = this._register(( (new Emitter())));
         this.onDidChangeAIToggle = this._onDidChangeAIToggle.event;
+        this.shouldNotebookFilterBeVisible = false;
         this._findFilter = this._register(( (new NotebookFindInputFilterButton(filters, contextMenuService, instantiationService, options, ( localizeWithPath(_moduleId, 1, "Notebook Find Filters"))))));
         this._aiButton = this._register(( (new AIToggle({
             appendTitle: '',
@@ -27,47 +26,61 @@ class SearchFindInput extends ContextScopedFindInput {
             ...options.toggleStyles
         }))));
         this.setAdditionalToggles([this._aiButton]);
-        this.inputBox.paddingRight = (this.caseSensitive?.width() ?? 0) + (this.wholeWords?.width() ?? 0) + (this.regex?.width() ?? 0) + this._findFilter.width;
+        this._updatePadding();
         this.controls.appendChild(this._findFilter.container);
         this._findFilter.container.classList.add('monaco-custom-toggle');
         this.filterVisible = filterStartVisiblitity;
+        this.sparkleVisible = shouldShowAIButton;
         this._register(this._aiButton.onChange(() => {
+            if (this.regex) {
+                this.regex.visible = !this._aiButton.checked;
+            }
+            if (this.wholeWords) {
+                this.wholeWords.visible = !this._aiButton.checked;
+            }
+            if (this.caseSensitive) {
+                this.caseSensitive.visible = !this._aiButton.checked;
+            }
             if (this._aiButton.checked) {
-                this.regex?.disable();
-                this.wholeWords?.disable();
-                this.caseSensitive?.disable();
-                this._findFilter.disable();
+                this._findFilter.visible = false;
             }
             else {
-                this.regex?.enable();
-                this.wholeWords?.enable();
-                this.caseSensitive?.enable();
-                this._findFilter.enable();
+                this.filterVisible = this.shouldNotebookFilterBeVisible;
             }
+            this._updatePadding();
         }));
-        this._aiButton.domNode.style.display = _shouldShowAIButton ? '' : 'none';
     }
-    set shouldShowAIButton(visible) {
-        if (this._shouldShowAIButton !== visible) {
-            this._shouldShowAIButton = visible;
-            this._aiButton.domNode.style.display = visible ? '' : 'none';
-        }
+    _updatePadding() {
+        this.inputBox.paddingRight =
+            (this.caseSensitive?.visible ? this.caseSensitive.width() : 0) +
+                (this.wholeWords?.visible ? this.wholeWords.width() : 0) +
+                (this.regex?.visible ? this.regex.width() : 0) +
+                (this._findFilter.visible ? this._findFilter.width() : 0) +
+                (this._aiButton.visible ? this._aiButton.width() : 0);
+    }
+    set sparkleVisible(visible) {
+        this._aiButton.visible = visible;
+        this._updatePadding();
     }
     set filterVisible(visible) {
-        this._findFilter.container.style.display = visible ? '' : 'none';
-        this._visible = visible;
-        this.updateStyles();
+        this.shouldNotebookFilterBeVisible = visible;
+        if (this._aiButton.visible && this._aiButton.checked) {
+            return;
+        }
+        this._findFilter.visible = visible;
+        this.updateFilterStyles();
+        this._updatePadding();
     }
     setEnabled(enabled) {
         super.setEnabled(enabled);
-        if (enabled && (!this._filterChecked || !this._visible)) {
+        if (enabled && (!this._filterChecked || !this._findFilter.visible)) {
             this.regex?.enable();
         }
         else {
             this.regex?.disable();
         }
     }
-    updateStyles() {
+    updateFilterStyles() {
         this._filterChecked =
             !this.filters.markupInput ||
                 !this.filters.markupPreview ||

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

@@ -4,7 +4,7 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
 
 const _moduleId = "vs/workbench/contrib/search/browser/searchIcons";
 const searchDetailsIcon = registerIcon('search-details', Codicon.ellipsis, ( localizeWithPath(_moduleId, 0, 'Icon to make search details visible.')));
-const searchActivityBarIcon = registerIcon('search-see-more', Codicon.linkExternal, ( localizeWithPath(_moduleId, 1, 'Icon to view more context in the search view.')));
+const searchActivityBarIcon = registerIcon('search-see-more', Codicon.goToSearch, ( localizeWithPath(_moduleId, 1, 'Icon to view more context in the search view.')));
 const searchShowContextIcon = registerIcon('search-show-context', Codicon.listSelection, ( localizeWithPath(_moduleId, 2, 'Icon for toggle the context in the search editor.')));
 const searchHideReplaceIcon = registerIcon('search-hide-replace', Codicon.chevronRight, ( localizeWithPath(_moduleId, 3, 'Icon to collapse the replace section in the search view.')));
 const searchShowReplaceIcon = registerIcon('search-show-replace', Codicon.chevronDown, ( localizeWithPath(_moduleId, 4, 'Icon to expand the replace section in the search view.')));

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

@@ -17,8 +17,8 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var FolderMatchRenderer_1, FileMatchRenderer_1, MatchRenderer_1;
 const _moduleId = "vs/workbench/contrib/search/browser/searchResultsView";
@@ -225,13 +225,14 @@ FileMatchRenderer = FileMatchRenderer_1 = ( (__decorate([
 let MatchRenderer = class MatchRenderer extends Disposable {
     static { MatchRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'match'; }
-    constructor(searchView, contextService, configurationService, instantiationService, contextKeyService) {
+    constructor(searchView, contextService, configurationService, instantiationService, contextKeyService, hoverService) {
         super();
         this.searchView = searchView;
         this.contextService = contextService;
         this.configurationService = configurationService;
         this.instantiationService = instantiationService;
         this.contextKeyService = contextKeyService;
+        this.hoverService = hoverService;
         this.templateId = MatchRenderer_1.TEMPLATE_ID;
     }
     renderCompressedElements(node, index, templateData, height) {
@@ -285,7 +286,7 @@ let MatchRenderer = class MatchRenderer extends Disposable {
         templateData.replace.textContent = replace ? match.replaceString : '';
         templateData.after.textContent = preview.after;
         const title = (preview.fullBefore + (replace ? match.replaceString : preview.inside) + preview.after).trim().substr(0, 999);
-        templateData.disposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), templateData.parent, title));
+        templateData.disposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), templateData.parent, title));
         SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!(match instanceof MatchInNotebook && match.isReadonly()));
         const numLines = match.range().endLineNumber - match.range().startLineNumber;
         const extraLinesStr = numLines > 0 ? `+${numLines}` : '';
@@ -293,7 +294,7 @@ let MatchRenderer = class MatchRenderer extends Disposable {
         const lineNumberStr = showLineNumbers ? `${match.range().startLineNumber}:` : '';
         templateData.lineNumber.classList.toggle('show', (numLines > 0) || showLineNumbers);
         templateData.lineNumber.textContent = lineNumberStr + extraLinesStr;
-        templateData.disposables.add(setupCustomHover(getDefaultHoverDelegate('mouse'), templateData.lineNumber, this.getMatchTitle(match, showLineNumbers)));
+        templateData.disposables.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), templateData.lineNumber, this.getMatchTitle(match, showLineNumbers)));
         templateData.actions.context = { viewer: this.searchView.getControl(), element: match };
     }
     disposeTemplate(templateData) {
@@ -315,7 +316,8 @@ MatchRenderer = MatchRenderer_1 = ( (__decorate([
     ( (__param(1, IWorkspaceContextService))),
     ( (__param(2, IConfigurationService))),
     ( (__param(3, IInstantiationService))),
-    ( (__param(4, IContextKeyService)))
+    ( (__param(4, IContextKeyService))),
+    ( (__param(5, IHoverService)))
 ], MatchRenderer)));
 let SearchAccessibilityProvider = class SearchAccessibilityProvider {
     constructor(searchView, labelService) {

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

@@ -73,8 +73,8 @@ import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/co
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { TextSearchCompleteMessageType } from 'vscode/vscode/vs/workbench/services/search/common/searchExtTypes';
 
 var SearchView_1;
@@ -85,8 +85,8 @@ const DEBOUNCE_DELAY = 75;
 let SearchView = class SearchView extends ViewPane {
     static { SearchView_1 = this; }
     static { this.ACTIONS_RIGHT_CLASS_NAME = 'actions-right'; }
-    constructor(options, fileService, editorService, codeEditorService, progressService, notificationService, dialogService, commandService, contextViewService, instantiationService, viewDescriptorService, configurationService, contextService, searchViewModelWorkbenchService, contextKeyService, replaceService, textFileService, preferencesService, themeService, searchHistoryService, contextMenuService, accessibilityService, keybindingService, storageService, openerService, telemetryService, notebookService, logService, accessibilitySignalService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, fileService, editorService, codeEditorService, progressService, notificationService, dialogService, commandService, contextViewService, instantiationService, viewDescriptorService, configurationService, contextService, searchViewModelWorkbenchService, contextKeyService, replaceService, textFileService, preferencesService, themeService, searchHistoryService, contextMenuService, accessibilityService, keybindingService, storageService, openerService, telemetryService, hoverService, notebookService, logService, accessibilitySignalService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.fileService = fileService;
         this.editorService = editorService;
         this.codeEditorService = codeEditorService;
@@ -246,7 +246,7 @@ let SearchView = class SearchView extends ViewPane {
     refreshHasAISetting() {
         const val = this.shouldShowAIButton();
         if (val && this.searchWidget.searchInput) {
-            this.searchWidget.searchInput.shouldShowAIButton = val;
+            this.searchWidget.searchInput.sparkleVisible = val;
         }
     }
     onDidChangeWorkbenchState() {
@@ -318,7 +318,7 @@ let SearchView = class SearchView extends ViewPane {
             this.viewletState['query.useExcludesAndIgnoreFiles'] : true;
         this.queryDetails = append(this.searchWidgetsContainerElement, $('.query-details'));
         this.toggleQueryDetailsButton = append(this.queryDetails, $('.more' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
-        this._register(setupCustomHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localizeWithPath(_moduleId, 1, "Toggle Search Details"))));
+        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localizeWithPath(_moduleId, 1, "Toggle Search Details"))));
         this._register(addDisposableListener(this.toggleQueryDetailsButton, EventType.CLICK, e => {
             EventHelper.stop(e);
             this.toggleQueryDetails(!this.accessibilityService.isScreenReaderOptimized());
@@ -838,9 +838,7 @@ let SearchView = class SearchView extends ViewPane {
             }),
             multipleSelectionSupport: true,
             selectionNavigation: true,
-            overrideStyles: {
-                listBackground: this.getBackgroundColor()
-            },
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles,
             paddingBottom: SearchDelegate.ITEM_HEIGHT
         }));
         this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
@@ -1522,20 +1520,20 @@ let SearchView = class SearchView extends ViewPane {
             const messageEl = this.clearMessage();
             append(messageEl, message);
             if (!completed) {
-                const searchAgainButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 34, "Search again")), () => this.triggerQueryChange({ preserveFocus: false })))));
+                const searchAgainButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 34, "Search again")), () => this.triggerQueryChange({ preserveFocus: false }), this.hoverService))));
                 append(messageEl, searchAgainButton.element);
             }
             else if (hasIncludes || hasExcludes) {
-                const searchAgainButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 35, "Search again in all files")), this.onSearchAgain.bind(this)))));
+                const searchAgainButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 35, "Search again in all files")), this.onSearchAgain.bind(this), this.hoverService))));
                 append(messageEl, searchAgainButton.element);
             }
             else {
-                const openSettingsButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 36, "Open Settings")), this.onOpenSettings.bind(this)))));
+                const openSettingsButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 36, "Open Settings")), this.onOpenSettings.bind(this), this.hoverService))));
                 append(messageEl, openSettingsButton.element);
             }
             if (completed) {
                 append(messageEl, $('span', undefined, ' - '));
-                const learnMoreButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 37, "Learn More")), this.onLearnMore.bind(this)))));
+                const learnMoreButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 37, "Learn More")), this.onLearnMore.bind(this), this.hoverService))));
                 append(messageEl, learnMoreButton.element);
             }
             if (this.contextService.getWorkbenchState() === 1 ) {
@@ -1661,17 +1659,17 @@ let SearchView = class SearchView extends ViewPane {
         if (fileCount > 0) {
             if (disregardExcludesAndIgnores) {
                 const excludesDisabledMessage = ' - ' + ( localizeWithPath(_moduleId, 41, "exclude settings and ignore files are disabled")) + ' ';
-                const enableExcludesButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 42, "enable")), this.onEnableExcludes.bind(this), ( localizeWithPath(_moduleId, 43, "Use Exclude Settings and Ignore Files"))))));
+                const enableExcludesButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 42, "enable")), this.onEnableExcludes.bind(this), this.hoverService, ( localizeWithPath(_moduleId, 43, "Use Exclude Settings and Ignore Files"))))));
                 append(messageEl, $('span', undefined, excludesDisabledMessage, '(', enableExcludesButton.element, ')'));
             }
             if (onlyOpenEditors) {
                 const searchingInOpenMessage = ' - ' + ( localizeWithPath(_moduleId, 44, "searching only in open files")) + ' ';
-                const disableOpenEditorsButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 45, "disable")), this.onDisableSearchInOpenEditors.bind(this), ( localizeWithPath(_moduleId, 46, "Search in entire workspace"))))));
+                const disableOpenEditorsButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 45, "disable")), this.onDisableSearchInOpenEditors.bind(this), this.hoverService, ( localizeWithPath(_moduleId, 46, "Search in entire workspace"))))));
                 append(messageEl, $('span', undefined, searchingInOpenMessage, '(', disableOpenEditorsButton.element, ')'));
             }
             append(messageEl, ' - ');
             const openInEditorTooltip = appendKeyBindingLabel(( localizeWithPath(_moduleId, 47, "Copy current search results to an editor")), this.keybindingService.lookupKeybinding("search.action.openInEditor" ));
-            const openInEditorButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 48, "Open in editor")), () => this.instantiationService.invokeFunction(createEditorFromSearchResult, this.searchResult, this.searchIncludePattern.getValue(), this.searchExcludePattern.getValue(), this.searchIncludePattern.onlySearchInOpenEditors()), openInEditorTooltip))));
+            const openInEditorButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 48, "Open in editor")), () => this.instantiationService.invokeFunction(createEditorFromSearchResult, this.searchResult, this.searchIncludePattern.getValue(), this.searchExcludePattern.getValue(), this.searchIncludePattern.onlySearchInOpenEditors()), this.hoverService, openInEditorTooltip))));
             append(messageEl, openInEditorButton.element);
             this.reLayout();
         }
@@ -1709,7 +1707,7 @@ let SearchView = class SearchView extends ViewPane {
         ))));
         const openFolderButton = this.messageDisposables.add(( (new SearchLinkButton(( localizeWithPath(_moduleId, 54, "Open Folder")), () => {
             this.commandService.executeCommand(isMacintosh && isNative ? OpenFileFolderAction.ID : OpenFolderAction.ID).catch(err => onUnexpectedError(err));
-        }))));
+        }, this.hoverService))));
         append(textEl, openFolderButton.element);
     }
     showEmptyStage(forceHideMessages = false) {
@@ -1971,15 +1969,16 @@ SearchView = SearchView_1 = ( (__decorate([
     ( (__param(23, IStorageService))),
     ( (__param(24, IOpenerService))),
     ( (__param(25, ITelemetryService))),
-    ( (__param(26, INotebookService))),
-    ( (__param(27, ILogService))),
-    ( (__param(28, IAccessibilitySignalService)))
+    ( (__param(26, IHoverService))),
+    ( (__param(27, INotebookService))),
+    ( (__param(28, ILogService))),
+    ( (__param(29, IAccessibilitySignalService)))
 ], SearchView)));
 class SearchLinkButton extends Disposable {
-    constructor(label, handler, tooltip) {
+    constructor(label, handler, hoverService, tooltip) {
         super();
         this.element = $('a.pointer', { tabindex: 0 }, label);
-        this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.element, tooltip));
+        this._register(hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.element, tooltip));
         this.addEventHandlers(handler);
     }
     addEventHandlers(handler) {

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

@@ -129,7 +129,7 @@ let SearchWidget = class SearchWidget extends Widget {
         ))));
         this._register(this._notebookFilters.onDidChange(() => {
             if (this.searchInput) {
-                this.searchInput.updateStyles();
+                this.searchInput.updateFilterStyles();
             }
         }));
         this._register(this.editorService.onDidEditorsChange((e) => {

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

@@ -58,8 +58,8 @@ import { UnusualLineTerminatorsDetector } from 'vscode/vscode/vs/editor/contrib/
 import { getInputBoxStyle, defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var SearchEditor_1;
 const _moduleId = "vs/workbench/contrib/searchEditor/browser/searchEditor";
@@ -70,7 +70,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
     static { this.ID = SearchEditorID; }
     static { this.SEARCH_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'searchEditorViewState'; }
     get searchResultEditor() { return this.editorControl; }
-    constructor(group, telemetryService, themeService, storageService, modelService, contextService, labelService, instantiationService, contextViewService, commandService, openerService, notificationService, progressService, textResourceService, editorGroupService, editorService, configurationService, fileService, logService) {
+    constructor(group, telemetryService, themeService, storageService, modelService, contextService, labelService, instantiationService, contextViewService, commandService, openerService, notificationService, progressService, textResourceService, editorGroupService, editorService, configurationService, fileService, logService, hoverService) {
         super(SearchEditor_1.ID, group, telemetryService, instantiationService, storageService, textResourceService, themeService, editorService, editorGroupService, fileService);
         this.modelService = modelService;
         this.contextService = contextService;
@@ -81,6 +81,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         this.notificationService = notificationService;
         this.configurationService = configurationService;
         this.logService = logService;
+        this.hoverService = hoverService;
         this.runSearchDelayer = ( (new Delayer(0)));
         this.pauseSearching = false;
         this.showingIncludesExcludes = false;
@@ -117,7 +118,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         this._register(this.queryEditorWidget.onDidToggleContext(() => this.triggerSearch({ resetCursor: false })));
         this.includesExcludesContainer = append(container, $('.includes-excludes'));
         this.toggleQueryDetailsButton = append(this.includesExcludesContainer, $('.expand' + ThemeIcon.asCSSSelector(searchDetailsIcon), { tabindex: 0, role: 'button' }));
-        this._register(setupCustomHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localizeWithPath(_moduleId, 0, "Toggle Search Details"))));
+        this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('element'), this.toggleQueryDetailsButton, ( localizeWithPath(_moduleId, 0, "Toggle Search Details"))));
         this._register(addDisposableListener(this.toggleQueryDetailsButton, EventType.CLICK, e => {
             EventHelper.stop(e);
             this.toggleIncludesExcludes();
@@ -706,7 +707,8 @@ SearchEditor = SearchEditor_1 = ( (__decorate([
     ( (__param(15, IEditorService))),
     ( (__param(16, IConfigurationService))),
     ( (__param(17, IFileService))),
-    ( (__param(18, ILogService)))
+    ( (__param(18, ILogService))),
+    ( (__param(19, IHoverService)))
 ], SearchEditor)));
 const searchEditorTextInputBorder = registerColor('searchEditor.textInputBorder', { dark: inputBorder, light: inputBorder, hcDark: inputBorder, hcLight: inputBorder }, ( localizeWithPath(_moduleId, 8, "Search editor text input box border.")));
 function findNextRange(matchRanges, currentPosition) {