From f655efaa1f7b74ec9c8ade85523472a08029b57f Mon Sep 17 00:00:00 2001 From: pkoushik Date: Tue, 2 Oct 2018 21:39:00 +0530 Subject: [PATCH] fix #59364 - Review #2 - build failure fixed --- src/vs/platform/search/common/search.ts | 2 +- src/vs/vscode.proposed.d.ts | 2 +- src/vs/workbench/parts/search/test/common/queryBuilder.test.ts | 2 +- src/vs/workbench/services/search/node/search.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/platform/search/common/search.ts b/src/vs/platform/search/common/search.ts index 17225b8ece8..92f9109897d 100644 --- a/src/vs/platform/search/common/search.ts +++ b/src/vs/platform/search/common/search.ts @@ -66,7 +66,7 @@ export interface IFolderQuery { includePattern?: glob.IExpression; fileEncoding?: string; disregardIgnoreFiles?: boolean; - disregardGlobalIgnoreFiles: boolean; + disregardGlobalIgnoreFiles?: boolean; } export interface ICommonQueryOptions { diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index c5e2df9cf1e..57fb47bb518 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -302,7 +302,7 @@ declare module 'vscode' { * Whether global files that exclude files, like .gitignore, should be respected. * See the vscode setting `"search.useGlobalIgnoreFiles"`. */ - useGlobalIgnoreFiles: boolean; + useGlobalIgnoreFiles?: boolean; /** * Whether symlinks should be followed while searching. diff --git a/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts b/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts index ad60724326e..c0e2ff6775b 100644 --- a/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts +++ b/src/vs/workbench/parts/search/test/common/queryBuilder.test.ts @@ -99,7 +99,7 @@ suite('QueryBuilder', () => { } } }], - type: QueryType.TextuseIgnoreFiles + type: QueryType.Text }); }); diff --git a/src/vs/workbench/services/search/node/search.ts b/src/vs/workbench/services/search/node/search.ts index 4cb6068ddfe..8b414598651 100644 --- a/src/vs/workbench/services/search/node/search.ts +++ b/src/vs/workbench/services/search/node/search.ts @@ -17,7 +17,7 @@ export interface IFolderSearch { includePattern?: IExpression; fileEncoding?: string; disregardIgnoreFiles?: boolean; - disregardGlobalIgnoreFiles: boolean; + disregardGlobalIgnoreFiles?: boolean; } export interface IRawSearch { -- GitLab