Merge from vscode f5d3ffa6a0d655c87e1eb0e1e90773df58f7ff25 (#7929)

* Merge from vscode f5d3ffa6a0d655c87e1eb0e1e90773df58f7ff25

* fix launch script

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-22 21:49:55 -07:00
committed by GitHub
parent 4a68ab4659
commit a94cbb528e
189 changed files with 1976 additions and 1541 deletions

29
src/vs/vscode.d.ts vendored
View File

@@ -5241,6 +5241,22 @@ declare module 'vscode' {
options?: ShellExecutionOptions;
}
/**
* Class used to execute an extension callback as a task.
*/
export class CustomExecution {
/**
* Constructs a CustomExecution task object. The callback will be executed the task is run, at which point the
* extension should return the Pseudoterminal it will "run in". The task should wait to do further execution until
* [Pseudoterminal.open](#Pseudoterminal.open) is called. Task cancellation should be handled using
* [Pseudoterminal.close](#Pseudoterminal.close). When the task is complete fire
* [Pseudoterminal.onDidClose](#Pseudoterminal.onDidClose).
* @param process The [Pseudoterminal](#Pseudoterminal) to be used by the task to display output.
* @param callback The callback that will be called when the task is started by a user.
*/
constructor(callback: () => Thenable<Pseudoterminal>);
}
/**
* The scope of a task.
*/
@@ -5283,7 +5299,7 @@ declare module 'vscode' {
* or '$eslint'. Problem matchers can be contributed by an extension using
* the `problemMatchers` extension point.
*/
constructor(taskDefinition: TaskDefinition, scope: WorkspaceFolder | TaskScope.Global | TaskScope.Workspace, name: string, source: string, execution?: ProcessExecution | ShellExecution, problemMatchers?: string | string[]);
constructor(taskDefinition: TaskDefinition, scope: WorkspaceFolder | TaskScope.Global | TaskScope.Workspace, name: string, source: string, execution?: ProcessExecution | ShellExecution | CustomExecution, problemMatchers?: string | string[]);
/**
* ~~Creates a new task.~~
@@ -5318,7 +5334,7 @@ declare module 'vscode' {
/**
* The task's execution engine
*/
execution?: ProcessExecution | ShellExecution;
execution?: ProcessExecution | ShellExecution | CustomExecution;
/**
* Whether the task is a background task or not.
@@ -6259,8 +6275,11 @@ declare module 'vscode' {
export const uiKind: UIKind;
/**
* Opens an *external* item, e.g. a http(s) or mailto-link, using the
* default application.
* Opens a link externally using the default application. Depending on the
* used scheme this can be:
* * a browser (`http:`, `https:`)
* * a mail client (`mailto:`)
* * VSCode itself (`vscode:` from `vscode.env.uriScheme`)
*
* *Note* that [`showTextDocument`](#window.showTextDocument) is the right
* way to open a text document inside the editor, not this function.
@@ -6285,7 +6304,7 @@ declare module 'vscode' {
* a system or user action — for example, in remote cases, a user may close a port forwardng tunnel
* that was opened by `asExternalUri`.
*
* Note: uris passed through `openExternal` are automatically resolved and you should not call `asExternalUri`
* *Note* that uris passed through `openExternal` are automatically resolved and you should not call `asExternalUri`
* on them.
*
* @return A uri that can be used on the client machine.