Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-15 07:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ghostty for linux as well

Browse Source
This commit is contained in:
Anthony Kim
2026-02-11 22:46:04 -08:00
parent 882653b403
commit bee7a9bdf4
2 changed files with 82 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/vs/platform/externalTerminal/node/externalTerminalService.ts
View File

@@ -239,11 +239,24 @@ export class LinuxExternalTerminalService extends ExternalTerminalService implem
const execPromise = settings.linuxExec ? Promise.resolve(settings.linuxExec) : LinuxExternalTerminalService.getDefaultTerminalLinuxReady();
return new Promise<number | undefined>((resolve, reject) => {
const termArgs: string[] = [];
//termArgs.push('--title');
//termArgs.push(`"${TERMINAL_TITLE}"`);
execPromise.then(exec => {
const basename = path.basename(exec).toLowerCase();
if (basename === 'ghostty') {
const ghosttyArgs: string[] = [];
if (dir) {
ghosttyArgs.push(`--working-directory=${dir}`);
}
ghosttyArgs.push('--wait-after-command=true');
if (args.length) {
ghosttyArgs.push('-e', ...args);
}
LinuxExternalTerminalService.spawnTerminalWithEnv(exec, ghosttyArgs, dir, envVars, resolve, reject);
return;
}
const termArgs: string[] = [];
//termArgs.push('--title');
//termArgs.push(`"${TERMINAL_TITLE}"`);
if (exec.indexOf('gnome-terminal') >= 0) {
termArgs.push('-x');
} else {
@@ -256,41 +269,51 @@ export class LinuxExternalTerminalService extends ExternalTerminalService implem
termArgs.push(`''${bashCommand}''`); // wrapping argument in two sets of ' because node is so "friendly" that it removes one set...
// merge environment variables into a copy of the process.env
const env = Object.assign({}, getSanitizedEnvironment(process), envVars);
// delete environment variables that have a null value
Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]);
const options = {
cwd: dir,
env: env
};
let stderr = '';
const cmd = cp.spawn(exec, termArgs, options);
cmd.on('error', err => {
reject(improveError(err));
});
cmd.stderr.on('data', (data) => {
stderr += data.toString();
});
cmd.on('exit', (code: number) => {
if (code === 0) { // OK
resolve(undefined);
} else {
if (stderr) {
const lines = stderr.split('\n', 1);
reject(new Error(lines[0]));
} else {
reject(new Error(nls.localize('linux.term.failed', "'{0}' failed with exit code {1}", exec, code)));
}
}
});
LinuxExternalTerminalService.spawnTerminalWithEnv(exec, termArgs, dir, envVars, resolve, reject);
});
});
}
private static spawnTerminalWithEnv(
exec: string,
args: string[],
dir: string,
envVars: ITerminalEnvironment,
resolve: (value: number | PromiseLike<number | undefined> | undefined) => void,
reject: (reason?: unknown) => void
): void {
const env = Object.assign({}, getSanitizedEnvironment(process), envVars);
// delete environment variables that have a null value
Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]);
const options = {
cwd: dir,
env: env
};
let stderr = '';
const cmd = cp.spawn(exec, args, options);
cmd.on('error', err => {
reject(improveError(err));
});
cmd.stderr.on('data', (data) => {
stderr += data.toString();
});
cmd.on('exit', (code: number) => {
if (code === 0) {
resolve(undefined);
} else {
if (stderr) {
const lines = stderr.split('\n', 1);
reject(new Error(lines[0]));
} else {
reject(new Error(nls.localize('linux.term.failed', "'{0}' failed with exit code {1}", exec, code)));
}
}
});
}
private static _DEFAULT_TERMINAL_LINUX_READY: Promise<string>;
public static async getDefaultTerminalLinuxReady(): Promise<string> {
@@ -325,7 +348,9 @@ export class LinuxExternalTerminalService extends ExternalTerminalService implem
return new Promise<void>((c, e) => {
execPromise.then(exec => {
const env = getSanitizedEnvironment(process);
const child = spawner.spawn(exec, [], { cwd, env });
const basename = path.basename(exec).toLowerCase();
const args = basename === 'ghostty' && cwd ? [`--working-directory=${cwd}`] : [];
const child = spawner.spawn(exec, args, { cwd, env });
child.on('error', e);
child.on('exit', () => c());
});

21
src/vs/platform/externalTerminal/test/node/externalTerminalService.test.ts
View File

@@ -208,6 +208,27 @@ suite('ExternalTerminalService', () => {
);
});
test(`LinuxTerminalService - Ghostty should be spawned with working directory`, done => {
const testCwd = 'path/to/workspace';
const mockSpawner: any = {
spawn: (command: any, args: any, opts: any) => {
strictEqual(command, 'ghostty');
deepStrictEqual(args, [`--working-directory=${testCwd}`]);
strictEqual(opts.cwd, testCwd);
done();
return {
on: (evt: any) => evt
};
}
};
const testService = new LinuxExternalTerminalService();
testService.spawnTerminal(
mockSpawner,
{ linuxExec: 'ghostty' },
testCwd
);
});
test(`LinuxTerminalService - uses default terminal when configuration.terminal.external.linuxExec is undefined`, done => {
LinuxExternalTerminalService.getDefaultTerminalLinuxReady().then(defaultTerminalLinux => {
const testCwd = 'path/to/workspace';