From 6f4294e52585bb759f2c83456e32ca35db702132 Mon Sep 17 00:00:00 2001
From: Mark Pearce <mark.pearce@redspace.com>
Date: Wed, 15 Mar 2017 15:55:28 -0300
Subject: [PATCH] Fixed condition for if workspace exists

---
 .../terminal/electron-browser/terminalLinkHandler.ts      | 4 ++--
 .../test/electron-browser/terminalLinkHandler.test.ts     | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
index cc83f1f9666..429bd52a0cd 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
@@ -140,7 +140,7 @@ export class TerminalLinkHandler {
 
 			//resolve relative paths
 			if (!link.match('^' + winDrivePrefix)) {
-				if (!this._contextService.hasWorkspace) {
+				if (!this._contextService.hasWorkspace()) {
 					// Abort if no workspace is open
 					return null;
 				}
@@ -149,7 +149,7 @@ export class TerminalLinkHandler {
 		}
 		// Resolve workspace path . | .. | <relative_path> -> <path>/. | <path>/.. | <path>/<relative_path>
 		else if (link.charAt(0) !== '/' && link.charAt(0) !== '~') {
-			if (!this._contextService.hasWorkspace) {
+			if (!this._contextService.hasWorkspace()) {
 				// Abort if no workspace is open
 				return null;
 			}
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
index 51870a1e88a..d1f9e615edf 100644
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
+++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
@@ -113,5 +113,13 @@ suite('Workbench - TerminalLinkHandler', () => {
 			assert.equal(linkHandler.preprocessPath('/absolute/path/file3'), '/absolute/path/file3');
 			stub.restore();
 		});
+
+		test('No Workspace', () => {
+			const linkHandler = new TestTerminalLinkHandler(null, new TestXterm(), Platform.Linux, null, new WorkspaceContextService(null));
+
+			assert.equal(linkHandler.preprocessPath('./src/file1'), null);
+			assert.equal(linkHandler.preprocessPath('src/file2'), null);
+			assert.equal(linkHandler.preprocessPath('/absolute/path/file3'), '/absolute/path/file3');
+		});
 	});
 });
\ No newline at end of file
-- 
GitLab