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 2c306f762bf9c3db82dc06c7afaa56ef46d72f79 (#14050)

Browse Source 
* Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79

* Fix breaks

* Extension management fixes

* Fix breaks in windows bundling

* Fix/skip failing tests

* Update distro

* Add clear to nuget.config

* Add hygiene task

* Bump distro

* Fix hygiene issue

* Add build to hygiene exclusion

* Update distro

* Update hygiene

* Hygiene exclusions

* Update tsconfig

* Bump distro for server breaks

* Update build config

* Update darwin path

* Add done calls to notebook tests

* Skip failing tests

* Disable smoke tests
This commit is contained in:
Karl Burtram
2021-02-09 16:15:05 -08:00
committed by GitHub
parent 6f192f9af5
commit ce612a3d96
1929 changed files with 68012 additions and 34564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/vs/platform/notification/common/notification.ts
View File

@@ -114,6 +114,8 @@ export interface INotificationActions {
/**
* Primary actions show up as buttons as part of the message and will close
* the notification once clicked.
*
* Pass `ActionWithMenuAction` for an action that has additional menu actions.
*/
readonly primary?: ReadonlyArray<IAction>;
@@ -209,19 +211,13 @@ export interface INotificationHandle {
close(): void;
}
export interface IPromptChoice {
interface IBasePromptChoice {
/**
* Label to show for the choice to the user.
*/
readonly label: string;
/**
* Primary choices show up as buttons in the notification below the message.
* Secondary choices show up under the gear icon in the header of the notification.
*/
readonly isSecondary?: boolean;
/**
* Whether to keep the notification open after the choice was selected
* by the user. By default, will close the notification upon click.
@@ -234,6 +230,28 @@ export interface IPromptChoice {
run: () => void;
}
export interface IPromptChoice extends IBasePromptChoice {
/**
* Primary choices show up as buttons in the notification below the message.
* Secondary choices show up under the gear icon in the header of the notification.
*/
readonly isSecondary?: boolean;
}
export interface IPromptChoiceWithMenu extends IPromptChoice {
/**
* Additional choices those will be shown in the dropdown menu for this choice.
*/
readonly menu: IBasePromptChoice[];
/**
* Menu is not supported on secondary choices
*/
readonly isSecondary: false | undefined;
}
export interface IPromptOptions extends INotificationProperties {
/**
@@ -327,7 +345,7 @@ export interface INotificationService {
*
* @returns a handle on the notification to e.g. hide it or update message, buttons, etc.
*/
prompt(severity: Severity, message: string, choices: IPromptChoice[], options?: IPromptOptions): INotificationHandle;
prompt(severity: Severity, message: string, choices: (IPromptChoice | IPromptChoiceWithMenu)[], options?: IPromptOptions): INotificationHandle;
/**
* Shows a status message in the status area with the provided text.