提交 f49e3e5c 编写于 作者: R Rob Lourens

Fix #37000 - use search.followSymlinks for all searches

上级 ffb83a80
......@@ -72,13 +72,19 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape {
return folderConfig.search.useRipgrep;
});
const ignoreSymlinks = folderQueries.every(folderQuery => {
const folderConfig = this._configurationService.getConfiguration<ISearchConfiguration>({ resource: folderQuery.folder });
return !folderConfig.search.followSymlinks;
});
const query: ISearchQuery = {
folderQueries,
type: QueryType.File,
maxResults,
includePattern: { [typeof include === 'string' ? include : !!include ? include.pattern : undefined]: true },
excludePattern: { [typeof exclude === 'string' ? exclude : !!exclude ? exclude.pattern : undefined]: true },
useRipgrep
useRipgrep,
ignoreSymlinks
};
this._searchService.extendQuery(query);
......
......@@ -229,12 +229,15 @@ export class ExtensionHostMain {
return folderConfig.get('useRipgrep', true);
});
const followSymlinks = this._extHostConfiguration.getConfiguration('search').get('followSymlinks', true);
const query: ISearchQuery = {
folderQueries,
type: QueryType.File,
exists: true,
includePattern: includes,
useRipgrep
useRipgrep,
ignoreSymlinks: !followSymlinks
};
let result = await this._diskSearch.search(query);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册