ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

Browse Source 
* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files
This commit is contained in:
Anthony Dresser
2019-10-21 22:12:22 -07:00
committed by GitHub
parent 7c9be74970
commit 1e22f47304
913 changed files with 18898 additions and 16536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/vs/vscode.proposed.d.ts vendored
View File

@@ -59,15 +59,15 @@ declare module 'vscode' {
}
export class CallHierarchyIncomingCall {
source: CallHierarchyItem;
sourceRanges: Range[];
constructor(item: CallHierarchyItem, sourceRanges: Range[]);
from: CallHierarchyItem;
fromRanges: Range[];
constructor(item: CallHierarchyItem, fromRanges: Range[]);
}
export class CallHierarchyOutgoingCall {
sourceRanges: Range[];
target: CallHierarchyItem;
constructor(item: CallHierarchyItem, sourceRanges: Range[]);
fromRanges: Range[];
to: CallHierarchyItem;
constructor(item: CallHierarchyItem, fromRanges: Range[]);
}
export interface CallHierarchyItemProvider {
@@ -651,21 +651,6 @@ declare module 'vscode' {
consoleMode?: DebugConsoleMode;
}
export namespace debug {
/**
* Start debugging by using either a named launch or named compound configuration,
* or by directly passing a [DebugConfiguration](#DebugConfiguration).
* The named configurations are looked up in '.vscode/launch.json' found in the given folder.
* Before debugging starts, all unsaved files are saved and the launch configurations are brought up-to-date.
* Folder specific variables used in the configuration (e.g. '${workspaceFolder}') are resolved against the given folder.
* @param folder The [workspace folder](#WorkspaceFolder) for looking up named configurations and resolving variables or `undefined` for a non-folder setup.
* @param nameOrConfiguration Either the name of a debug or compound configuration or a [DebugConfiguration](#DebugConfiguration) object.
* @param parentSessionOrOptions Debug sesison options. When passed a parent [debug session](#DebugSession), assumes options with just this parent session.
* @return A thenable that resolves when debugging could be successfully started.
*/
export function startDebugging(folder: WorkspaceFolder | undefined, nameOrConfiguration: string | DebugConfiguration, parentSessionOrOptions?: DebugSession | DebugSessionOptions): Thenable<boolean>;
}
//#endregion
//#region Rob, Matt: logging
@@ -871,7 +856,8 @@ declare module 'vscode' {
export interface TreeView<T> {
/**
* The name of the tree view. It is set from the extension package.json and can be changed later.
* The tree view title is initially taken from the extension package.json
* Changes to the title property will be properly reflected in the UI in the title of the view.
*/
title?: string;
}
@@ -912,7 +898,7 @@ declare module 'vscode' {
/**
* Class used to execute an extension callback as a task.
*/
export class CustomExecution2 {
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
@@ -941,12 +927,12 @@ 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 | CustomExecution2, problemMatchers?: string | string[]);
constructor(taskDefinition: TaskDefinition, scope: WorkspaceFolder | TaskScope.Global | TaskScope.Workspace, name: string, source: string, execution?: ProcessExecution | ShellExecution | CustomExecution, problemMatchers?: string | string[]);
/**
* The task's execution engine
*/
execution2?: ProcessExecution | ShellExecution | CustomExecution2;
execution2?: ProcessExecution | ShellExecution | CustomExecution;
}
//#endregion
@@ -1053,36 +1039,6 @@ declare module 'vscode' {
//#endregion
// #region Ben - UIKind
/**
* Possible kinds of UI that can use extensions.
*/
export enum UIKind {
/**
* Extensions are accessed from a desktop application.
*/
Desktop = 1,
/**
* Extensions are accessed from a web browser.
*/
Web = 2
}
export namespace env {
/**
* The UI kind property indicates from which UI extensions
* are accessed from. For example, extensions could be accessed
* from a desktop application or a web browser.
*/
export const uiKind: UIKind;
}
//#endregion
//#region Custom editors, mjbvz
export interface WebviewEditor extends WebviewPanel {
@@ -1104,34 +1060,9 @@ declare module 'vscode' {
export function registerWebviewEditorProvider(
viewType: string,
provider: WebviewEditorProvider,
options?: WebviewPanelOptions
): Disposable;
}
//#endregion
// #region resolveExternalUri — mjbvz
namespace env {
/**
* Resolves an *external* uri, such as a `http:` or `https:` link, from where the extension is running to a
* uri to the same resource on the client machine.
*
* This is a no-op if the extension is running locally. Currently only supports `https:` and `http:`.
*
* If the extension is running remotely, this function automatically establishes port forwarding from
* the local machine to `target` on the remote and returns a local uri that can be used to for this connection.
*
* Extensions should not store the result of `resolveExternalUri` as the resolved uri may become invalid due to
* a system or user action — for example, in remote cases, a user may close a port that was forwarded by
* `resolveExternalUri`.
*
* Note: uris passed through `openExternal` are automatically resolved and you should not call `resolveExternalUri`
* on them.
*
* @return A uri that can be used on the client machine.
*/
export function asExternalUri(target: Uri): Thenable<Uri>;
}
//#endregion
}