Skip to content

Commit 1add304

Browse files
authored
Merge pull request #757 from nk-coding/main
fix: respect isRegExp option in WorkspaceSearchProvider
2 parents 5eb6295 + 65f8911 commit 1add304

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

src/service-override/tools/search-providers/workspace-search-provider.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { BaseWorkspaceSearchProvider } from '../search-utils/base-provider'
2-
import { fuzzyContains, splitLines } from 'vs/base/common/strings'
2+
import { fuzzyContains, splitLines, createRegExp } from 'vs/base/common/strings'
33
import type { URI } from 'vs/base/common/uri'
44
import * as glob from 'vs/base/common/glob'
55
import type {
@@ -270,12 +270,13 @@ export class WorkspaceSearchProvider
270270
*/
271271
private createSearchRegex(contentPattern: ITextQuery['contentPattern']): RegExp {
272272
try {
273-
return new RegExp(
274-
contentPattern.pattern || '',
275-
(contentPattern.isCaseSensitive ? 'g' : 'gi') +
276-
(contentPattern.isMultiline ? 'm' : '') +
277-
(contentPattern.isUnicode ? 'u' : '')
278-
)
273+
return createRegExp(contentPattern.pattern || '', !!contentPattern.isRegExp, {
274+
wholeWord: contentPattern.isWordMatch,
275+
global: true,
276+
matchCase: contentPattern.isCaseSensitive,
277+
multiline: contentPattern.isMultiline,
278+
unicode: contentPattern.isUnicode
279+
})
279280
} catch (regexError) {
280281
this.logger.error(`Invalid regex pattern: ${contentPattern.pattern}`, regexError as Error)
281282
const searchError = new SearchError(

0 commit comments

Comments
 (0)