From b8a813d602b02f5230cf024d7546dbfc4e0d7792 Mon Sep 17 00:00:00 2001
From: Richard Willis <willis.rh@gmail.com>
Date: Tue, 5 May 2020 18:35:02 +0100
Subject: [PATCH] Support relative paths

---
 extension/src/server.ts | 10 +++++++---
 extension/src/tasks.ts  | 33 ++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/extension/src/server.ts b/extension/src/server.ts
index edcc25a93..a38bc8896 100644
--- a/extension/src/server.ts
+++ b/extension/src/server.ts
@@ -55,11 +55,15 @@ export class GradleTasksServer implements vscode.Disposable {
       this.fireOnReady();
     } else {
       this.port = await getPort();
-      const cwd = this.context.asAbsolutePath('lib');
-      const task = buildGradleServerTask(SERVER_TASK_NAME, cwd, [
+      const executableDir = this.context.asAbsolutePath('lib');
+      const task = buildGradleServerTask(SERVER_TASK_NAME, executableDir, [
         String(this.port),
       ]);
-      this.taskExecution = await vscode.tasks.executeTask(task);
+      if (!task) {
+        logger.error('No workspace folers');
+      } else {
+        this.taskExecution = await vscode.tasks.executeTask(task);
+      }
     }
   }
 
diff --git a/extension/src/tasks.ts b/extension/src/tasks.ts
index 36ce43748..04356381e 100644
--- a/extension/src/tasks.ts
+++ b/extension/src/tasks.ts
@@ -1,3 +1,4 @@
+import * as path from 'path';
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import * as getPort from 'get-port';
@@ -361,9 +362,9 @@ export function isWorkspaceFolder(value: any): value is vscode.WorkspaceFolder {
 export function getGradleTasksServerCommand(): string {
   const platform = process.platform;
   if (platform === 'win32') {
-    return '.\\tasks-server.bat';
+    return 'tasks-server.bat';
   } else if (platform === 'linux' || platform === 'darwin') {
-    return './tasks-server';
+    return 'tasks-server';
   } else {
     throw new Error('Unsupported platform');
   }
@@ -553,12 +554,26 @@ export function cloneTask(
 
 export function buildGradleServerTask(
   taskName: string,
-  cwd: string,
+  executableDir: string,
   args: string[] = []
-): vscode.Task {
-  const cmd = `"${getGradleTasksServerCommand()}"`;
+): vscode.Task | undefined {
+  const workspaceFolders = vscode.workspace.workspaceFolders;
+  if (!workspaceFolders) {
+    return;
+  }
+
+  // Quotes are needed to prevent vscode from "normalising" paths
+  // (eg back-slashes are removed if using git bash on Windows)
+  const cmd = `"${path.join(executableDir, getGradleTasksServerCommand())}"`;
+
+  // cwd is set to the workspace root to support relative paths
+  // This means we can only support relative paths for 1 workspace folder
+  // and breaks multi-root workspaces. What to do?
+  const cwd = workspaceFolders[0].uri.fsPath;
+
   logger.debug(`Gradle Tasks Server dir: ${cwd}`);
   logger.debug(`Gradle Tasks Server cmd: ${cmd} ${args}`);
+
   const taskType = 'gradle';
   const definition = {
     type: taskType,
@@ -577,12 +592,16 @@ export function buildGradleServerTask(
     taskType,
     new vscode.ShellExecution(cmd, args, { cwd, env })
   );
-  // task.isBackground = true; // this hides errors on task start
+
+  // Allow the user to see stdout/stderr messages for this task in the terminal panel
+  task.isBackground = false;
+
   task.source = taskType;
   task.presentationOptions = {
     reveal: vscode.TaskRevealKind.Never,
     focus: false,
-    echo: true,
+    // The command is an absolute path and not very useful to echo
+    echo: false,
     clear: false,
     panel: vscode.TaskPanelKind.Shared,
   };