Merge remote-tracking branch 'upstream/master' into user/gabrield/extensionCallbackAsTask

This commit is contained in:
Gabriel DeBacker
2019-03-06 10:30:14 -08:00
30 changed files with 408 additions and 336 deletions

View File

@@ -527,7 +527,7 @@ export function createApiFactory(
onDidChangeWorkspaceFolders: function (listener, thisArgs?, disposables?) {
return extHostWorkspace.onDidChangeWorkspace(listener, thisArgs, disposables);
},
asRelativePath: (pathOrUri, includeWorkspace) => {
asRelativePath: (pathOrUri, includeWorkspace?) => {
return extHostWorkspace.getRelativePath(pathOrUri, includeWorkspace);
},
findFiles: (include, exclude, maxResults?, token?) => {