diff options
author | Rob Lourens <roblourens@gmail.com> | 2019-03-06 03:23:46 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-06 03:23:46 +0300 |
commit | 43228c493069ead7cfb7d57b2da1db20fc0acdaf (patch) | |
tree | 507e736e77ee228ba32f09606ba1be1cd543cbbb | |
parent | b48a0504b32f75b12f71e8202037a9d0ca1005cf (diff) | |
parent | ed1bb03196cc58a623ee1376130eb309d2377118 (diff) |
Merge pull request #69877 from Microsoft/fix69875
Fix #69875
-rw-r--r-- | src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts | 2 | ||||
-rw-r--r-- | src/vs/workbench/api/node/extHost.protocol.ts | 2 | ||||
-rw-r--r-- | src/vs/workbench/api/node/extHostWorkspace.ts | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts index fe39eeef61a..c2b3d540575 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts @@ -119,7 +119,7 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape { // --- search --- - $startFileSearch(includePattern: string, _includeFolder: UriComponents | undefined, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<URI[] | undefined> { + $startFileSearch(includePattern: string, _includeFolder: UriComponents | undefined, excludePatternOrDisregardExcludes: string | false | undefined, maxResults: number, token: CancellationToken): Promise<URI[] | undefined> { const includeFolder = URI.revive(_includeFolder); const workspace = this._contextService.getWorkspace(); if (!workspace.folders.length) { diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 2e74617076a..1719409dc3e 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -527,7 +527,7 @@ export interface ExtHostUrlsShape { } export interface MainThreadWorkspaceShape extends IDisposable { - $startFileSearch(includePattern: string | undefined, includeFolder: URI | undefined, excludePatternOrDisregardExcludes: string | false, maxResults: number, token: CancellationToken): Promise<UriComponents[] | undefined>; + $startFileSearch(includePattern: string | undefined, includeFolder: URI | undefined, excludePatternOrDisregardExcludes: string | false | undefined, maxResults: number, token: CancellationToken): Promise<UriComponents[] | undefined>; $startTextSearch(query: IPatternInfo, options: ITextQueryBuilderOptions, requestId: number, token: CancellationToken): Promise<vscode.TextSearchComplete>; $checkExists(includes: string[], token: CancellationToken): Promise<boolean>; $saveAll(includeUntitled?: boolean): Promise<boolean>; diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts index edcbfaee62e..2c07ff2a944 100644 --- a/src/vs/workbench/api/node/extHostWorkspace.ts +++ b/src/vs/workbench/api/node/extHostWorkspace.ts @@ -405,7 +405,7 @@ export class ExtHostWorkspace implements ExtHostWorkspaceShape, IExtHostWorkspac } } - let excludePatternOrDisregardExcludes: string | false = false; + let excludePatternOrDisregardExcludes: string | false | undefined = undefined; if (exclude === null) { excludePatternOrDisregardExcludes = false; } else if (exclude) { |