Merge branch 'joh/next'

jrieken · jrieken · commit 3a68dedf805e · 2016-09-05T11:08:09.000+02:00
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
@@ -1434,7 +1434,7 @@ declare namespace vscode {
 		 * @return A human readable string which is presented as diagnostic message.
 		 * Return `undefined`, `null`, or the empty string when 'value' is valid.
 		 */
-		validateInput?: (value: string) => string;
+		validateInput?(value: string): string;
 	}
 
 	/**
@@ -1843,7 +1843,7 @@ declare namespace vscode {
 		 * @return The resolved symbol or a thenable that resolves to that. When no result is returned,
 		 * the given `symbol` is used.
 		 */
-		resolveWorkspaceSymbol?: (symbol: SymbolInformation, token: CancellationToken) => SymbolInformation | Thenable<SymbolInformation>;
+		resolveWorkspaceSymbol?(symbol: SymbolInformation, token: CancellationToken): SymbolInformation | Thenable<SymbolInformation>;
 	}
 
 	/**
@@ -2445,7 +2445,7 @@ declare namespace vscode {
 		 * @param link The link that is to be resolved.
 		 * @param token A cancellation token.
 		 */
-		resolveDocumentLink?: (link: DocumentLink, token: CancellationToken) => DocumentLink | Thenable<DocumentLink>;
+		resolveDocumentLink?(link: DocumentLink, token: CancellationToken): DocumentLink | Thenable<DocumentLink>;
 	}
 
 	/**
diff --git a/src/vs/workbench/api/node/extHostWorkspace.ts b/src/vs/workbench/api/node/extHostWorkspace.ts
@@ -39,7 +39,7 @@ export class ExtHostWorkspace {
 		}
 
 		if (isEqualOrParent(path, this._workspacePath)) {
-			return relative(this._workspacePath, path);
+			return relative(this._workspacePath, path) || path;
 		}
 
 		return path;
diff --git a/src/vs/workbench/test/node/api/extHostWorkspace.test.ts b/src/vs/workbench/test/node/api/extHostWorkspace.test.ts
@@ -20,4 +20,16 @@ suite('ExtHostWorkspace', function () {
 			'm:/Apps/DartPubCache/hosted/pub.dartlang.org/convert-2.0.1/lib/src/hex.dart');
 
 	});
+
+	test('asRelativePath, same paths, #11402', function () {
+		const root = '/home/aeschli/workspaces/samples/docker';
+		const input = '/home/aeschli/workspaces/samples/docker';
+		const ws = new ExtHostWorkspace(new TestThreadService(), root);
+
+		assert.equal(ws.getRelativePath(input), input);
+
+		const input2 = '/home/aeschli/workspaces/samples/docker/a.file';
+		assert.equal(ws.getRelativePath(input2), 'a.file');
+
+	});
 });

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class ExtHostWorkspace {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`if (isEqualOrParent(path, this._workspacePath)) {`
`42`		`- return relative(this._workspacePath, path);`
	`42`	`+ return relative(this._workspacePath, path) \|\| path;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return path;`