Skip to content

fix: respect isRegExp option in WorkspaceSearchProvider #757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nk-coding wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: respect isRegExp option in WorkspaceSearchProvider #757

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/service-override/tools/search-providers/workspace-search-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BaseWorkspaceSearchProvider } from '../search-utils/base-provider'
import { fuzzyContains, splitLines } from 'vs/base/common/strings'
import { fuzzyContains, splitLines, createRegExp } from 'vs/base/common/strings'
import type { URI } from 'vs/base/common/uri'
import * as glob from 'vs/base/common/glob'
import type {
Expand Down Expand Up @@ -270,12 +270,13 @@ export class WorkspaceSearchProvider
*/
private createSearchRegex(contentPattern: ITextQuery['contentPattern']): RegExp {
try {
return new RegExp(
contentPattern.pattern || '',
(contentPattern.isCaseSensitive ? 'g' : 'gi') +
(contentPattern.isMultiline ? 'm' : '') +
(contentPattern.isUnicode ? 'u' : '')
)
return createRegExp(contentPattern.pattern || '', !!contentPattern.isRegExp, {
wholeWord: contentPattern.isWordMatch,
global: true,
matchCase: contentPattern.isCaseSensitive,
multiline: contentPattern.isMultiline,
unicode: contentPattern.isUnicode
})
} catch (regexError) {
this.logger.error(`Invalid regex pattern: ${contentPattern.pattern}`, regexError as Error)
const searchError = new SearchError(
Expand Down