@codingame/monaco-vscode-api 25.1.1 → 26.0.0

package/vscode/src/vs/workbench/services/search/common/search.js

@@ -9,22 +9,22 @@ import { isCancellationError } from '../../../../base/common/errors.js';
 export { TextSearchCompleteMessageType } from './searchExtTypes.js';
 import { isThenable } from '../../../../base/common/async.js';
 
-const VIEWLET_ID = 'workbench.view.search';
-const VIEW_ID = 'workbench.view.search';
-const SEARCH_RESULT_LANGUAGE_ID = 'search-result';
-const SEARCH_EXCLUDE_CONFIG = 'search.exclude';
+const VIEWLET_ID = "workbench.view.search";
+const VIEW_ID = "workbench.view.search";
+const SEARCH_RESULT_LANGUAGE_ID = "search-result";
+const SEARCH_EXCLUDE_CONFIG = "search.exclude";
 const DEFAULT_MAX_SEARCH_RESULTS = 20000;
-const SEARCH_ELIDED_PREFIX = '⟪ ';
-const SEARCH_ELIDED_SUFFIX = ' characters skipped ⟫';
+const SEARCH_ELIDED_PREFIX = "⟪ ";
+const SEARCH_ELIDED_SUFFIX = " characters skipped ⟫";
 const SEARCH_ELIDED_MIN_LEN = (SEARCH_ELIDED_PREFIX.length + SEARCH_ELIDED_SUFFIX.length + 5) * 2;
 var SearchProviderType;
-(function (SearchProviderType) {
+(function(SearchProviderType) {
     SearchProviderType[SearchProviderType["file"] = 0] = "file";
     SearchProviderType[SearchProviderType["text"] = 1] = "text";
     SearchProviderType[SearchProviderType["aiText"] = 2] = "aiText";
 })(SearchProviderType || (SearchProviderType = {}));
 var QueryType;
-(function (QueryType) {
+(function(QueryType) {
     QueryType[QueryType["File"] = 1] = "File";
     QueryType[QueryType["Text"] = 2] = "Text";
     QueryType[QueryType["aiText"] = 3] = "aiText";
@@ -42,7 +42,7 @@ function isProgressMessage(p) {
     return !!p.message;
 }
 var SearchCompletionExitCode;
-(function (SearchCompletionExitCode) {
+(function(SearchCompletionExitCode) {
     SearchCompletionExitCode[SearchCompletionExitCode["Normal"] = 0] = "Normal";
     SearchCompletionExitCode[SearchCompletionExitCode["NewSearchStarted"] = 1] = "NewSearchStarted";
 })(SearchCompletionExitCode || (SearchCompletionExitCode = {}));
@@ -59,7 +59,7 @@ class TextSearchMatch {
         const rangesArr = Array.isArray(ranges) ? ranges : [ranges];
         if (previewOptions && previewOptions.matchLines === 1 && isSingleLineRangeList(rangesArr)) {
             text = getNLines(text, previewOptions.matchLines);
-            let result = '';
+            let result = "";
             let shift = 0;
             let lastEnd = 0;
             const leadingChars = Math.floor(previewOptions.charsPerLine / 5);
@@ -70,8 +70,7 @@ class TextSearchMatch {
                     const elision = SEARCH_ELIDED_PREFIX + (previewStart - lastEnd) + SEARCH_ELIDED_SUFFIX;
                     result += elision + text.slice(previewStart, previewEnd);
                     shift += previewStart - (lastEnd + elision.length);
-                }
-                else {
+                } else {
                     result += text.slice(lastEnd, previewEnd);
                 }
                 lastEnd = previewEnd;
@@ -81,8 +80,7 @@ class TextSearchMatch {
                 });
             }
             this.previewText = result;
-        }
-        else {
+        } else {
             const firstMatchLine = Array.isArray(ranges) ? ranges[0].startLineNumber : ranges.startLineNumber;
             const rangeLocs = mapArrayOrNot(ranges, r => ({
                 preview: ( new SearchRange(
@@ -121,12 +119,12 @@ class OneLineRange extends SearchRange {
     }
 }
 var ViewMode;
-(function (ViewMode) {
+(function(ViewMode) {
     ViewMode["List"] = "list";
     ViewMode["Tree"] = "tree";
 })(ViewMode || (ViewMode = {}));
 var SearchSortOrder;
-(function (SearchSortOrder) {
+(function(SearchSortOrder) {
     SearchSortOrder["Default"] = "default";
     SearchSortOrder["FileNames"] = "fileNames";
     SearchSortOrder["Type"] = "type";
@@ -135,7 +133,7 @@ var SearchSortOrder;
     SearchSortOrder["CountAscending"] = "countAscending";
 })(SearchSortOrder || (SearchSortOrder = {}));
 var SemanticSearchBehavior;
-(function (SemanticSearchBehavior) {
+(function(SemanticSearchBehavior) {
     SemanticSearchBehavior["Auto"] = "auto";
     SemanticSearchBehavior["Manual"] = "manual";
     SemanticSearchBehavior["RunOnEmpty"] = "runOnEmpty";
@@ -155,21 +153,23 @@ function getExcludes(configuration, includeSearchExcludes = true) {
     return allExcludes;
 }
 function pathIncludedInQuery(queryProps, fsPath) {
-    if (queryProps.excludePattern && match(queryProps.excludePattern, fsPath)) {
+    const globOptions = queryProps.ignoreGlobCase ? {
+        ignoreCase: true
+    } : undefined;
+    if (queryProps.excludePattern && match(queryProps.excludePattern, fsPath, globOptions)) {
         return false;
     }
     if (queryProps.includePattern || queryProps.usingSearchPaths) {
-        if (queryProps.includePattern && match(queryProps.includePattern, fsPath)) {
+        if (queryProps.includePattern && match(queryProps.includePattern, fsPath, globOptions)) {
             return true;
         }
         if (queryProps.usingSearchPaths) {
             return !!queryProps.folderQueries && ( queryProps.folderQueries.some(fq => {
                 const searchPath = fq.folder.fsPath;
-                if (isEqualOrParent(fsPath, searchPath)) {
+                if (isEqualOrParent(fsPath, searchPath, queryProps.ignoreGlobCase)) {
                     const relPath = relative(searchPath, fsPath);
-                    return !fq.includePattern || !!match(fq.includePattern, relPath);
-                }
-                else {
+                    return !fq.includePattern || !!match(fq.includePattern, relPath, globOptions);
+                } else {
                     return false;
                 }
             }));
@@ -179,7 +179,7 @@ function pathIncludedInQuery(queryProps, fsPath) {
     return true;
 }
 var SearchErrorCode;
-(function (SearchErrorCode) {
+(function(SearchErrorCode) {
     SearchErrorCode[SearchErrorCode["unknownEncoding"] = 1] = "unknownEncoding";
     SearchErrorCode[SearchErrorCode["regexParseError"] = 2] = "regexParseError";
     SearchErrorCode[SearchErrorCode["globParseError"] = 3] = "globParseError";
@@ -202,8 +202,7 @@ function deserializeSearchError(error) {
     try {
         const details = JSON.parse(errorMsg);
         return ( new SearchError(details.message, details.code));
-    }
-    catch (e) {
+    } catch (e) {
         return ( new SearchError(errorMsg, SearchErrorCode.other));
     }
 }
@@ -212,15 +211,17 @@ function resolvePatternsForProvider(globalPattern, folderPattern) {
         ...(globalPattern || {}),
         ...(folderPattern || {})
     };
-    return ( Object.keys(merged))
-        .filter(key => {
+    return ( Object.keys(merged)).filter(key => {
         const value = merged[key];
-        return typeof value === 'boolean' && value;
+        return typeof value === "boolean" && value;
     });
 }
 class QueryGlobTester {
     constructor(config, folderQuery) {
         this._parsedIncludeExpression = null;
+        const globOptions = config.ignoreGlobCase || folderQuery.ignoreGlobCase ? {
+            ignoreCase: true
+        } : undefined;
         this._excludeExpression = folderQuery.excludePattern?.map(excludePattern => {
             return {
                 ...(config.excludePattern || {}),
@@ -230,7 +231,7 @@ class QueryGlobTester {
         if (this._excludeExpression.length === 0) {
             this._excludeExpression = [config.excludePattern || {}];
         }
-        this._parsedExcludeExpression = ( this._excludeExpression.map(e => parse(e)));
+        this._parsedExcludeExpression = ( this._excludeExpression.map(e => parse(e, globOptions)));
         let includeExpression = config.includePattern;
         if (folderQuery.includePattern) {
             if (includeExpression) {
@@ -238,20 +239,19 @@ class QueryGlobTester {
                     ...includeExpression,
                     ...folderQuery.includePattern
                 };
-            }
-            else {
+            } else {
                 includeExpression = folderQuery.includePattern;
             }
         }
         if (includeExpression) {
-            this._parsedIncludeExpression = parse(includeExpression);
+            this._parsedIncludeExpression = parse(includeExpression, globOptions);
         }
     }
     _evalParsedExcludeExpression(testPath, basename, hasSibling) {
         let result = null;
         for (const folderExclude of this._parsedExcludeExpression) {
             const evaluation = folderExclude(testPath, basename, hasSibling);
-            if (typeof evaluation === 'string') {
+            if (typeof evaluation === "string") {
                 result = evaluation;
                 break;
             }
@@ -275,9 +275,7 @@ class QueryGlobTester {
     }
     includedInQuery(testPath, basename, hasSibling) {
         const isIncluded = () => {
-            return this._parsedIncludeExpression ?
-                !!(this._parsedIncludeExpression(testPath, basename, hasSibling)) :
-                true;
+            return this._parsedIncludeExpression ? !!(this._parsedIncludeExpression(testPath, basename, hasSibling)) : true;
         };
         return Promise.all(( this._parsedExcludeExpression.map(e => {
             const excluded = e(testPath, basename, hasSibling);
@@ -298,7 +296,7 @@ class QueryGlobTester {
 }
 function hasSiblingClauses(pattern) {
     for (const key in pattern) {
-        if (typeof pattern[key] !== 'boolean') {
+        if (typeof pattern[key] !== "boolean") {
             return true;
         }
     }
@@ -309,10 +307,9 @@ function hasSiblingPromiseFn(siblingsFn) {
         return undefined;
     }
     let siblings;
-    return (name) => {
+    return name => {
         if (!siblings) {
-            siblings = (siblingsFn() || Promise.resolve([]))
-                .then(list => list ? listToMap(list) : {});
+            siblings = (siblingsFn() || Promise.resolve([])).then(list => list ? listToMap(list) : {});
         }
         return siblings.then(map => !!map[name]);
     };
@@ -322,7 +319,7 @@ function hasSiblingFn(siblingsFn) {
         return undefined;
     }
     let siblings;
-    return (name) => {
+    return name => {
         if (!siblings) {
             const list = siblingsFn();
             siblings = list ? listToMap(list) : {};
@@ -339,11 +336,10 @@ function listToMap(list) {
 }
 function excludeToGlobPattern(excludesForFolder) {
     return excludesForFolder.flatMap(exclude => ( exclude.patterns.map(pattern => {
-        return exclude.baseUri ?
-            {
-                baseUri: exclude.baseUri,
-                pattern: pattern
-            } : pattern;
+        return exclude.baseUri ? {
+            baseUri: exclude.baseUri,
+            pattern: pattern
+        } : pattern;
     })));
 }
 const DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS = {

package/vscode/src/vs/workbench/services/search/common/search.service.js

@@ -1,6 +1,6 @@
 
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
-const ISearchService = ( createDecorator('searchService'));
+const ISearchService = ( createDecorator("searchService"));
 
 export { ISearchService };

package/vscode/src/vs/workbench/services/search/common/searchExtConversionTypes.js

@@ -4,12 +4,12 @@ import { DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS } from './search.js';
 import { TextSearchMatch2, TextSearchContext2 } from './searchExtTypes.js';
 
 function isTextSearchMatch(object) {
-    return 'uri' in object && 'ranges' in object && 'preview' in object;
+    return "uri" in object && "ranges" in object && "preview" in object;
 }
 function newToOldFileProviderOptions(options) {
     return ( options.folderOptions.map(folderOption => ({
         folder: folderOption.folder,
-        excludes: ( folderOption.excludes.map(e => typeof (e) === 'string' ? e : e.pattern)),
+        excludes: ( folderOption.excludes.map(e => typeof e === "string" ? e : e.pattern)),
         includes: folderOption.includes,
         useGlobalIgnoreFiles: folderOption.useIgnoreFiles.global,
         useIgnoreFiles: folderOption.useIgnoreFiles.local,
@@ -26,7 +26,9 @@ class OldFileSearchProviderConverter {
     provideFileSearchResults(pattern, options, token) {
         const getResult = async () => {
             const newOpts = newToOldFileProviderOptions(options);
-            return Promise.all(( newOpts.map(o => this.provider.provideFileSearchResults({ pattern }, o, token))));
+            return Promise.all(( newOpts.map(o => this.provider.provideFileSearchResults({
+                pattern
+            }, o, token))));
         };
         return getResult().then(e => coalesce(e).flat());
     }
@@ -34,7 +36,7 @@ class OldFileSearchProviderConverter {
 function newToOldTextProviderOptions(options) {
     return ( options.folderOptions.map(folderOption => ({
         folder: folderOption.folder,
-        excludes: ( folderOption.excludes.map(e => typeof (e) === 'string' ? e : e.pattern)),
+        excludes: ( folderOption.excludes.map(e => typeof e === "string" ? e : e.pattern)),
         includes: folderOption.includes,
         useGlobalIgnoreFiles: folderOption.useIgnoreFiles.global,
         useIgnoreFiles: folderOption.useIgnoreFiles.local,
@@ -59,11 +61,13 @@ function oldToNewTextSearchResult(result) {
         const ranges = ( asArray(result.ranges).map((r, i) => {
             const previewArr = asArray(result.preview.matches);
             const matchingPreviewRange = previewArr[i];
-            return { sourceRange: r, previewRange: matchingPreviewRange };
+            return {
+                sourceRange: r,
+                previewRange: matchingPreviewRange
+            };
         }));
         return ( new TextSearchMatch2(result.uri, ranges, result.preview.text));
-    }
-    else {
+    } else {
         return ( new TextSearchContext2(result.uri, result.text, result.lineNumber));
     }
 }
@@ -72,20 +76,23 @@ class OldTextSearchProviderConverter {
         this.provider = provider;
     }
     provideTextSearchResults(query, options, progress, token) {
-        const progressShim = (oldResult) => {
+        const progressShim = oldResult => {
             if (!validateProviderResult(oldResult)) {
                 return;
             }
             progress.report(oldToNewTextSearchResult(oldResult));
         };
         const getResult = async () => {
-            return coalesce(await Promise.all(( newToOldTextProviderOptions(options).map(
-                o => this.provider.provideTextSearchResults(query, o, { report: (e) => progressShim(e) }, token)
-            ))))
-                .reduce((prev, cur) => ({ limitHit: prev.limitHit || cur.limitHit }), { limitHit: false });
+            return coalesce(await Promise.all(( newToOldTextProviderOptions(options).map(o => this.provider.provideTextSearchResults(query, o, {
+                report: e => progressShim(e)
+            }, token))))).reduce((prev, cur) => ({
+                limitHit: prev.limitHit || cur.limitHit
+            }), {
+                limitHit: false
+            });
         };
         const oldResult = getResult();
-        return oldResult.then((e) => {
+        return oldResult.then(e => {
             return {
                 limitHit: e.limitHit,
                 message: coalesce(asArray(e.message))
@@ -97,17 +104,22 @@ function validateProviderResult(result) {
     if (extensionResultIsMatch(result)) {
         if (Array.isArray(result.ranges)) {
             if (!Array.isArray(result.preview.matches)) {
-                console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same type.');
+                console.warn(
+                    "INVALID - A text search provider match's`ranges` and`matches` properties must have the same type."
+                );
                 return false;
             }
             if (result.preview.matches.length !== result.ranges.length) {
-                console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
+                console.warn(
+                    "INVALID - A text search provider match's`ranges` and`matches` properties must have the same length."
+                );
                 return false;
             }
-        }
-        else {
+        } else {
             if (Array.isArray(result.preview.matches)) {
-                console.warn('INVALID - A text search provider match\'s`ranges` and`matches` properties must have the same length.');
+                console.warn(
+                    "INVALID - A text search provider match's`ranges` and`matches` properties must have the same length."
+                );
                 return false;
             }
         }

package/vscode/src/vs/workbench/services/search/common/searchExtTypes.d.ts

@@ -116,6 +116,10 @@ export interface TextSearchProviderFolderOptions {
      * Files that match an `excludes` glob pattern should be excluded from the search.
      */
     excludes: GlobPattern[];
+    /**
+     * Whether to ignore case for glob patterns.
+     */
+    ignoreGlobCase?: boolean;
     /**
      * Whether symlinks should be followed while searching.
      * For more info, see the setting description for `search.followSymlinks`.

package/vscode/src/vs/workbench/services/search/common/searchExtTypes.js

@@ -20,13 +20,13 @@ class AISearchKeyword {
     }
 }
 var ExcludeSettingOptions;
-(function (ExcludeSettingOptions) {
+(function(ExcludeSettingOptions) {
     ExcludeSettingOptions[ExcludeSettingOptions["None"] = 1] = "None";
     ExcludeSettingOptions[ExcludeSettingOptions["FilesExclude"] = 2] = "FilesExclude";
     ExcludeSettingOptions[ExcludeSettingOptions["SearchAndFilesExclude"] = 3] = "SearchAndFilesExclude";
 })(ExcludeSettingOptions || (ExcludeSettingOptions = {}));
 var TextSearchCompleteMessageType;
-(function (TextSearchCompleteMessageType) {
+(function(TextSearchCompleteMessageType) {
     TextSearchCompleteMessageType[TextSearchCompleteMessageType["Information"] = 1] = "Information";
     TextSearchCompleteMessageType[TextSearchCompleteMessageType["Warning"] = 2] = "Warning";
 })(TextSearchCompleteMessageType || (TextSearchCompleteMessageType = {}));

package/vscode/src/vs/workbench/services/search/common/searchHelpers.js

@@ -9,7 +9,7 @@ function editorMatchToTextSearchResult(matches, model, previewOptions) {
     for (let i = firstLine; i <= lastLine; i++) {
         lineTexts.push(model.getLineContent(i));
     }
-    return ( new TextSearchMatch(lineTexts.join('\n') + '\n', ( matches.map(m => ( new Range(
+    return ( new TextSearchMatch(lineTexts.join("\n") + "\n", ( matches.map(m => ( new Range(
         m.range.startLineNumber - 1,
         m.range.startColumn - 1,
         m.range.endLineNumber - 1,
@@ -20,7 +20,7 @@ function editorMatchesToTextSearchResults(matches, model, previewOptions) {
     let previousEndLine = -1;
     const groupedMatches = [];
     let currentMatches = [];
-    matches.forEach((match) => {
+    matches.forEach(match => {
         if (match.range.startLineNumber !== previousEndLine) {
             currentMatches = [];
             groupedMatches.push(currentMatches);
@@ -36,8 +36,11 @@ function getTextSearchMatchWithModelContext(matches, model, query) {
     const results = [];
     let prevLine = -1;
     for (let i = 0; i < matches.length; i++) {
-        const { start: matchStartLine, end: matchEndLine } = getMatchStartEnd(matches[i]);
-        if (typeof query.surroundingContext === 'number' && query.surroundingContext > 0) {
+        const {
+            start: matchStartLine,
+            end: matchEndLine
+        } = getMatchStartEnd(matches[i]);
+        if (typeof query.surroundingContext === "number" && query.surroundingContext > 0) {
             const beforeContextStartLine = Math.max(prevLine + 1, matchStartLine - query.surroundingContext);
             for (let b = beforeContextStartLine; b < matchStartLine; b++) {
                 results.push({
@@ -49,8 +52,12 @@ function getTextSearchMatchWithModelContext(matches, model, query) {
         results.push(matches[i]);
         const nextMatch = matches[i + 1];
         const nextMatchStartLine = nextMatch ? getMatchStartEnd(nextMatch).start : Number.MAX_VALUE;
-        if (typeof query.surroundingContext === 'number' && query.surroundingContext > 0) {
-            const afterContextToLine = Math.min(nextMatchStartLine - 1, matchEndLine + query.surroundingContext, model.getLineCount() - 1);
+        if (typeof query.surroundingContext === "number" && query.surroundingContext > 0) {
+            const afterContextToLine = Math.min(
+                nextMatchStartLine - 1,
+                matchEndLine + query.surroundingContext,
+                model.getLineCount() - 1
+            );
             for (let a = matchEndLine + 1; a <= afterContextToLine; a++) {
                 results.push({
                     text: model.getLineContent(a + 1),

package/vscode/src/vs/workbench/services/search/common/textSearchManager.js

@@ -37,7 +37,7 @@ class TextSearchManager {
                 }
                 if (!this.isLimitHit) {
                     const resultSize = this.resultSize(result);
-                    if (result instanceof TextSearchMatch2 && typeof this.query.maxResults === 'number' && this.resultCount + resultSize > this.query.maxResults) {
+                    if (result instanceof TextSearchMatch2 && typeof this.query.maxResults === "number" && this.resultCount + resultSize > this.query.maxResults) {
                         this.isLimitHit = true;
                         isCanceled = true;
                         tokenSource.cancel();
@@ -61,7 +61,7 @@ class TextSearchManager {
                         type: this.processType
                     }
                 });
-            }, (err) => {
+            }, err => {
                 tokenSource.dispose();
                 const errMsg = toErrorMessage(err);
                 reject(( new Error(errMsg)));
@@ -79,11 +79,8 @@ class TextSearchManager {
     }
     resultSize(result) {
         if (result instanceof TextSearchMatch2) {
-            return Array.isArray(result.ranges) ?
-                result.ranges.length :
-                1;
-        }
-        else {
+            return Array.isArray(result.ranges) ? result.ranges.length : 1;
+        } else {
             return 0;
         }
     }
@@ -93,24 +90,27 @@ class TextSearchManager {
     async doSearch(folderQueries, onResult, token, onKeywordResult) {
         const folderMappings = ( new FolderQuerySearchTree(folderQueries, (fq, i) => {
             const queryTester = ( new QueryGlobTester(this.query, fq));
-            return { queryTester, folder: fq.folder, folderIdx: i };
+            return {
+                queryTester,
+                folder: fq.folder,
+                folderIdx: i
+            };
         }, () => true));
         const testingPs = [];
         const progress = {
-            report: (result) => {
+            report: result => {
                 if (result instanceof AISearchKeyword) {
                     onKeywordResult?.(result);
-                }
-                else {
+                } else {
                     if (result.uri === undefined) {
-                        throw Error('Text search result URI is undefined. Please check provider implementation.');
+                        throw Error(
+                            "Text search result URI is undefined. Please check provider implementation."
+                        );
                     }
                     const folderQuery = folderMappings.findQueryFragmentAwareSubstr(result.uri);
-                    const hasSibling = folderQuery.folder.scheme === Schemas.file ?
-                        hasSiblingPromiseFn(() => {
-                            return this.fileUtils.readdir(dirname(result.uri));
-                        }) :
-                        undefined;
+                    const hasSibling = folderQuery.folder.scheme === Schemas.file ? hasSiblingPromiseFn(() => {
+                        return this.fileUtils.readdir(dirname(result.uri));
+                    }) : undefined;
                     const relativePath$1 = relativePath(folderQuery.folder, result.uri);
                     if (relativePath$1) {
                         const included = folderQuery.queryTester.includedInQuery(relativePath$1, basename(relativePath$1), hasSibling);
@@ -120,8 +120,7 @@ class TextSearchManager {
                                     onResult(result, folderQuery.folderIdx);
                                 }
                             }));
-                        }
-                        else if (included) {
+                        } else if (included) {
                             onResult(result, folderQuery.folderIdx);
                         }
                     }
@@ -134,17 +133,26 @@ class TextSearchManager {
             maxFileSize: this.query.maxFileSize,
             maxResults: this.query.maxResults ?? DEFAULT_MAX_SEARCH_RESULTS,
             previewOptions: this.query.previewOptions ?? DEFAULT_TEXT_SEARCH_PREVIEW_OPTIONS,
-            surroundingContext: this.query.surroundingContext ?? 0,
+            surroundingContext: this.query.surroundingContext ?? 0
         };
-        if ('usePCRE2' in this.query) {
+        if ("usePCRE2" in this.query) {
             searchOptions.usePCRE2 = this.query.usePCRE2;
         }
         let result;
         if (this.queryProviderPair.query.type === QueryType.aiText) {
-            result = await this.queryProviderPair.provider.provideAITextSearchResults(this.queryProviderPair.query.contentPattern, searchOptions, progress, token);
-        }
-        else {
-            result = await this.queryProviderPair.provider.provideTextSearchResults(patternInfoToQuery(this.queryProviderPair.query.contentPattern), searchOptions, progress, token);
+            result = await this.queryProviderPair.provider.provideAITextSearchResults(
+                this.queryProviderPair.query.contentPattern,
+                searchOptions,
+                progress,
+                token
+            );
+        } else {
+            result = await this.queryProviderPair.provider.provideTextSearchResults(
+                patternInfoToQuery(this.queryProviderPair.query.contentPattern),
+                searchOptions,
+                progress,
+                token
+            );
         }
         if (testingPs.length) {
             await Promise.all(testingPs);
@@ -159,9 +167,9 @@ class TextSearchManager {
         }));
         if (!excludePattern || excludePattern.length === 0) {
             excludePattern = [{
-                    folder: undefined,
-                    patterns: resolvePatternsForProvider(this.query.excludePattern, undefined)
-                }];
+                folder: undefined,
+                patterns: resolvePatternsForProvider(this.query.excludePattern, undefined)
+            }];
         }
         const excludes = excludeToGlobPattern(excludePattern);
         const options = {
@@ -174,7 +182,8 @@ class TextSearchManager {
                 global: !fq.disregardGlobalIgnoreFiles
             },
             followSymlinks: !fq.ignoreSymlinks,
-            encoding: (fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding)) ?? '',
+            encoding: (fq.fileEncoding && this.fileUtils.toCanonicalName(fq.fileEncoding)) ?? "",
+            ignoreGlobCase: this.query.ignoreGlobCase || fq.ignoreGlobCase
         };
         return options;
     }
@@ -202,6 +211,7 @@ class TextSearchResultsCollector {
         }
         if (!this._currentFileMatch) {
             this._currentFolderIdx = folderIdx;
+            this._currentUri = data.uri;
             this._currentFileMatch = {
                 resource: data.uri,
                 results: []
@@ -210,9 +220,7 @@ class TextSearchResultsCollector {
         this._currentFileMatch.results.push(extensionResultToFrontendResult(data));
     }
     pushToCollector() {
-        const size = this._currentFileMatch && this._currentFileMatch.results ?
-            this._currentFileMatch.results.length :
-            0;
+        const size = this._currentFileMatch && this._currentFileMatch.results ? this._currentFileMatch.results.length : 0;
         this._batchedCollector.addItem(this._currentFileMatch, size);
     }
     flush() {
@@ -239,11 +247,10 @@ function extensionResultToFrontendResult(data) {
                     startColumn: r.sourceRange.start.character,
                     endLineNumber: r.sourceRange.end.line,
                     endColumn: r.sourceRange.end.character
-                },
-            }))),
+                }
+            })))
         };
-    }
-    else {
+    } else {
         return {
             text: data.text,
             lineNumber: data.lineNumber
@@ -251,8 +258,12 @@ function extensionResultToFrontendResult(data) {
     }
 }
 class BatchedCollector {
-    static { this.TIMEOUT = 4000; }
-    static { this.START_BATCH_AFTER_COUNT = 50; }
+    static {
+        this.TIMEOUT = 4000;
+    }
+    static {
+        this.START_BATCH_AFTER_COUNT = 50;
+    }
     constructor(maxBatchSize, cb) {
         this.maxBatchSize = maxBatchSize;
         this.cb = cb;
@@ -285,11 +296,9 @@ class BatchedCollector {
     onUpdate() {
         if (this.totalNumberCompleted < BatchedCollector.START_BATCH_AFTER_COUNT) {
             this.flush();
-        }
-        else if (this.batchSize >= this.maxBatchSize) {
+        } else if (this.batchSize >= this.maxBatchSize) {
             this.flush();
-        }
-        else if (!this.timeoutHandle) {
+        } else if (!this.timeoutHandle) {
             this.timeoutHandle = setTimeout(() => {
                 this.flush();
             }, BatchedCollector.TIMEOUT);

package/vscode/src/vs/workbench/services/statusbar/browser/statusbar.service.js

@@ -1,6 +1,6 @@
 
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 
-const IStatusbarService = ( createDecorator('statusbarService'));
+const IStatusbarService = ( createDecorator("statusbarService"));
 
 export { IStatusbarService };