bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(lib/vscode): fix terminalLayoutInfoArgs 

It looks like before, the ISetTerminalLAyoutInfoArgs and
IGetTerminalLayoutInfoArgs were part of the terminal interface, but now they're
just interfaces so this commit fixes the imports to get them from
vs/platform/terminal/common/terminalProcess.
This commit is contained in:
Joe Previte 2021-03-11 15:26:05 -07:00
parent e5b7438695
commit dc08bc68c6
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/vscode/src/vs/server/node/channel.ts
View File

@ -33,6 +33,7 @@ import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBu
import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment'; import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
import { getMainProcessParentEnv } from 'vs/workbench/contrib/terminal/node/terminalEnvironment'; import { getMainProcessParentEnv } from 'vs/workbench/contrib/terminal/node/terminalEnvironment';
import { TerminalProcess } from 'vs/platform/terminal/node/terminalProcess'; import { TerminalProcess } from 'vs/platform/terminal/node/terminalProcess';
import { ISetTerminalLayoutInfoArgs, IGetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess'
import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver'; import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
import { ExtensionScanner, ExtensionScannerInput } from 'vs/workbench/services/extensions/node/extensionPoints'; import { ExtensionScanner, ExtensionScannerInput } from 'vs/workbench/services/extensions/node/extensionPoints';
@ -639,7 +640,7 @@ export class TerminalProviderChannel implements IServerChannel<RemoteAgentConnec
private readonly terminals = new Map<number, Terminal>(); private readonly terminals = new Map<number, Terminal>();
private id = 0; private id = 0;
private readonly layouts = new Map<string, terminal.ISetTerminalLayoutInfoArgs>(); private readonly layouts = new Map<string, ISetTerminalLayoutInfoArgs>();
public constructor (private readonly logService: ILogService) { public constructor (private readonly logService: ILogService) {
@ -876,11 +877,11 @@ export class TerminalProviderChannel implements IServerChannel<RemoteAgentConnec
return terminals.filter((t) => t.isOrphan); return terminals.filter((t) => t.isOrphan);
} }
public async setTerminalLayoutInfo(args: terminal.ISetTerminalLayoutInfoArgs): Promise<void> { public async setTerminalLayoutInfo(args: ISetTerminalLayoutInfoArgs): Promise<void> {
this.layouts.set(args.workspaceId, args); this.layouts.set(args.workspaceId, args);
} }
public async getTerminalLayoutInfo(args: terminal.IGetTerminalLayoutInfoArgs): Promise<ITerminalsLayoutInfo | undefined> { public async getTerminalLayoutInfo(args: IGetTerminalLayoutInfoArgs): Promise<ITerminalsLayoutInfo | undefined> {
const layout = this.layouts.get(args.workspaceId); const layout = this.layouts.get(args.workspaceId);
if (!layout) { if (!layout) {
return undefined; return undefined;