mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-04-01 01:20:31 -04:00
Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)
This commit is contained in:
@@ -76,6 +76,11 @@ export interface ITerminalConfiguration {
|
||||
osx: string | null;
|
||||
windows: string | null;
|
||||
};
|
||||
automationShell: {
|
||||
linux: string | null;
|
||||
osx: string | null;
|
||||
windows: string | null;
|
||||
};
|
||||
shellArgs: {
|
||||
linux: string[];
|
||||
osx: string[];
|
||||
@@ -187,11 +192,6 @@ export interface IShellLaunchConfig {
|
||||
*/
|
||||
initialText?: string;
|
||||
|
||||
/**
|
||||
* @deprecated use `isExtensionTerminal`
|
||||
*/
|
||||
isRendererOnly?: boolean;
|
||||
|
||||
/**
|
||||
* Whether an extension is controlling the terminal via a `vscode.Pseudoterminal`.
|
||||
*/
|
||||
@@ -244,16 +244,10 @@ export interface ITerminalService {
|
||||
*/
|
||||
createTerminal(shell?: IShellLaunchConfig): ITerminalInstance;
|
||||
|
||||
/**
|
||||
* Creates a terminal renderer.
|
||||
* @param name The name of the terminal.
|
||||
*/
|
||||
createTerminalRenderer(name: string): ITerminalInstance;
|
||||
|
||||
/**
|
||||
* Creates a raw terminal instance, this should not be used outside of the terminal part.
|
||||
*/
|
||||
createInstance(terminalFocusContextKey: IContextKey<boolean>, configHelper: ITerminalConfigHelper, container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
|
||||
createInstance(container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
|
||||
getInstanceFromId(terminalId: number): ITerminalInstance | undefined;
|
||||
getInstanceFromIndex(terminalIndex: number): ITerminalInstance;
|
||||
getTabLabels(): string[];
|
||||
@@ -422,13 +416,6 @@ export interface ITerminalInstance {
|
||||
*/
|
||||
onData: Event<string>;
|
||||
|
||||
/**
|
||||
* Attach a listener to the "renderer" input event, this event fires for terminal renderers on
|
||||
* keystrokes and when the Terminal.sendText extension API is used.
|
||||
* @param listener The listener function.
|
||||
*/
|
||||
onRendererInput: Event<string>;
|
||||
|
||||
/**
|
||||
* Attach a listener to listen for new lines added to this terminal instance.
|
||||
*
|
||||
@@ -483,7 +470,7 @@ export interface ITerminalInstance {
|
||||
* An object that tracks when commands are run and enables navigating and selecting between
|
||||
* them.
|
||||
*/
|
||||
readonly commandTracker: ITerminalCommandTracker;
|
||||
readonly commandTracker: ICommandTracker | undefined;
|
||||
|
||||
readonly navigationMode: INavigationMode | undefined;
|
||||
|
||||
@@ -497,14 +484,6 @@ export interface ITerminalInstance {
|
||||
*/
|
||||
dispose(immediate?: boolean): void;
|
||||
|
||||
/**
|
||||
* Indicates that a consumer of a renderer only terminal is finished with it.
|
||||
*
|
||||
* @param exitCode The exit code of the terminal. Zero indicates success, non-zero indicates
|
||||
* failure.
|
||||
*/
|
||||
rendererExit(exitCode: number): void;
|
||||
|
||||
/**
|
||||
* Forces the terminal to redraw its viewport.
|
||||
*/
|
||||
@@ -671,7 +650,7 @@ export interface ITerminalInstance {
|
||||
getCwd(): Promise<string>;
|
||||
}
|
||||
|
||||
export interface ITerminalCommandTracker {
|
||||
export interface ICommandTracker {
|
||||
scrollToPreviousCommand(): void;
|
||||
scrollToNextCommand(): void;
|
||||
selectToPreviousCommand(): void;
|
||||
@@ -697,7 +676,7 @@ export interface IBeforeProcessDataEvent {
|
||||
export interface ITerminalProcessManager extends IDisposable {
|
||||
readonly processState: ProcessState;
|
||||
readonly ptyProcessReady: Promise<void>;
|
||||
readonly shellProcessId: number;
|
||||
readonly shellProcessId: number | undefined;
|
||||
readonly remoteAuthority: string | undefined;
|
||||
readonly os: OperatingSystem | undefined;
|
||||
readonly userHome: string | undefined;
|
||||
@@ -780,7 +759,8 @@ export interface IAvailableShellsRequest {
|
||||
}
|
||||
|
||||
export interface IDefaultShellAndArgsRequest {
|
||||
(shell: string, args: string[] | string | undefined): void;
|
||||
useAutomationShell: boolean;
|
||||
callback: (shell: string, args: string[] | string | undefined) => void;
|
||||
}
|
||||
|
||||
export enum LinuxDistro {
|
||||
|
||||
Reference in New Issue
Block a user