@codingame/monaco-vscode-search-service-override 36.2.7 → 37.0.0

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

@@ -1,7 +1,7 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $, append, addDisposableListener, EventType, EventHelper, clearNode, getTotalHeight } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $, append, addDisposableListener, EventType, EventHelper, clearNode, getWindow, getTotalHeight } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
 import { alert } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { Delayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
@@ -70,6 +70,7 @@ var SearchEditor_1;
 registerCss(searchEditor);
 const RESULT_LINE_REGEX = /^(\s+)(\d+)(: |  )(\s*)(.*)$/;
 const FILE_LINE_REGEX = /^(\S.*):$/;
+const DEFAULT_QUERY_EDITOR_LAYOUT_OFFSET = 28;
 let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
     static {
         SearchEditor_1 = this;
@@ -186,7 +187,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             resetCursor: false
         })));
         this.includesExcludesContainer = append(container, $(".includes-excludes"));
-        const toggleQueryDetailsLabel = ( localize(14178, "Toggle Search Details"));
+        const toggleQueryDetailsLabel = ( localize(15937, "Toggle Search Details"));
         this.toggleQueryDetailsButton = append(
             this.includesExcludesContainer,
             $(".expand" + ThemeIcon.asCSSSelector(searchDetailsIcon), {
@@ -229,11 +230,11 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             })
         );
         const folderIncludesList = append(this.includesExcludesContainer, $(".file-types.includes"));
-        const filesToIncludeTitle = ( localize(14179, "files to include"));
+        const filesToIncludeTitle = ( localize(15938, "files to include"));
         append(folderIncludesList, $("h4", undefined, filesToIncludeTitle));
         this.inputPatternIncludes = this._register(
             scopedInstantiationService.createInstance(IncludePatternInputWidget, folderIncludesList, this.contextViewService, {
-                ariaLabel: ( localize(14180, "Search Include Patterns")),
+                ariaLabel: ( localize(15939, "Search Include Patterns")),
                 inputBoxStyles: searchEditorInputboxStyles
             })
         );
@@ -245,11 +246,11 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             this.inputPatternIncludes.onChangeSearchInEditorsBox(() => this.triggerSearch())
         );
         const excludesList = append(this.includesExcludesContainer, $(".file-types.excludes"));
-        const excludesTitle = ( localize(14181, "files to exclude"));
+        const excludesTitle = ( localize(15940, "files to exclude"));
         append(excludesList, $("h4", undefined, excludesTitle));
         this.inputPatternExcludes = this._register(
             scopedInstantiationService.createInstance(ExcludePatternInputWidget, excludesList, this.contextViewService, {
-                ariaLabel: ( localize(14182, "Search Exclude Patterns")),
+                ariaLabel: ( localize(15941, "Search Exclude Patterns")),
                 inputBoxStyles: searchEditorInputboxStyles
             })
         );
@@ -278,7 +279,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         clearNode(this.messageBox);
         this.messageDisposables.clear();
         if (show) {
-            const runAgainLink = append(this.messageBox, $("a.pointer.prominent.message", {}, ( localize(14183, "Run Search"))));
+            const runAgainLink = append(this.messageBox, $("a.pointer.prominent.message", {}, ( localize(15942, "Run Search"))));
             this.messageDisposables.add(addDisposableListener(runAgainLink, EventType.CLICK, async () => {
                 await this.triggerSearch();
                 this.searchResultEditor.focus();
@@ -497,7 +498,7 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
             }
         }
         alert(( localize(
-            14184,
+            15943,
             "Matched {0} at {1} in file {2}",
             matchText,
             matchLineText,
@@ -716,13 +717,17 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
     }
     reLayout() {
         if (this.dimension) {
-            this.queryEditorWidget.setWidth(this.dimension.width - 28 );
+            const configuredOffset = Number.parseFloat(
+                getWindow(this.queryEditorContainer).getComputedStyle(this.queryEditorContainer).getPropertyValue("--search-editor-query-layout-offset")
+            );
+            const queryEditorWidth = this.dimension.width - (Number.isFinite(configuredOffset) ? configuredOffset : DEFAULT_QUERY_EDITOR_LAYOUT_OFFSET);
+            this.queryEditorWidget.setWidth(queryEditorWidth);
             this.searchResultEditor.layout({
                 height: this.dimension.height - getTotalHeight(this.queryEditorContainer),
                 width: this.dimension.width
             });
-            this.inputPatternExcludes.setWidth(this.dimension.width - 28 );
-            this.inputPatternIncludes.setWidth(this.dimension.width - 28 );
+            this.inputPatternExcludes.setWidth(queryEditorWidth);
+            this.inputPatternIncludes.setWidth(queryEditorWidth);
         }
     }
     getInput() {
@@ -841,11 +846,11 @@ let SearchEditor = class SearchEditor extends AbstractTextCodeEditor {
         }
     }
     getAriaLabel() {
-        return this.getInput()?.getName() ?? ( localize(14185, "Search"));
+        return this.getInput()?.getName() ?? ( localize(15944, "Search"));
     }
 };
 SearchEditor = SearchEditor_1 = ( __decorate([( __param(1, ITelemetryService)), ( __param(2, IThemeService)), ( __param(3, IStorageService)), ( __param(4, IModelService)), ( __param(5, IWorkspaceContextService)), ( __param(6, ILabelService)), ( __param(7, IInstantiationService)), ( __param(8, IContextViewService)), ( __param(9, ICommandService)), ( __param(10, IOpenerService)), ( __param(11, INotificationService)), ( __param(12, IEditorProgressService)), ( __param(13, ITextResourceConfigurationService)), ( __param(14, IEditorGroupsService)), ( __param(15, IEditorService)), ( __param(16, IConfigurationService)), ( __param(17, IFileService)), ( __param(18, ILogService)), ( __param(19, IHoverService))], SearchEditor));
-const searchEditorTextInputBorder = registerColor("searchEditor.textInputBorder", inputBorder, ( localize(14186, "Search editor text input box border.")));
+const searchEditorTextInputBorder = registerColor("searchEditor.textInputBorder", inputBorder, ( localize(15945, "Search editor text input box border.")));
 function findNextRange(matchRanges, currentPosition) {
     for (const matchRange of matchRanges) {
         if (Position.isBefore(currentPosition, matchRange.getStartPosition())) {

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

@@ -93,7 +93,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             return {
                 results: [],
                 messages: [{
-                    text: ( localize(17913, "Unable to search with Web Worker text searcher")),
+                    text: ( localize(19682, "Unable to search with Web Worker text searcher")),
                     type: TextSearchCompleteMessageType.Warning
                 }]
             };
@@ -138,7 +138,7 @@ let LocalFileSearchWorkerClient = class LocalFileSearchWorkerClient extends Disp
             return {
                 results: [],
                 messages: [{
-                    text: ( localize(17914, "Unable to search with Web Worker file searcher")),
+                    text: ( localize(19683, "Unable to search with Web Worker file searcher")),
                     type: TextSearchCompleteMessageType.Warning
                 }]
             };