Skip to content

Commit 22c7f8f

Browse files
committed
using RelativePattern exclude and pattern causes an error
Fixes microsoft#227035
1 parent 0e542f3 commit 22c7f8f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/vs/workbench/api/browser/mainThreadWorkspace.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import { IEditSessionIdentityService } from 'vs/platform/workspace/common/editSe
2828
import { EditorResourceAccessor, SaveReason, SideBySideEditor } from 'vs/workbench/common/editor';
2929
import { coalesce, firstOrDefault } from 'vs/base/common/arrays';
3030
import { ICanonicalUriService } from 'vs/platform/workspace/common/canonicalUri';
31+
import { revive } from 'vs/base/common/marshalling';
3132

3233
@extHostNamedCustomer(MainContext.MainThreadWorkspace)
3334
export class MainThreadWorkspace implements MainThreadWorkspaceShape {
@@ -146,7 +147,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
146147

147148
const query = this._queryBuilder.file(
148149
includeFolder ? [includeFolder] : workspace.folders,
149-
options
150+
revive(options)
150151
);
151152

152153
return this._searchService.fileSearch(query, token).then(result => {
@@ -164,7 +165,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
164165
const workspace = this._contextService.getWorkspace();
165166
const folders = folder ? [folder] : workspace.folders.map(folder => folder.uri);
166167

167-
const query = this._queryBuilder.text(pattern, folders, options);
168+
const query = this._queryBuilder.text(pattern, folders, revive(options));
168169
query._reason = 'startTextSearch';
169170

170171
const onProgress = (p: ISearchProgressItem) => {

0 commit comments

Comments
 (0)