From 74ccd2dffaee16e47e31f3f84a3c97513bbbbb84 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Sun, 24 Jun 2018 10:04:40 -0700 Subject: [PATCH] Fix #52758 - Don't add 'undefined' include/exclude keys for findFiles --- .../api/electron-browser/mainThreadWorkspace.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts index c85997bc5d4..297e9886d14 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts @@ -128,12 +128,18 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape { folderQueries, type: QueryType.File, maxResults, - includePattern: { [typeof includePattern === 'string' ? includePattern : undefined]: true }, - excludePattern: { [typeof excludePatternOrDisregardExcludes === 'string' ? excludePatternOrDisregardExcludes : undefined]: true }, disregardExcludeSettings: excludePatternOrDisregardExcludes === false, useRipgrep, ignoreSymlinks }; + if (typeof includePattern === 'string') { + query.includePattern = { [includePattern]: true }; + } + + if (typeof excludePatternOrDisregardExcludes === 'string') { + query.excludePattern = { [excludePatternOrDisregardExcludes]: true }; + } + this._searchService.extendQuery(query); const search = this._searchService.search(query).then(result => {