development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify resolving of text

Browse source
This commit is contained in:
Daniel Imms 2021-05-13 05:49:31 -07:00
parent 10ad00891d
commit 66d817c3cc
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/platform/terminal/common/terminal.ts
View file

@ -252,7 +252,7 @@ export interface IPtyService {
export interface IRequestResolveVariablesEvent {
id: number;
text: string[];
originalText: string[];
}
export enum HeartbeatConstants {

2
src/vs/platform/terminal/node/ptyHostService.ts
View file

@ -311,7 +311,7 @@ export class PtyHostService extends Disposable implements IPtyService {
return new Promise<string[]>(resolve => {
const id = ++lastResolveVariablesRequestId;
this._pendingResolveVariablesRequests.set(id, resolve);
this._onPtyHostRequestResolveVariables.fire({ id, text });
this._onPtyHostRequestResolveVariables.fire({ id, originalText: text });
});
}
async acceptPtyHostResolvedVariables(id: number, resolved: string[]) {

4
src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts
View file

@ -135,7 +135,9 @@ export class RemoteTerminalService extends Disposable implements IRemoteTerminal
this._register(channel.onPtyHostRequestResolveVariables(async e => {
const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot(Schemas.file);
const lastActiveWorkspaceRoot = activeWorkspaceRootUri ? withNullAsUndefined(workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
const resolveCalls: Promise<string>[] = e.text.map(t => configurationResolverService.resolveAsync(lastActiveWorkspaceRoot, t));
const resolveCalls: Promise<string>[] = e.originalText.map(t => {
return configurationResolverService.resolveAsync(lastActiveWorkspaceRoot, t);
});
const result = await Promise.all(resolveCalls);
channel.acceptPtyHostResolvedVariables(e.id, result);
}));

4
src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalService.ts
View file

@ -106,7 +106,9 @@ export class LocalTerminalService extends Disposable implements ILocalTerminalSe
this._register(this._localPtyService.onPtyHostRequestResolveVariables(async e => {
const activeWorkspaceRootUri = historyService.getLastActiveWorkspaceRoot(Schemas.file);
const lastActiveWorkspaceRoot = activeWorkspaceRootUri ? withNullAsUndefined(this._workspaceContextService.getWorkspaceFolder(activeWorkspaceRootUri)) : undefined;
const resolveCalls: Promise<string>[] = e.text.map(t => configurationResolverService.resolveAsync(lastActiveWorkspaceRoot, t));
const resolveCalls: Promise<string>[] = e.originalText.map(t => {
return configurationResolverService.resolveAsync(lastActiveWorkspaceRoot, t);
});
const result = await Promise.all(resolveCalls);
this._localPtyService.acceptPtyHostResolvedVariables?.(e.id, result);
}));