mirror of
https://github.com/Microsoft/vscode
synced 2024-09-13 21:55:38 +00:00
parent
58f4c35891
commit
bd67e21e3a
|
@ -83,7 +83,7 @@
|
||||||
"native-is-elevated": "0.6.0",
|
"native-is-elevated": "0.6.0",
|
||||||
"native-keymap": "^3.3.2",
|
"native-keymap": "^3.3.2",
|
||||||
"native-watchdog": "^1.4.1",
|
"native-watchdog": "^1.4.1",
|
||||||
"node-pty": "0.11.0-beta32",
|
"node-pty": "0.11.0-beta33",
|
||||||
"tas-client-umd": "0.1.8",
|
"tas-client-umd": "0.1.8",
|
||||||
"v8-inspect-profiler": "^0.1.0",
|
"v8-inspect-profiler": "^0.1.0",
|
||||||
"vscode-oniguruma": "1.7.0",
|
"vscode-oniguruma": "1.7.0",
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
"keytar": "7.9.0",
|
"keytar": "7.9.0",
|
||||||
"minimist": "^1.2.6",
|
"minimist": "^1.2.6",
|
||||||
"native-watchdog": "^1.4.1",
|
"native-watchdog": "^1.4.1",
|
||||||
"node-pty": "0.11.0-beta32",
|
"node-pty": "0.11.0-beta33",
|
||||||
"tas-client-umd": "0.1.8",
|
"tas-client-umd": "0.1.8",
|
||||||
"vscode-oniguruma": "1.7.0",
|
"vscode-oniguruma": "1.7.0",
|
||||||
"vscode-regexpp": "^3.1.0",
|
"vscode-regexpp": "^3.1.0",
|
||||||
|
|
|
@ -537,10 +537,10 @@ node-gyp-build@^4.3.0:
|
||||||
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
|
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
|
||||||
integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
|
integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
|
||||||
|
|
||||||
node-pty@0.11.0-beta32:
|
node-pty@0.11.0-beta33:
|
||||||
version "0.11.0-beta32"
|
version "0.11.0-beta33"
|
||||||
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta32.tgz#49c0f174f600ac3f54a21df2a41b6f78256ff6ce"
|
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta33.tgz#722a729fb9449f591279bee1f8b431b71a9af4a1"
|
||||||
integrity sha512-xtzB4/jYH64ksdVatYQnaU3TtCtSaDiiZPsZITmLHnywFSpI2bgfyj/bu6ofOXbe8PTtziL8bDn1U3xkRmx3mg==
|
integrity sha512-SoP5BbSfvc8Um51rIriUEOPvMltc43iTaKXGJaJKLR3+NfQbjcCcNQGyOd9P9pvBccWYg+Rncv18qMtJKIAi1Q==
|
||||||
dependencies:
|
dependencies:
|
||||||
nan "^2.17.0"
|
nan "^2.17.0"
|
||||||
|
|
||||||
|
|
|
@ -707,7 +707,7 @@ export interface ITerminalChildProcess {
|
||||||
input(data: string): void;
|
input(data: string): void;
|
||||||
processBinary(data: string): Promise<void>;
|
processBinary(data: string): Promise<void>;
|
||||||
resize(cols: number, rows: number): void;
|
resize(cols: number, rows: number): void;
|
||||||
clearBuffer?(): Promise<void>;
|
clearBuffer(): void | Promise<void>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Acknowledge a data event has been parsed by the terminal, this is used to implement flow
|
* Acknowledge a data event has been parsed by the terminal, this is used to implement flow
|
||||||
|
|
|
@ -759,6 +759,7 @@ class PersistentTerminalProcess extends Disposable {
|
||||||
}
|
}
|
||||||
async clearBuffer(): Promise<void> {
|
async clearBuffer(): Promise<void> {
|
||||||
this._serializer.clearBuffer();
|
this._serializer.clearBuffer();
|
||||||
|
this._terminalProcess.clearBuffer();
|
||||||
}
|
}
|
||||||
setUnicodeVersion(version: '6' | '11'): void {
|
setUnicodeVersion(version: '6' | '11'): void {
|
||||||
this.unicodeVersion = version;
|
this.unicodeVersion = version;
|
||||||
|
|
|
@ -552,6 +552,10 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clearBuffer(): void {
|
||||||
|
this._ptyProcess?.clear();
|
||||||
|
}
|
||||||
|
|
||||||
acknowledgeDataEvent(charCount: number): void {
|
acknowledgeDataEvent(charCount: number): void {
|
||||||
// Prevent lower than 0 to heal from errors
|
// Prevent lower than 0 to heal from errors
|
||||||
this._unacknowledgedCharCount = Math.max(this._unacknowledgedCharCount - charCount, 0);
|
this._unacknowledgedCharCount = Math.max(this._unacknowledgedCharCount - charCount, 0);
|
||||||
|
|
|
@ -288,6 +288,10 @@ class ExtHostPseudoterminal implements ITerminalChildProcess {
|
||||||
this._pty.setDimensions?.({ columns: cols, rows });
|
this._pty.setDimensions?.({ columns: cols, rows });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clearBuffer(): void | Promise<void> {
|
||||||
|
// no-op
|
||||||
|
}
|
||||||
|
|
||||||
async processBinary(data: string): Promise<void> {
|
async processBinary(data: string): Promise<void> {
|
||||||
// No-op, processBinary is not supported in extension owned terminals.
|
// No-op, processBinary is not supported in extension owned terminals.
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,6 +107,10 @@ export class RemotePty extends Disposable implements ITerminalChildProcess {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async clearBuffer(): Promise<void> {
|
||||||
|
await this._remoteTerminalChannel.clearBuffer(this.id);
|
||||||
|
}
|
||||||
|
|
||||||
freePortKillProcess(port: string): Promise<{ port: string; processId: string }> {
|
freePortKillProcess(port: string): Promise<{ port: string; processId: string }> {
|
||||||
if (!this._remoteTerminalChannel.freePortKillProcess) {
|
if (!this._remoteTerminalChannel.freePortKillProcess) {
|
||||||
throw new Error('freePortKillProcess does not exist on the local pty service');
|
throw new Error('freePortKillProcess does not exist on the local pty service');
|
||||||
|
|
|
@ -134,6 +134,10 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
|
||||||
this._onResize.fire({ cols, rows });
|
this._onResize.fire({ cols, rows });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
clearBuffer(): void | Promise<void> {
|
||||||
|
// no-op
|
||||||
|
}
|
||||||
|
|
||||||
acknowledgeDataEvent(): void {
|
acknowledgeDataEvent(): void {
|
||||||
// Flow control is disabled for extension terminals
|
// Flow control is disabled for extension terminals
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,6 +46,7 @@ class TestTerminalChildProcess implements ITerminalChildProcess {
|
||||||
shutdown(immediate: boolean): void { }
|
shutdown(immediate: boolean): void { }
|
||||||
input(data: string): void { }
|
input(data: string): void { }
|
||||||
resize(cols: number, rows: number): void { }
|
resize(cols: number, rows: number): void { }
|
||||||
|
clearBuffer(): void { }
|
||||||
acknowledgeDataEvent(charCount: number): void { }
|
acknowledgeDataEvent(charCount: number): void { }
|
||||||
async setUnicodeVersion(version: '6' | '11'): Promise<void> { }
|
async setUnicodeVersion(version: '6' | '11'): Promise<void> { }
|
||||||
async getInitialCwd(): Promise<string> { return ''; }
|
async getInitialCwd(): Promise<string> { return ''; }
|
||||||
|
|
|
@ -259,6 +259,9 @@ class TestOutputProcess extends Disposable implements ITerminalChildProcess {
|
||||||
public resize(): void {
|
public resize(): void {
|
||||||
// no-op
|
// no-op
|
||||||
}
|
}
|
||||||
|
public clearBuffer(): void | Promise<void> {
|
||||||
|
// no-op
|
||||||
|
}
|
||||||
public acknowledgeDataEvent(): void {
|
public acknowledgeDataEvent(): void {
|
||||||
// no-op, flow control not currently implemented
|
// no-op, flow control not currently implemented
|
||||||
}
|
}
|
||||||
|
|
|
@ -124,6 +124,9 @@ class EmbedderTerminalProcess extends Disposable implements ITerminalChildProces
|
||||||
resize(): void {
|
resize(): void {
|
||||||
// no-op
|
// no-op
|
||||||
}
|
}
|
||||||
|
clearBuffer(): void | Promise<void> {
|
||||||
|
// no-op
|
||||||
|
}
|
||||||
acknowledgeDataEvent(): void {
|
acknowledgeDataEvent(): void {
|
||||||
// no-op, flow control not currently implemented
|
// no-op, flow control not currently implemented
|
||||||
}
|
}
|
||||||
|
|
|
@ -6973,10 +6973,10 @@ node-gyp-build@^4.3.0:
|
||||||
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
|
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
|
||||||
integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
|
integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
|
||||||
|
|
||||||
node-pty@0.11.0-beta32:
|
node-pty@0.11.0-beta33:
|
||||||
version "0.11.0-beta32"
|
version "0.11.0-beta33"
|
||||||
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta32.tgz#49c0f174f600ac3f54a21df2a41b6f78256ff6ce"
|
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta33.tgz#722a729fb9449f591279bee1f8b431b71a9af4a1"
|
||||||
integrity sha512-xtzB4/jYH64ksdVatYQnaU3TtCtSaDiiZPsZITmLHnywFSpI2bgfyj/bu6ofOXbe8PTtziL8bDn1U3xkRmx3mg==
|
integrity sha512-SoP5BbSfvc8Um51rIriUEOPvMltc43iTaKXGJaJKLR3+NfQbjcCcNQGyOd9P9pvBccWYg+Rncv18qMtJKIAi1Q==
|
||||||
dependencies:
|
dependencies:
|
||||||
nan "^2.17.0"
|
nan "^2.17.0"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue