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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "36.2.7",
+  "version": "37.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - search service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "36.2.7"
+    "@codingame/monaco-vscode-api": "37.1.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -96,7 +96,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         picker.buttons = [{
             location: QuickInputButtonLocation.Inline,
             iconClass: ThemeIcon.asClassName(Codicon.goToSearch),
-            tooltip: ( localize(13855, "Open in Search View"))
+            tooltip: ( localize(15880, "Open in Search View"))
         }];
         this.editorViewState.reset();
         disposables.add(picker.onDidTriggerButton(async () => {
@@ -193,7 +193,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         this.searchModel = this._instantiationService.createInstance(SearchModelImpl);
         this.searchModel.location = SearchModelLocation.QUICK_ACCESS;
         const viewer = viewlet?.getControl();
-        if (currentElem) {
+        if (currentElem && viewer && viewer.hasNode(currentElem)) {
             viewer.setFocus([currentElem], getSelectionKeyboardEvent());
             viewer.setSelection([currentElem], getSelectionKeyboardEvent());
             viewer.reveal(currentElem);
@@ -220,7 +220,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     type: "separator"
                 });
                 picks.push({
-                    label: ( localize(13856, "See More Files")),
+                    label: ( localize(15881, "See More Files")),
                     iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                     accept: async () => {
                         await this.moveToSearchViewlet(matches[limit]);
@@ -239,7 +239,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 description,
                 buttons: [{
                     iconClass: ThemeIcon.asClassName(searchOpenInFileIcon),
-                    tooltip: ( localize(13857, "Open File"))
+                    tooltip: ( localize(15882, "Open File"))
                 }],
                 trigger: async () => {
                     await this.handleAccept(iFileInstanceMatch, {});
@@ -251,7 +251,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                 const element = results[matchIndex];
                 if (matchIndex === MAX_RESULTS_PER_FILE) {
                     picks.push({
-                        label: ( localize(13858, "More")),
+                        label: ( localize(15883, "More")),
                         iconClass: ThemeIcon.asClassName(searchDetailsIcon),
                         accept: async () => {
                             await this.moveToSearchViewlet(element);
@@ -272,7 +272,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
                     },
                     buttons: [{
                         iconClass: ThemeIcon.asClassName(searchActivityBarIcon),
-                        tooltip: ( localize(13859, "Open in Search View"))
+                        tooltip: ( localize(15884, "Open in Search View"))
                     }],
                     ariaLabel: `Match at location ${element.range().startLineNumber}:${element.range().startColumn} - ${previewText}`,
                     accept: async (keyMods, event) => {
@@ -310,7 +310,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         if (contentPattern === "") {
             this.searchModel.searchResult.clear();
             return [{
-                label: ( localize(13860, "Enter a term to search for across your files."))
+                label: ( localize(15885, "Enter a term to search for across your files."))
             }];
         }
         const conditionalTokenCts = disposables.add(( new CancellationTokenSource()));
@@ -334,7 +334,7 @@ let TextSearchQuickAccess = class TextSearchQuickAccess extends PickerQuickAcces
         return {
             picks: syncResult,
             additionalPicks: allMatches.asyncResults.then(asyncResults => (asyncResults.length + syncResult.length === 0) ? [{
-                label: ( localize(13861, "No matching results"))
+                label: ( localize(15886, "No matching results"))
             }] : this._getPicksFromMatches(asyncResults, MAX_FILES_SHOWN - matches.length)).then(picks => {
                 if (picks.length > 0) {
                     this.searchModel.searchResult.toggleHighlights(true);

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

@@ -112,7 +112,7 @@ let ReplaceService = class ReplaceService {
         ReplaceService_1 = this;
     }
     static {
-        this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource("searchReplace.source", ( localize(13862, "Search and Replace")));
+        this.REPLACE_SAVE_SOURCE = SaveSourceRegistry.registerSource("searchReplace.source", ( localize(15887, "Search and Replace")));
     }
     constructor(
         textFileService,
@@ -166,7 +166,7 @@ let ReplaceService = class ReplaceService {
             modified: {
                 resource: toReplaceResource(fileMatch.resource)
             },
-            label: ( localize(13863, "{0} ↔ {1} (Replace Preview)", fileMatch.name(), fileMatch.name())),
+            label: ( localize(15888, "{0} ↔ {1} (Replace Preview)", fileMatch.name(), fileMatch.name())),
             description: this.labelService.getUriLabel(dirname(fileMatch.resource), {
                 relative: true
             }),

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

@@ -1,28 +1,145 @@
 
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions, ConfigurationScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { registerContributions } from './replaceContributions.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/common/searchHistoryService';
 import { searchConfigurationNode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/common/search';
+import { SearchSortOrder, DEFAULT_MAX_SEARCH_RESULTS, SEARCH_EXCLUDE_CONFIG } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
 
 registerContributions();
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     ...searchConfigurationNode,
     properties: {
+        [SEARCH_EXCLUDE_CONFIG]: {
+            type: "object",
+            markdownDescription: ( localize(
+                15889,
+                "Configure [glob patterns](https://code.visualstudio.com/docs/editor/codebasics#_advanced-search-options) for excluding files and folders in fulltext searches and file search in quick open. To exclude files from the recently opened list in quick open, patterns must be absolute (for example `**/node_modules/**`). Inherits all glob patterns from the `#files.exclude#` setting."
+            )),
+            default: {
+                "**/node_modules": true,
+                "**/bower_components": true,
+                "**/*.code-search": true
+            },
+            additionalProperties: {
+                anyOf: [{
+                    type: "boolean",
+                    description: ( localize(
+                        15890,
+                        "The glob pattern to match file paths against. Set to true or false to enable or disable the pattern."
+                    ))
+                }, {
+                    type: "object",
+                    properties: {
+                        when: {
+                            type: "string",
+                            pattern: "\\w*\\$\\(basename\\)\\w*",
+                            default: "$(basename).ext",
+                            markdownDescription: ( localize(
+                                15891,
+                                "Additional check on the siblings of a matching file. Use \\$(basename) as variable for the matching file name."
+                            ))
+                        }
+                    }
+                }]
+            },
+            scope: ConfigurationScope.RESOURCE
+        },
+        "search.useIgnoreFiles": {
+            type: "boolean",
+            markdownDescription: ( localize(
+                15892,
+                "Controls whether to use `.gitignore` and `.ignore` files when searching for files."
+            )),
+            default: true,
+            scope: ConfigurationScope.RESOURCE
+        },
+        "search.useGlobalIgnoreFiles": {
+            type: "boolean",
+            markdownDescription: ( localize(
+                15893,
+                "Controls whether to use your global gitignore file (for example, from `$HOME/.config/git/ignore`) when searching for files. Requires {0} to be enabled.",
+                "`#search.useIgnoreFiles#`"
+            )),
+            default: false,
+            scope: ConfigurationScope.RESOURCE
+        },
+        "search.useParentIgnoreFiles": {
+            type: "boolean",
+            markdownDescription: ( localize(
+                15894,
+                "Controls whether to use `.gitignore` and `.ignore` files in parent directories when searching for files. Requires {0} to be enabled.",
+                "`#search.useIgnoreFiles#`"
+            )),
+            default: false,
+            scope: ConfigurationScope.RESOURCE
+        },
+        "search.ripgrep.maxThreads": {
+            type: "number",
+            description: ( localize(
+                15895,
+                "Number of threads to use for searching. When set to 0, the engine automatically determines this value."
+            )),
+            default: 0
+        },
+        "search.followSymlinks": {
+            type: "boolean",
+            description: ( localize(15896, "Controls whether to follow symlinks while searching.")),
+            default: true
+        },
+        "search.smartCase": {
+            type: "boolean",
+            description: ( localize(
+                15897,
+                "Search case-insensitively if the pattern is all lowercase, otherwise, search case-sensitively."
+            )),
+            default: false
+        },
+        "search.maxResults": {
+            type: ["number", "null"],
+            default: DEFAULT_MAX_SEARCH_RESULTS,
+            markdownDescription: ( localize(
+                15898,
+                "Controls the maximum number of search results, this can be set to `null` (empty) to return unlimited results."
+            ))
+        },
+        "search.sortOrder": {
+            type: "string",
+            enum: [
+                SearchSortOrder.Default,
+                SearchSortOrder.FileNames,
+                SearchSortOrder.Type,
+                SearchSortOrder.Modified,
+                SearchSortOrder.CountDescending,
+                SearchSortOrder.CountAscending
+            ],
+            default: SearchSortOrder.Default,
+            enumDescriptions: [( localize(
+                15899,
+                "Results are sorted by folder and file names, in alphabetical order."
+            )), ( localize(
+                15900,
+                "Results are sorted by file names ignoring folder order, in alphabetical order."
+            )), ( localize(15901, "Results are sorted by file extensions, in alphabetical order.")), ( localize(
+                15902,
+                "Results are sorted by file last modified date, in descending order."
+            )), ( localize(15903, "Results are sorted by count per file, in descending order.")), ( localize(15904, "Results are sorted by count per file, in ascending order."))],
+            description: ( localize(15905, "Controls sorting order of search results."))
+        },
         "search.searchOnType": {
             type: "boolean",
             default: true,
-            description: ( localize(13864, "Search all files as you type."))
+            description: ( localize(15906, "Search all files as you type."))
         },
         "search.searchOnTypeDebouncePeriod": {
             type: "number",
             default: 300,
             markdownDescription: ( localize(
-                13865,
+                15907,
                 "When {0} is enabled, controls the timeout in milliseconds between a character being typed and the search starting. Has no effect when {0} is disabled.",
                 "`#search.searchOnType#`"
             ))