test fix

aeschli · aeschli · commit 833fc7aa9973 · 2019-02-15T16:40:23.000+01:00
diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts
@@ -326,14 +326,17 @@ export class ExtHostWorkspaceProvider {
 	getRelativePath(pathOrUri: string | vscode.Uri, includeWorkspace?: boolean): string | undefined {
 
 		let resource: URI | undefined;
+		let path: string | undefined;
 		if (typeof pathOrUri === 'string') {
 			resource = URI.file(pathOrUri);
+			path = pathOrUri;
 		} else if (typeof pathOrUri !== 'undefined') {
 			resource = pathOrUri;
+			path = pathOrUri.fsPath;
 		}
 
 		if (!resource) {
-			return undefined;
+			return path;
 		}
 
 		const folder = this.getWorkspaceFolder(
@@ -342,7 +345,7 @@ export class ExtHostWorkspaceProvider {
 		);
 
 		if (!folder) {
-			return resource.fsPath;
+			return path;
 		}
 
 		if (typeof includeWorkspace === 'undefined' && this._actualWorkspace) {
diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts
@@ -195,7 +195,7 @@ export class ResourceGlobMatcher extends Disposable {
 		// but can match on "src/file.txt"
 		let resourcePathToMatch: string;
 		if (folder) {
-			resourcePathToMatch = relativePath(folder.uri, resource); // always uses forward slashes
+			resourcePathToMatch = relativePath(folder.uri, resource)!; // always uses forward slashes
 		} else {
 			resourcePathToMatch = resource.fsPath; // TODO@isidor: support non-file URIs
 		}

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ export class ResourceGlobMatcher extends Disposable {`
`195`	`195`	`// but can match on "src/file.txt"`
`196`	`196`	`let resourcePathToMatch: string;`
`197`	`197`	`if (folder) {`
`198`		`- resourcePathToMatch = relativePath(folder.uri, resource); // always uses forward slashes`
	`198`	`+ resourcePathToMatch = relativePath(folder.uri, resource)!; // always uses forward slashes`
`199`	`199`	`} else {`
`200`	`200`	`resourcePathToMatch = resource.fsPath; // TODO@isidor: support non-file URIs`
`201`	`201`	`}`