Skip to content

Commit d72455b

Browse files
authored
get task reconnection to work for remote envs (microsoft#159503)
1 parent d25b8ea commit d72455b

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

src/vs/platform/terminal/common/terminal.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,9 @@ export interface IShellLaunchConfigDto {
580580
env?: ITerminalEnvironment;
581581
useShellEnvironment?: boolean;
582582
hideFromUser?: boolean;
583+
reconnectionProperties?: IReconnectionProperties;
584+
type?: 'Task' | 'Local';
585+
isFeatureTerminal?: boolean;
583586
}
584587

585588
/**

src/vs/server/node/remoteTerminalChannel.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,10 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
185185
: URI.revive(uriTransformer.transformIncoming(args.shellLaunchConfig.cwd))
186186
),
187187
env: args.shellLaunchConfig.env,
188-
useShellEnvironment: args.shellLaunchConfig.useShellEnvironment
188+
useShellEnvironment: args.shellLaunchConfig.useShellEnvironment,
189+
reconnectionProperties: args.shellLaunchConfig.reconnectionProperties,
190+
type: args.shellLaunchConfig.type,
191+
isFeatureTerminal: args.shellLaunchConfig.isFeatureTerminal
189192
};
190193

191194

src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,6 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
13231323
}
13241324
// Either no group is used, no terminal with the group exists or splitting an existing terminal failed.
13251325
const createdTerminal = await this._terminalService.createTerminal({ location: TerminalLocation.Panel, config: launchConfigs });
1326-
this._logService.trace('Created a new task terminal');
13271326
createdTerminal.onDisposed((terminal) => this._fireTaskEvent({ kind: TaskEventKind.Terminated, exitReason: terminal.exitReason, taskId: task.getRecentlyUsedKey() }));
13281327
return createdTerminal;
13291328
}

src/vs/workbench/contrib/terminal/browser/remoteTerminalBackend.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ class RemoteTerminalBackend extends BaseTerminalBackend implements ITerminalBack
209209
args: shellLaunchConfig.args,
210210
cwd: shellLaunchConfig.cwd,
211211
env: shellLaunchConfig.env,
212-
useShellEnvironment: shellLaunchConfig.useShellEnvironment
212+
useShellEnvironment: shellLaunchConfig.useShellEnvironment,
213+
reconnectionProperties: shellLaunchConfig.reconnectionProperties,
214+
type: shellLaunchConfig.type,
215+
isFeatureTerminal: shellLaunchConfig.isFeatureTerminal
213216
};
214217
const activeWorkspaceRootUri = this._historyService.getLastActiveWorkspaceRoot();
215218

0 commit comments

Comments
 (0)