@codingame/monaco-vscode-api 33.0.8 → 34.0.0

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

@@ -71,7 +71,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
     }
     static {
         this.NO_RESULTS_PICK = {
-            label: ( localize(13009, "No matching results"))
+            label: ( localize(13197, "No matching results"))
         };
     }
     static {
@@ -310,7 +310,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
             if (picks.length > 0) {
                 picks.push({
                     type: "separator",
-                    label: ( localize(13010, "recently opened"))
+                    label: ( localize(13198, "recently opened"))
                 });
             }
             picks = historyEditorPicks;
@@ -321,7 +321,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
             if (historyEditorPicks.length !== 0) {
                 picks.push({
                     type: "separator",
-                    label: ( localize(13010, "recently opened"))
+                    label: ( localize(13198, "recently opened"))
                 });
                 picks.push(...historyEditorPicks);
             }
@@ -349,7 +349,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 }
                 return additionalPicks.length > 0 ? [{
                     type: "separator",
-                    label: this.configuration.includeSymbols ? ( localize(13011, "file and symbol results")) : ( localize(13012, "file results"))
+                    label: this.configuration.includeSymbols ? ( localize(13199, "file and symbol results")) : ( localize(13200, "file results"))
                 }, ...additionalPicks] : [];
             })(),
             mergeDelay: AnythingQuickAccessProvider_1.SYMBOL_PICKS_MERGE_DELAY
@@ -661,7 +661,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
                 description: helpEntry.prefix ?? provider.prefix,
                 commandCenterOrder: helpEntry.commandCenterOrder,
                 keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
-                ariaLabel: ( localize(13013, "{0}, {1}", label, helpEntry.description)),
+                ariaLabel: ( localize(13201, "{0}, {1}", label, helpEntry.description)),
                 accept: () => {
                     this.quickInputService.quickAccess.show(provider.prefix, {
                         preserveValue: true,
@@ -672,7 +672,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         })));
         if (this.quickChatService.enabled) {
             providers.push({
-                label: ( localize(13014, "Open Quick Chat")),
+                label: ( localize(13202, "Open Quick Chat")),
                 commandCenterOrder: 30,
                 keybinding: this.keybindingService.lookupKeybinding(ASK_QUICK_QUESTION_ACTION_ID),
                 accept: () => this.quickChatService.toggle()
@@ -812,12 +812,12 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
             const buttons = [];
             buttons.push({
                 iconClass: openSideBySideDirection === "right" ? ThemeIcon.asClassName(Codicon.splitHorizontal) : ThemeIcon.asClassName(Codicon.splitVertical),
-                tooltip: openSideBySideDirection === "right" ? ( localize(13015, "Open to the Side")) : ( localize(13016, "Open to the Bottom"))
+                tooltip: openSideBySideDirection === "right" ? ( localize(13203, "Open to the Side")) : ( localize(13204, "Open to the Bottom"))
             });
             if (isEditorHistoryEntry) {
                 buttons.push({
                     iconClass: isDirty ? ("dirty-anything " + ThemeIcon.asClassName(Codicon.circleFilled)) : ThemeIcon.asClassName(Codicon.close),
-                    tooltip: ( localize(13017, "Remove from Recently Opened")),
+                    tooltip: ( localize(13205, "Remove from Recently Opened")),
                     alwaysVisible: isDirty
                 });
             }
@@ -826,7 +826,7 @@ let AnythingQuickAccessProvider = class AnythingQuickAccessProvider extends Pick
         return {
             resource,
             label,
-            ariaLabel: isDirty ? ( localize(13018, "{0} unsaved changes", labelAndDescription)) : labelAndDescription,
+            ariaLabel: isDirty ? ( localize(13206, "{0} unsaved changes", labelAndDescription)) : labelAndDescription,
             description,
             iconPath: URI.isUri(icon) ? {
                 dark: icon

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

@@ -53,11 +53,17 @@ export declare class PatternInputWidget extends Widget {
 export declare class IncludePatternInputWidget extends PatternInputWidget {
     private _onChangeSearchInEditorsBoxEmitter;
     onChangeSearchInEditorsBox: CommonEvent<void>;
+    private _onChangeSearchInChangedFilesBoxEmitter;
+    onChangeSearchInChangedFilesBox: CommonEvent<void>;
     constructor(parent: HTMLElement, contextViewProvider: IContextViewProvider, options: IOptions, contextKeyService: IContextKeyService, configurationService: IConfigurationService, keybindingService: IKeybindingService);
     private useSearchInEditorsBox;
+    private useSearchInChangedFilesBox;
     dispose(): void;
     onlySearchInOpenEditors(): boolean;
     setOnlySearchInOpenEditors(value: boolean): void;
+    onlySearchInChangedFiles(): boolean;
+    setOnlySearchInChangedFiles(value: boolean): void;
+    setOnlySearchInChangedFilesEnabled(enabled: boolean): void;
     protected getSubcontrolsWidth(): number;
     protected renderSubcontrols(controlsDiv: HTMLDivElement): void;
 }

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

@@ -37,7 +37,7 @@ let PatternInputWidget = class PatternInputWidget extends Widget {
         this.onCancel = this._onCancel.event;
         options = {
             ...{
-                ariaLabel: ( localize(13019, "input"))
+                ariaLabel: ( localize(13207, "input"))
             },
             ...options
         };
@@ -159,10 +159,13 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
         );
         this._onChangeSearchInEditorsBoxEmitter = this._register(( new Emitter()));
         this.onChangeSearchInEditorsBox = this._onChangeSearchInEditorsBoxEmitter.event;
+        this._onChangeSearchInChangedFilesBoxEmitter = this._register(( new Emitter()));
+        this.onChangeSearchInChangedFilesBox = this._onChangeSearchInChangedFilesBoxEmitter.event;
     }
     dispose() {
         super.dispose();
         this.useSearchInEditorsBox.dispose();
+        this.useSearchInChangedFilesBox.dispose();
     }
     onlySearchInOpenEditors() {
         return this.useSearchInEditorsBox.checked;
@@ -171,22 +174,57 @@ let IncludePatternInputWidget = class IncludePatternInputWidget extends PatternI
         this.useSearchInEditorsBox.checked = value;
         this._onChangeSearchInEditorsBoxEmitter.fire();
     }
+    onlySearchInChangedFiles() {
+        return this.useSearchInChangedFilesBox.checked;
+    }
+    setOnlySearchInChangedFiles(value) {
+        this.useSearchInChangedFilesBox.checked = value;
+        this._onChangeSearchInChangedFilesBoxEmitter.fire();
+    }
+    setOnlySearchInChangedFilesEnabled(enabled) {
+        if (enabled) {
+            this.useSearchInChangedFilesBox.enable();
+        } else {
+            this.useSearchInChangedFilesBox.checked = false;
+            this.useSearchInChangedFilesBox.disable();
+        }
+    }
     getSubcontrolsWidth() {
-        return super.getSubcontrolsWidth() + this.useSearchInEditorsBox.width();
+        return super.getSubcontrolsWidth() + this.useSearchInEditorsBox.width() + this.useSearchInChangedFilesBox.width();
     }
     renderSubcontrols(controlsDiv) {
+        this.useSearchInChangedFilesBox = this._register(( new Toggle({
+            icon: Codicon.editCode,
+            title: ( localize(13208, "Search only in Changed Files (Source Control)")),
+            isChecked: false,
+            ...defaultToggleStyles
+        })));
+        this.useSearchInChangedFilesBox.disable();
+        this._register(this.useSearchInChangedFilesBox.onChange(viaKeyboard => {
+            if (this.useSearchInChangedFilesBox.checked) {
+                this.useSearchInEditorsBox.checked = false;
+            }
+            this._onChangeSearchInChangedFilesBoxEmitter.fire();
+            if (!viaKeyboard) {
+                this.inputBox.focus();
+            }
+        }));
         this.useSearchInEditorsBox = this._register(( new Toggle({
             icon: Codicon.book,
-            title: ( localize(13020, "Search only in Open Editors")),
+            title: ( localize(13209, "Search only in Open Editors")),
             isChecked: false,
             ...defaultToggleStyles
         })));
         this._register(this.useSearchInEditorsBox.onChange(viaKeyboard => {
+            if (this.useSearchInEditorsBox.checked) {
+                this.useSearchInChangedFilesBox.checked = false;
+            }
             this._onChangeSearchInEditorsBoxEmitter.fire();
             if (!viaKeyboard) {
                 this.inputBox.focus();
             }
         }));
+        controlsDiv.appendChild(this.useSearchInChangedFilesBox.domNode);
         controlsDiv.appendChild(this.useSearchInEditorsBox.domNode);
         super.renderSubcontrols(controlsDiv);
     }
@@ -230,7 +268,7 @@ let ExcludePatternInputWidget = class ExcludePatternInputWidget extends PatternI
         this.useExcludesAndIgnoreFilesBox = this._register(( new Toggle({
             icon: Codicon.exclude,
             actionClassName: "useExcludesAndIgnoreFiles",
-            title: ( localize(13021, "Use Exclude Settings and Ignore Files")),
+            title: ( localize(13210, "Use Exclude Settings and Ignore Files")),
             isChecked: true,
             ...defaultToggleStyles
         })));

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

@@ -13,7 +13,7 @@ import { IConfigurationResolverService } from '../../../services/configurationRe
 import { IHistoryService } from '../../../services/history/common/history.service.js';
 import { Schemas } from '../../../../base/common/network.js';
 
-const category = ( localize2(13149, "Search"));
+const category = ( localize2(13338, "Search"));
 function isSearchViewFocused(viewsService) {
     const searchView = getSearchView(viewsService);
     return !!(searchView && isAncestorOfActiveElement(searchView.getContainer()));

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

@@ -18,7 +18,7 @@ registerAction2(class ClearSearchHistoryCommandAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.ClearSearchHistoryCommandId,
-            title: ( localize2(13189, "Clear Search History")),
+            title: ( localize2(13378, "Clear Search History")),
             category,
             f1: true
         });
@@ -31,7 +31,7 @@ registerAction2(class CancelSearchAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.CancelSearchActionId,
-            title: ( localize2(13190, "Cancel Search")),
+            title: ( localize2(13379, "Cancel Search")),
             icon: searchStopIcon,
             category,
             f1: true,
@@ -57,7 +57,7 @@ registerAction2(class RefreshAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.RefreshSearchResultsActionId,
-            title: ( localize2(13191, "Refresh")),
+            title: ( localize2(13380, "Refresh")),
             icon: searchRefreshIcon,
             precondition: SearchContext.ViewHasSearchPatternKey,
             category,
@@ -78,7 +78,7 @@ registerAction2(class CollapseDeepestExpandedLevelAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.CollapseSearchResultsActionId,
-            title: ( localize2(13192, "Collapse All")),
+            title: ( localize2(13381, "Collapse All")),
             category,
             icon: searchCollapseAllIcon,
             f1: true,
@@ -102,7 +102,7 @@ registerAction2(class ExpandAllAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.ExpandSearchResultsActionId,
-            title: ( localize2(13193, "Expand All")),
+            title: ( localize2(13382, "Expand All")),
             category,
             icon: searchExpandAllIcon,
             f1: true,
@@ -123,7 +123,7 @@ registerAction2(class ClearSearchResultsAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.ClearSearchResultsActionId,
-            title: ( localize2(13194, "Clear Search Results")),
+            title: ( localize2(13383, "Clear Search Results")),
             category,
             icon: searchClearIcon,
             f1: true,
@@ -149,7 +149,7 @@ registerAction2(class ViewAsTreeAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.ViewAsTreeActionId,
-            title: ( localize2(13195, "View as Tree")),
+            title: ( localize2(13384, "View as Tree")),
             category,
             icon: searchShowAsList,
             f1: true,
@@ -173,7 +173,7 @@ registerAction2(class ViewAsListAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.ViewAsListActionId,
-            title: ( localize2(13196, "View as List")),
+            title: ( localize2(13385, "View as List")),
             category,
             icon: searchShowAsTree,
             f1: true,
@@ -200,7 +200,7 @@ registerAction2(class SearchWithAIAction extends Action2 {
     constructor() {
         super({
             id: SearchCommandIds.SearchWithAIActionId,
-            title: ( localize2(13197, "Search with AI")),
+            title: ( localize2(13386, "Search with AI")),
             category,
             f1: true,
             precondition: SearchContext.hasAIResultProvider,

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

@@ -55,7 +55,7 @@ let SearchViewResultChatContextPick = class SearchViewResultChatContextPick {
         this._viewsService = _viewsService;
         this._labelService = _labelService;
         this.type = "valuePick";
-        this.label = ( localize(13198, "Search Results"));
+        this.label = ( localize(13387, "Search Results"));
         this.icon = Codicon.search;
         this.ordinal = 500;
     }
@@ -80,7 +80,7 @@ let SymbolsContextPickerPick = class SymbolsContextPickerPick {
     constructor(_instantiationService) {
         this._instantiationService = _instantiationService;
         this.type = "pickerPick";
-        this.label = ( localize(13199, "Symbols..."));
+        this.label = ( localize(13388, "Symbols..."));
         this.icon = Codicon.symbolField;
         this.ordinal = -200;
     }
@@ -92,7 +92,7 @@ let SymbolsContextPickerPick = class SymbolsContextPickerPick {
     }
     asPicker() {
         return {
-            placeholder: ( localize(13200, "Select a symbol")),
+            placeholder: ( localize(13389, "Select a symbol")),
             picks: picksWithPromiseFn((query, token) => {
                 this._provider ??= this._instantiationService.createInstance(SymbolsQuickAccessProvider);
                 return this._provider.getSymbolPicks(query, undefined, token).then(symbolItems => {
@@ -147,13 +147,13 @@ let FilesAndFoldersPickerPick = class FilesAndFoldersPickerPick {
         this._historyService = _historyService;
         this._instantiationService = _instantiationService;
         this.type = "pickerPick";
-        this.label = ( localize(13201, "Files & Folders..."));
+        this.label = ( localize(13390, "Files & Folders..."));
         this.icon = Codicon.folder;
         this.ordinal = 600;
     }
     asPicker() {
         return {
-            placeholder: ( localize(13202, "Search file or folder by name")),
+            placeholder: ( localize(13391, "Search file or folder by name")),
             picks: picksWithPromiseFn(async (value, token) => {
                 const workspaces = ( this._workspaceService.getWorkspace().folders.map(folder => folder.uri));
                 const defaultItems = [];

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

@@ -22,7 +22,7 @@ class SearchFindInput extends ContextScopedFindInput {
         this._filterChecked = false;
         this._onDidChangeAIToggle = this._register(( new Emitter()));
         this.onDidChangeAIToggle = this._onDidChangeAIToggle.event;
-        this._findFilter = this._register(( new NotebookFindInputFilterButton(filters, contextMenuService, instantiationService, options, ( localize(13203, "Notebook Find Filters")))));
+        this._findFilter = this._register(( new NotebookFindInputFilterButton(filters, contextMenuService, instantiationService, options, ( localize(13392, "Notebook Find Filters")))));
         this._updatePadding();
         this.controls.appendChild(this._findFilter.container);
         this._findFilter.container.classList.add("monaco-custom-toggle");

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

@@ -3,28 +3,28 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const searchDetailsIcon = registerIcon("search-details", Codicon.ellipsis, ( localize(13204, "Icon to make search details visible.")));
-const searchActivityBarIcon = registerIcon("search-see-more", Codicon.goToSearch, ( localize(13205, "Icon to view more context in the search view.")));
-const searchShowContextIcon = registerIcon("search-show-context", Codicon.listSelection, ( localize(13206, "Icon for toggle the context in the search editor.")));
-const searchHideReplaceIcon = registerIcon("search-hide-replace", Codicon.chevronRight, ( localize(13207, "Icon to collapse the replace section in the search view.")));
-const searchShowReplaceIcon = registerIcon("search-show-replace", Codicon.chevronDown, ( localize(13208, "Icon to expand the replace section in the search view.")));
-const searchReplaceAllIcon = registerIcon("search-replace-all", Codicon.replaceAll, ( localize(13209, "Icon for replace all in the search view.")));
-const searchReplaceIcon = registerIcon("search-replace", Codicon.replace, ( localize(13210, "Icon for replace in the search view.")));
-const searchRemoveIcon = registerIcon("search-remove", Codicon.close, ( localize(13211, "Icon to remove a search result.")));
-const searchRefreshIcon = registerIcon("search-refresh", Codicon.refresh, ( localize(13212, "Icon for refresh in the search view.")));
-const searchCollapseAllIcon = registerIcon("search-collapse-results", Codicon.collapseAll, ( localize(13213, "Icon for collapse results in the search view.")));
-const searchExpandAllIcon = registerIcon("search-expand-results", Codicon.expandAll, ( localize(13214, "Icon for expand results in the search view.")));
-const searchShowAsTree = registerIcon("search-tree", Codicon.listTree, ( localize(13215, "Icon for viewing results as a tree in the search view.")));
-const searchShowAsList = registerIcon("search-list", Codicon.listFlat, ( localize(13216, "Icon for viewing results as a list in the search view.")));
-const searchClearIcon = registerIcon("search-clear-results", Codicon.clearAll, ( localize(13217, "Icon for clear results in the search view.")));
-const searchStopIcon = registerIcon("search-stop", Codicon.searchStop, ( localize(13218, "Icon for stop in the search view.")));
-const searchViewIcon = registerIcon("search-view-icon", Codicon.searchLarge, ( localize(13219, "View icon of the search view.")));
-const searchNewEditorIcon = registerIcon("search-new-editor", Codicon.newFile, ( localize(13220, "Icon for the action to open a new search editor.")));
+const searchDetailsIcon = registerIcon("search-details", Codicon.ellipsis, ( localize(13393, "Icon to make search details visible.")));
+const searchActivityBarIcon = registerIcon("search-see-more", Codicon.goToSearch, ( localize(13394, "Icon to view more context in the search view.")));
+const searchShowContextIcon = registerIcon("search-show-context", Codicon.listSelection, ( localize(13395, "Icon for toggle the context in the search editor.")));
+const searchHideReplaceIcon = registerIcon("search-hide-replace", Codicon.chevronRight, ( localize(13396, "Icon to collapse the replace section in the search view.")));
+const searchShowReplaceIcon = registerIcon("search-show-replace", Codicon.chevronDown, ( localize(13397, "Icon to expand the replace section in the search view.")));
+const searchReplaceAllIcon = registerIcon("search-replace-all", Codicon.replaceAll, ( localize(13398, "Icon for replace all in the search view.")));
+const searchReplaceIcon = registerIcon("search-replace", Codicon.replace, ( localize(13399, "Icon for replace in the search view.")));
+const searchRemoveIcon = registerIcon("search-remove", Codicon.close, ( localize(13400, "Icon to remove a search result.")));
+const searchRefreshIcon = registerIcon("search-refresh", Codicon.refresh, ( localize(13401, "Icon for refresh in the search view.")));
+const searchCollapseAllIcon = registerIcon("search-collapse-results", Codicon.collapseAll, ( localize(13402, "Icon for collapse results in the search view.")));
+const searchExpandAllIcon = registerIcon("search-expand-results", Codicon.expandAll, ( localize(13403, "Icon for expand results in the search view.")));
+const searchShowAsTree = registerIcon("search-tree", Codicon.listTree, ( localize(13404, "Icon for viewing results as a tree in the search view.")));
+const searchShowAsList = registerIcon("search-list", Codicon.listFlat, ( localize(13405, "Icon for viewing results as a list in the search view.")));
+const searchClearIcon = registerIcon("search-clear-results", Codicon.clearAll, ( localize(13406, "Icon for clear results in the search view.")));
+const searchStopIcon = registerIcon("search-stop", Codicon.searchStop, ( localize(13407, "Icon for stop in the search view.")));
+const searchViewIcon = registerIcon("search-view-icon", Codicon.searchLarge, ( localize(13408, "View icon of the search view.")));
+const searchNewEditorIcon = registerIcon("search-new-editor", Codicon.newFile, ( localize(13409, "Icon for the action to open a new search editor.")));
 const searchOpenInFileIcon = registerIcon("search-open-in-file", Codicon.goToFile, ( localize(
-    13221,
+    13410,
     "Icon for the action to go to the file of the current search result."
 )));
-registerIcon("search-sparkle-filled", Codicon.sparkleFilled, ( localize(13222, "Icon to show AI results in search.")));
-registerIcon("search-sparkle-empty", Codicon.sparkle, ( localize(13223, "Icon to hide AI results in search.")));
+registerIcon("search-sparkle-filled", Codicon.sparkleFilled, ( localize(13411, "Icon to show AI results in search.")));
+registerIcon("search-sparkle-empty", Codicon.sparkle, ( localize(13412, "Icon to hide AI results in search.")));
 
 export { searchActivityBarIcon, searchClearIcon, searchCollapseAllIcon, searchDetailsIcon, searchExpandAllIcon, searchHideReplaceIcon, searchNewEditorIcon, searchOpenInFileIcon, searchRefreshIcon, searchRemoveIcon, searchReplaceAllIcon, searchReplaceIcon, searchShowAsList, searchShowAsTree, searchShowContextIcon, searchShowReplaceIcon, searchStopIcon, searchViewIcon };

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

@@ -42,9 +42,9 @@ const renderSearchMessage = (
                         openerService.open(parsed);
                     } else {
                         if (parsed.scheme === Schemas.command && !message.trusted) {
-                            notificationService.error(( localize(13224, "Unable to open command link from untrusted source: {0}", href)));
+                            notificationService.error(( localize(13413, "Unable to open command link from untrusted source: {0}", href)));
                         } else {
-                            notificationService.error(( localize(13225, "Unable to open unknown link: {0}", href)));
+                            notificationService.error(( localize(13414, "Unable to open unknown link: {0}", href)));
                         }
                     }
                 }

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

@@ -13,6 +13,7 @@ import { ICompressedTreeNode } from "../../../../base/browser/ui/tree/compressed
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { MenuWorkbenchToolBar } from "../../../../platform/actions/browser/toolbar.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
+import type { IManagedHover } from "../../../../base/browser/ui/hover/hover.js";
 import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
 import { ISearchTreeMatch, RenderableMatch, ITextSearchHeading, ISearchTreeFolderMatch, ISearchTreeFileMatch } from "./searchTreeModel/searchTreeCommon.js";
 interface IFolderMatchTemplate {
@@ -46,6 +47,8 @@ interface IMatchTemplate {
     replace: HTMLElement;
     after: HTMLElement;
     actions: MenuWorkbenchToolBar;
+    parentHover: IManagedHover;
+    lineNumberHover: IManagedHover;
     disposables: DisposableStore;
     contextKeyService: IContextKeyService;
 }

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

@@ -93,7 +93,7 @@ let TextSearchResultRenderer = class TextSearchResultRenderer extends Disposable
     }
     async renderElement(node, index, templateData) {
         if (isPlainTextSearchHeading(node.element)) {
-            templateData.label.setLabel(( localize(13230, "Text Results")));
+            templateData.label.setLabel(( localize(13419, "Text Results")));
             SearchContext.AIResultsTitle.bindTo(templateData.contextKeyService).set(false);
             SearchContext.MatchFocusKey.bindTo(templateData.contextKeyService).set(false);
             SearchContext.FileFocusKey.bindTo(templateData.contextKeyService).set(false);
@@ -102,7 +102,7 @@ let TextSearchResultRenderer = class TextSearchResultRenderer extends Disposable
             try {
                 await node.element.parent().searchModel.getAITextResultProviderName();
             } catch {}
-            const localizedLabel = ( localize(13231, "AI-assisted results"));
+            const localizedLabel = ( localize(13420, "AI-assisted results"));
             templateData.label.setLabel(`$(${Codicon.searchSparkle.id}) ${localizedLabel}`);
             SearchContext.AIResultsTitle.bindTo(templateData.contextKeyService).set(true);
             SearchContext.MatchFocusKey.bindTo(templateData.contextKeyService).set(false);
@@ -154,7 +154,7 @@ let FolderMatchRenderer = class FolderMatchRenderer extends Disposable {
                 separator: this.labelService.getSeparator(folder.resource.scheme)
             });
         } else {
-            templateData.label.setLabel(( localize(13232, "Other files")));
+            templateData.label.setLabel(( localize(13421, "Other files")));
         }
         this.renderFolderDetails(folder, templateData);
     }
@@ -217,7 +217,7 @@ let FolderMatchRenderer = class FolderMatchRenderer extends Disposable {
                 });
             }
         } else {
-            templateData.label.setLabel(( localize(13232, "Other files")));
+            templateData.label.setLabel(( localize(13421, "Other files")));
         }
         SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!folderMatch.hasOnlyReadOnlyMatches());
         templateData.elementDisposables.add(folderMatch.onChange(() => {
@@ -237,7 +237,7 @@ let FolderMatchRenderer = class FolderMatchRenderer extends Disposable {
     renderFolderDetails(folder, templateData) {
         const count = folder.recursiveMatchCount();
         templateData.badge.setCount(count);
-        templateData.badge.setTitleFormat(count > 1 ? ( localize(13233, "{0} files found", count)) : ( localize(13234, "{0} file found", count)));
+        templateData.badge.setTitleFormat(count > 1 ? ( localize(13422, "{0} files found", count)) : ( localize(13423, "{0} file found", count)));
         templateData.actions.context = {
             viewer: this.searchView.getControl(),
             element: folder
@@ -324,7 +324,7 @@ let FileMatchRenderer = class FileMatchRenderer extends Disposable {
         });
         const count = fileMatch.count();
         templateData.badge.setCount(count);
-        templateData.badge.setTitleFormat(count > 1 ? ( localize(13235, "{0} matches found", count)) : ( localize(13236, "{0} match found", count)));
+        templateData.badge.setTitleFormat(count > 1 ? ( localize(13424, "{0} matches found", count)) : ( localize(13425, "{0} match found", count)));
         templateData.actions.context = {
             viewer: this.searchView.getControl(),
             element: fileMatch
@@ -398,6 +398,12 @@ let MatchRenderer = class MatchRenderer extends Disposable {
                 }
             })
         );
+        const parentHover = disposables.add(
+            this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), parent, "")
+        );
+        const lineNumberHover = disposables.add(
+            this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), lineNumber, "")
+        );
         return {
             parent,
             before,
@@ -406,6 +412,8 @@ let MatchRenderer = class MatchRenderer extends Disposable {
             after,
             lineNumber,
             actions,
+            parentHover,
+            lineNumberHover,
             disposables,
             contextKeyService: contextKeyServiceMain
         };
@@ -420,9 +428,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(
-            this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), templateData.parent, title)
-        );
+        templateData.parentHover.update(title);
         SearchContext.IsEditableItemKey.bindTo(templateData.contextKeyService).set(!match.isReadonly);
         const numLines = match.range().endLineNumber - match.range().startLineNumber;
         const extraLinesStr = numLines > 0 ? `+${numLines}` : "";
@@ -430,11 +436,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(this.hoverService.setupManagedHover(
-            getDefaultHoverDelegate("mouse"),
-            templateData.lineNumber,
-            this.getMatchTitle(match, showLineNumbers)
-        ));
+        templateData.lineNumberHover.update(this.getMatchTitle(match, showLineNumbers));
         templateData.actions.context = {
             viewer: this.searchView.getControl(),
             element: match
@@ -446,8 +448,8 @@ let MatchRenderer = class MatchRenderer extends Disposable {
     getMatchTitle(match, showLineNumbers) {
         const startLine = match.range().startLineNumber;
         const numLines = match.range().endLineNumber - match.range().startLineNumber;
-        const lineNumStr = showLineNumbers ? ( localize(13237, "From line {0}", startLine, numLines)) + " " : "";
-        const numLinesStr = numLines > 0 ? "+ " + ( localize(13238, "{0} more lines", numLines)) : "";
+        const lineNumStr = showLineNumbers ? ( localize(13426, "From line {0}", startLine, numLines)) + " " : "";
+        const numLinesStr = numLines > 0 ? "+ " + ( localize(13427, "{0} more lines", numLines)) : "";
         return lineNumStr + numLinesStr;
     }
 };
@@ -458,24 +460,24 @@ let SearchAccessibilityProvider = class SearchAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return localize(13239, "Search");
+        return localize(13428, "Search");
     }
     getAriaLabel(element) {
         if (isSearchTreeFolderMatch(element)) {
             const count = element.allDownstreamFileMatches().reduce((total, current) => total + current.count(), 0);
             return element.resource ? ( localize(
-                13240,
+                13429,
                 "{0} matches in folder root {1}, Search result",
                 count,
                 element.name()
-            )) : ( localize(13241, "{0} matches outside of the workspace, Search result", count));
+            )) : ( localize(13430, "{0} matches outside of the workspace, Search result", count));
         }
         if (isSearchTreeFileMatch(element)) {
             const path = this.labelService.getUriLabel(element.resource, {
                 relative: true
             }) || element.resource.fsPath;
             return localize(
-                13242,
+                13431,
                 "{0} matches in file {1} of folder {2}, Search result",
                 element.count(),
                 element.name(),
@@ -491,7 +493,7 @@ let SearchAccessibilityProvider = class SearchAccessibilityProvider {
             const matchText = match.text().substr(0, range.endColumn + 150);
             if (replace) {
                 return localize(
-                    13243,
+                    13432,
                     "'{0}' at column {1} replace {2} with {3}",
                     matchText,
                     range.startColumn,
@@ -500,7 +502,7 @@ let SearchAccessibilityProvider = class SearchAccessibilityProvider {
                 );
             }
             return localize(
-                13244,
+                13433,
                 "'{0}' at column {1} found {2}",
                 matchText,
                 range.startColumn,

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

@@ -30,6 +30,7 @@ import { IPreferencesService } from "../../../services/preferences/common/prefer
 import { ISearchComplete } from "../../../services/search/common/search.js";
 import { ITextFileService } from "../../../services/textfile/common/textfiles.service.js";
 import { INotebookService } from "../../notebook/common/notebookService.service.js";
+import { ISCMService } from "../../scm/common/scm.service.js";
 import { ILogService } from "../../../../platform/log/common/log.service.js";
 import { IAccessibilitySignalService } from "../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js";
 import { IHoverService } from "../../../../platform/hover/browser/hover.service.js";
@@ -61,6 +62,7 @@ export declare class SearchView extends ViewPane {
     private readonly logService;
     private readonly accessibilitySignalService;
     private readonly telemetryService;
+    private readonly scmService;
     private static readonly ACTIONS_RIGHT_CLASS_NAME;
     private isDisposed;
     private container;
@@ -122,7 +124,7 @@ export declare class SearchView extends ViewPane {
     private _cachedResults;
     private _cachedKeywords;
     _pendingSemanticSearchPromise: Promise<ISearchComplete> | undefined;
-    constructor(options: IViewPaneOptions, fileService: IFileService, editorService: IEditorService, codeEditorService: ICodeEditorService, progressService: IProgressService, notificationService: INotificationService, dialogService: IDialogService, commandService: ICommandService, contextViewService: IContextViewService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, configurationService: IConfigurationService, contextService: IWorkspaceContextService, searchViewModelWorkbenchService: ISearchViewModelWorkbenchService, contextKeyService: IContextKeyService, replaceService: IReplaceService, textFileService: ITextFileService, preferencesService: IPreferencesService, themeService: IThemeService, searchHistoryService: ISearchHistoryService, contextMenuService: IContextMenuService, accessibilityService: IAccessibilityService, keybindingService: IKeybindingService, storageService: IStorageService, openerService: IOpenerService, hoverService: IHoverService, notebookService: INotebookService, logService: ILogService, accessibilitySignalService: IAccessibilitySignalService, telemetryService: ITelemetryService);
+    constructor(options: IViewPaneOptions, fileService: IFileService, editorService: IEditorService, codeEditorService: ICodeEditorService, progressService: IProgressService, notificationService: INotificationService, dialogService: IDialogService, commandService: ICommandService, contextViewService: IContextViewService, instantiationService: IInstantiationService, viewDescriptorService: IViewDescriptorService, configurationService: IConfigurationService, contextService: IWorkspaceContextService, searchViewModelWorkbenchService: ISearchViewModelWorkbenchService, contextKeyService: IContextKeyService, replaceService: IReplaceService, textFileService: ITextFileService, preferencesService: IPreferencesService, themeService: IThemeService, searchHistoryService: ISearchHistoryService, contextMenuService: IContextMenuService, accessibilityService: IAccessibilityService, keybindingService: IKeybindingService, storageService: IStorageService, openerService: IOpenerService, hoverService: IHoverService, notebookService: INotebookService, logService: ILogService, accessibilitySignalService: IAccessibilitySignalService, telemetryService: ITelemetryService, scmService: ISCMService);
     get cachedResults(): ISearchComplete | undefined;
     queueRefreshTree(): Promise<void>;
     get isTreeLayoutViewVisible(): boolean;