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

VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)

Browse Source 
* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9

* delete unused folders

* distro

* Bump build node version

* update chokidar

* FIx hygiene errors

* distro

* Fix extension lint issues

* Remove strict-vscode

* Add copyright header exemptions

* Bump vscode-extension-telemetry to fix webpacking issue with zone.js

* distro

* Fix failing tests (revert marked.js back to current one until we decide to update)

* Skip searchmodel test

* Fix mac build

* temp debug script loading

* Try disabling coverage

* log error too

* Revert "log error too"

This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f.

* Revert "temp debug script loading"

This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c.

* Add comments explaining coverage disabling

* Fix ansi_up loading issue

* Merge latest from ads

* Use newer option

* Fix compile

* add debug logging warn

* Always log stack

* log more

* undo debug

* Update to use correct base path (+cleanup)

* distro

* fix compile errors

* Remove strict-vscode

* Fix sql editors not showing

* Show db dropdown input & fix styling

* Fix more info in gallery

* Fix gallery asset requests

* Delete unused workflow

* Fix tapable resolutions for smoke test compile error

* Fix smoke compile

* Disable crash reporting

* Disable interactive

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2022-01-06 09:06:56 -08:00
committed by GitHub
parent fd2736b6a6
commit 2bc6a0cd01
2099 changed files with 79520 additions and 43813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/vs/platform/editor/common/editor.ts
View File

@@ -3,8 +3,8 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { URI } from 'vs/base/common/uri';
import { Event } from 'vs/base/common/event';
import { URI } from 'vs/base/common/uri';
export interface IEditorModel {
@@ -114,19 +114,24 @@ export interface ITextResourceEditorInput extends IResourceEditorInput, IBaseTex
/**
* This identifier allows to uniquely identify an editor with a
* resource and type identifier.
* resource, type and editor identifier.
*/
export interface IResourceEditorInputIdentifier {
/**
* The resource URI of the editor.
*/
readonly resource: URI;
/**
* The type of the editor.
*/
readonly typeId: string;
/**
* The identifier of the editor if provided.
*/
readonly editorId: string | undefined;
/**
* The resource URI of the editor.
*/
readonly resource: URI;
}
export enum EditorActivation {
@@ -135,7 +140,7 @@ export enum EditorActivation {
* Activate the editor after it opened. This will automatically restore
* the editor if it is minimized.
*/
ACTIVATE,
ACTIVATE = 1,
/**
* Only restore the editor if it is minimized but do not activate it.
@@ -156,17 +161,22 @@ export enum EditorActivation {
PRESERVE
}
export enum EditorOverride {
export enum EditorResolution {
/**
* Displays a picker and allows the user to decide which editor to use
* Displays a picker and allows the user to decide which editor to use.
*/
PICK = 1,
PICK,
/**
* Disables overrides
* Disables editor resolving.
*/
DISABLED
DISABLED,
/**
* Only exclusive editors are considered.
*/
EXCLUSIVE_ONLY
}
export enum EditorOpenContext {
@@ -263,9 +273,9 @@ export interface IEditorOptions {
* Allows to override the editor that should be used to display the input:
* - `undefined`: let the editor decide for itself
* - `string`: specific override by id
* - `EditorOverride`: specific override handling
* - `EditorResolution`: specific override handling
*/
override?: string | EditorOverride;
override?: string | EditorResolution;
/**
* A optional hint to signal in which context the editor opens.