Support case-insensitive ripgrep and file search #273860

dmitrivMS · 2025-10-29T02:18:19Z

Second step towards fixing #10633 and many related duplicates.

This PR adds an option to enable case-insensitive ripgrep and file search, in part by using case-insensitive glob support.
The new option is not used here and default behavior is the same as before.
The option will be used by follow up PRs to enable case-insensitive behavior in various features.

Copilot

Pull Request Overview

This PR adds support for case-insensitive glob pattern matching in the search functionality. The main changes include:

Adding ignoreGlobPatternCase property to query interfaces and type definitions
Passing ignoreCase options to glob parsing and matching functions
Using case-insensitive string comparisons where appropriate
Fixing several spelling errors in comments (e.g., "sibilings" → "siblings", "shoudn't" → "shouldn't", "naieve" → "naive", "Preservering" → "Preserving", "expectred" → "expected", "ouside" → "outside")

Reviewed Changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
src/vs/workbench/services/search/worker/localFileSearch.ts	Adds `ignoreGlobPatternCase` to glob options, passes to IgnoreFile, and fixes "siblings" typo
src/vs/workbench/services/search/node/ripgrepTextSearchEngine.ts	Passes `ignoreGlobPatternCase` to ripgrep options and adds glob-case-insensitive flags
src/vs/workbench/services/search/node/ripgrepSearchProvider.ts	Combines `ignoreGlobPatternCase` from multiple sources
src/vs/workbench/services/search/node/ripgrepFileSearch.ts	Adds case-insensitive glob flags for ripgrep
src/vs/workbench/services/search/node/fileSearch.ts	Uses `strings.equals` for case-insensitive file pattern matching
src/vs/workbench/services/search/common/textSearchManager.ts	Fixes "shouldn't" typo and passes `ignoreGlobPatternCase` to options
src/vs/workbench/services/search/common/searchExtTypes.ts	Adds `ignoreGlobPatternCase` documentation to interfaces
src/vs/workbench/services/search/common/search.ts	Adds `ignoreGlobPatternCase` to query interfaces and uses in path matching
src/vs/workbench/services/search/common/queryBuilder.ts	Adds `ignoreGlobPatternCase` to query builder options
src/vs/workbench/services/search/common/ignoreFile.ts	Adds `ignoreCase` parameter and fixes multiple spelling errors
src/vs/workbench/services/search/common/fileSearchManager.ts	Uses `strings.equals` for case-insensitive comparisons

src/vs/workbench/services/search/node/fileSearch.ts

src/vs/workbench/services/search/common/fileSearchManager.ts

Rename `ChatService.getHistory` to `getLocalSessionHistory`

Consolidate duplicated UpdateTracker code in promptsServiceImpl.ts

…aquamarine Update merge and diff-multiple icons in codicons

Noticed this when working on edit sessions, this seems like what the intended behavior should be

…rsor (#273833) * Initial plan * Fix cursor navigation in wrapped lines Change cursor position check to only enable history navigation when cursor is at line 1, column 1. This prevents accidental history navigation when pressing up arrow on wrapped lines. Co-authored-by: alexdima <5047891+alexdima@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: alexdima <5047891+alexdima@users.noreply.github.com>

…am-tan titlebar: reduce Command Center spacer icon horizontal padding to 8px

…ring branches (#273969)

)

dmitrivMS · 2025-10-30T18:29:15Z

src/vs/workbench/contrib/search/browser/searchChatContext.ts

 	searchService: ISearchService
 ): Promise<{ folders: URI[]; files: URI[] }> {
-	const segmentMatchPattern = caseInsensitiveGlobPattern(fuzzyMatch ? fuzzyMatchingGlobPattern(pattern) : continousMatchingGlobPattern(pattern));
+	const segmentMatchPattern = fuzzyMatch ? fuzzyMatchingGlobPattern(pattern) : continuousMatchingGlobPattern(pattern);


caseInsensitiveGlobPattern() was used to make case-insensitive glob matching. Removed this method and passing { ignoreCase: true } to the glob.match() call below instead.

dmitrivMS · 2025-10-30T18:30:17Z

src/vs/workbench/contrib/search/browser/searchChatContext.ts

 		cacheKey,
 		excludePattern: searchExcludePattern,
 		sortByScore: true,
+		ignoreGlobPatternCase: true


Based on glob case-insensitivity, assuming that we want case-insensitive search here, so passing ignoreGlobPatternCase: true to the search service.

dmitrivMS · 2025-10-30T18:53:43Z

src/vs/workbench/contrib/files/browser/views/explorerViewer.ts

-	private async searchInWorkspace(patternLowercase: string, root: ExplorerItem, rootIndex: number, isFuzzyMatch: boolean, token: CancellationToken): Promise<{ explorerRoot: ExplorerItem; files: URI[]; directories: URI[]; hitMaxResults: boolean }> {
-		const segmentMatchPattern = caseInsensitiveGlobPattern(isFuzzyMatch ? fuzzyMatchingGlobPattern(patternLowercase) : continousMatchingGlobPattern(patternLowercase));
+	private async searchInWorkspace(pattern: string, root: ExplorerItem, rootIndex: number, isFuzzyMatch: boolean, token: CancellationToken): Promise<{ explorerRoot: ExplorerItem; files: URI[]; directories: URI[]; hitMaxResults: boolean }> {
+		const segmentMatchPattern = isFuzzyMatch ? fuzzyMatchingGlobPattern(pattern) : continuousMatchingGlobPattern(pattern);


caseInsensitiveGlobPattern() was used to make case-insensitive glob matching. Removed this method and passing { ignoreCase: true } to the glob.match() call below instead.

dmitrivMS · 2025-10-30T18:54:00Z

src/vs/workbench/contrib/files/browser/views/explorerViewer.ts

 			shouldGlobMatchFilePattern: true,
 			cacheKey: `explorerfindprovider:${root.name}:${rootIndex}:${this.sessionId}`,
 			excludePattern: searchExcludePattern,
+			ignoreGlobPatternCase: true


Based on glob case-insensitivity, assuming that we want case-insensitive search here, so passing ignoreGlobPatternCase: true to the search service.

dmitrivMS · 2025-10-30T21:22:22Z

src/vs/workbench/services/search/worker/localFileSearch.ts

 				const uri = URI.file(path);
-				if (extUri.isEqualOrParent(uri, searchPath)) {
+				const folderGlobOptions = { ignoreCase: queryProps.ignoreGlobPatternCase || fq.ignoreGlobPatternCase };
+				if (extUri.isEqualOrParent(uri, searchPath, folderGlobOptions.ignoreCase)) {


added ignoreCase argument to isEqualOrParent() call because it is related to glob matching.

dmitrivMS · 2025-10-30T21:23:02Z

src/vs/workbench/services/search/node/fileSearch.ts

 					else {
 						this.filesWalked++;
-						if (currentRelativePath === this.filePattern) {
+						if (strings.equals(currentRelativePath, this.filePattern, ignoreCase)) {


Added ignoreCase argument to string comparison because it is related to glob matching.

dmitrivMS · 2025-10-30T21:23:33Z

src/vs/workbench/services/search/node/fileSearch.ts

 			// are searching for and we want to include the result in that case anyway
 			const currentRelativePath = relativeParentPath ? [relativeParentPath, file].join(path.sep) : file;
-			if (this.folderExcludePatterns.get(folderQuery.folder.fsPath)!.test(currentRelativePath, file, this.config.filePattern !== file ? hasSibling : undefined)) {
+			if (this.folderExcludePatterns.get(folderQuery.folder.fsPath)!.test(currentRelativePath, file, !strings.equals(this.config.filePattern, file, ignoreCase) ? hasSibling : undefined)) {


Added ignoreCase argument to string comparison because it is related to glob matching.

dmitrivMS · 2025-10-30T21:23:44Z

src/vs/workbench/services/search/node/fileSearch.ts

 				} else {
 					self.filesWalked++;
-					if (relativePath === filePattern) {
+					if (strings.equals(relativePath, filePattern, ignoreCase)) {


Added ignoreCase argument to string comparison because it is related to glob matching.

dmitrivMS · 2025-10-30T21:23:51Z

src/vs/workbench/services/search/node/fileSearch.ts

 				// to ignore filtering by siblings because the user seems to know what they
 				// are searching for and we want to include the result in that case anyway
-				if (excludePattern.test(relativePath, basename, filePattern !== basename ? hasSibling : undefined)) {
+				if (excludePattern.test(relativePath, basename, !strings.equals(filePattern, basename, ignoreCase) ? hasSibling : undefined)) {


Added ignoreCase argument to string comparison because it is related to glob matching.

dmitrivMS · 2025-10-30T21:24:33Z

src/vs/workbench/services/search/common/search.ts

 			return !!queryProps.folderQueries && queryProps.folderQueries.some(fq => {
 				const searchPath = fq.folder.fsPath;
-				if (extpath.isEqualOrParent(fsPath, searchPath)) {
+				if (extpath.isEqualOrParent(fsPath, searchPath, globOptions.ignoreCase)) {


Added ignoreCase argument to isEqualOrParent() call because it is related to glob matching.

dmitrivMS · 2025-10-30T21:25:14Z

src/vs/workbench/services/search/common/fileSearchManager.ts

 	private addDirectoryEntries({ pathToEntries }: IDirectoryTree, base: URI, relativeFile: string, onResult: (result: IInternalFileMatch) => void) {
 		// Support relative paths to files from a root resource (ignores excludes)
-		if (relativeFile === this.filePattern) {
+		if (this.filePattern !== undefined && strings.equals(relativeFile, this.filePattern, this.config.ignoreGlobPatternCase)) {


Added ignoreCase argument to string comparison because it is related to glob matching.

dmitrivMS · 2025-10-30T21:25:25Z

src/vs/workbench/services/search/common/fileSearchManager.ts

 				// to ignore filtering by siblings because the user seems to know what they
 				// are searching for and we want to include the result in that case anyway
-				if (queryTester.matchesExcludesSync(relativePath, basename, filePattern !== basename ? hasSibling : undefined)) {
+				if (queryTester.matchesExcludesSync(relativePath, basename, !strings.equals(filePattern, basename, ignoreCase) ? hasSibling : undefined)) {


Added ignoreCase argument to string comparison because it is related to glob matching.

dmitrivMS · 2025-10-30T21:25:31Z

src/vs/workbench/services/search/common/fileSearchManager.ts

 					matchDirectory(sub);
 				} else {
-					if (relativePath === filePattern) {
+					if (strings.equals(relativePath, filePattern, ignoreCase)) {


Added ignoreCase argument to string comparison because it is related to glob matching.

dmitrivMS · 2025-11-05T07:51:16Z

Closing, will open a new one in its place.

Support case-insensitive ripgrep and file search

69b9934

Copilot AI review requested due to automatic review settings October 29, 2025 02:18

dmitrivMS self-assigned this Oct 29, 2025

dmitrivMS linked an issue Oct 29, 2025 that may be closed by this pull request

Glob matching should be case insensitive #10633

Closed

dmitrivMS requested review from TylerLeonhardt, bpasero, osortega and roblourens October 29, 2025 02:19

dmitrivMS mentioned this pull request Oct 29, 2025

Support case-insensitive glob #273837

Merged

dmitrivMS added the file-glob File glob engine label Oct 29, 2025

dmitrivMS mentioned this pull request Oct 29, 2025

Glob matching should be case insensitive #10633

Closed

dmitrivMS added the search Search widget and operation issues label Oct 29, 2025

Copilot AI reviewed Oct 29, 2025

View reviewed changes

dmitrivMS and others added 17 commits October 28, 2025 23:45

Merge branch 'main' into dev/dmitriv/glob-2

0bb62f3

Merge pull request #273841 from mjbvz/dev/mjbvz/democratic-swallow

fd5cf25

Rename `ChatService.getHistory` to `getLocalSessionHistory`

Consolidate duplicated UpdateTracker code (#273858)

58c4b96

Consolidate duplicated UpdateTracker code in promptsServiceImpl.ts

codicons: update merge & diff-multiple icons

bc5b8b0

Engineering - try to run mangling in the PR check (#268428)

4d57d22

Merge pull request #273927 from microsoft:mrleemurray/yearning-gayal-…

acc5118

…aquamarine Update merge and diff-multiple icons in codicons

notebooks: fix check to take simple path in diff operation (#273664)

5c4eb47

Noticed this when working on edit sessions, this seems like what the intended behavior should be

Add Copy Button to Hover Content (#271990)

f0199b3

Git - improve graph/timeline/blame hover rendering (#273932)

26e1f01

chat - add a smoke test to check for AI disabling support (#273940)

013f16b

titlebar: reduce Command Center spacer icon horizontal padding to 8px

73a36cf

Merge pull request #273949 from microsoft/mrleemurray/overwhelming-cl…

de3c8a1

…am-tan titlebar: reduce Command Center spacer icon horizontal padding to 8px

Fix clear model cache race (#273929)

8cec333

Git - use diff instead of diff-tree for showing commit data and compa…

84f6450

…ring branches (#273969)

Use isEqual to compare uris

71d8754

Git - move compare with merge base action into the context menu (#273981

01ddec7

)

dmitrivMS commented Oct 30, 2025

View reviewed changes

dmitrivMS added 4 commits October 30, 2025 13:37

Updates

df3bcd4

Updates

a818cc2

Updates

3b69916

Updates

966d62b

dmitrivMS commented Oct 30, 2025

View reviewed changes

dmitrivMS added 3 commits October 30, 2025 14:32

Updates

28a1fcb

Updates

249b901

Updates

4d2ad8d

dmitrivMS removed request for TylerLeonhardt, bpasero, osortega and roblourens October 30, 2025 22:11

dmitrivMS added 2 commits October 31, 2025 02:50

Merge remote-tracking branch 'origin/main' into dev/dmitriv/glob-2

78c0e6b

Merge branch 'main' into dev/dmitriv/glob-2

434a0fb

dmitrivMS closed this Nov 5, 2025

vs-code-engineering bot locked and limited conversation to collaborators Dec 21, 2025

dmitrivMS deleted the dev/dmitriv/glob-2 branch January 29, 2026 23:42

Support case-insensitive ripgrep and file search #273860

Support case-insensitive ripgrep and file search #273860

Uh oh!

Conversation

dmitrivMS commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmitrivMS Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dmitrivMS commented Nov 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

dmitrivMS commented Oct 29, 2025 •

edited

Loading

dmitrivMS Oct 30, 2025 •

edited

Loading