Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support relative paths #332

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Support relative paths #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions extension/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@ 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) {
this.taskExecution = await vscode.tasks.executeTask(task);
}
}
}

Expand Down
33 changes: 26 additions & 7 deletions extension/src/tasks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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');
}
Expand Down Expand Up @@ -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,
Expand All @@ -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,
};
Expand Down