ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-05 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/vs/workbench/workbench.web.api.ts
View File

@@ -6,7 +6,6 @@
import 'vs/workbench/workbench.web.main';
import { main } from 'vs/workbench/browser/web.main';
import { UriComponents, URI } from 'vs/base/common/uri';
import { IFileSystemProvider, FileSystemProviderCapabilities, IFileChange, FileChangeType } from 'vs/platform/files/common/files';
import { IWebSocketFactory, IWebSocket } from 'vs/platform/remote/browser/browserSocketFactory';
import { IExtensionManifest } from 'vs/platform/extensions/common/extensions';
import { IURLCallbackProvider } from 'vs/workbench/services/url/browser/urlService';
@@ -16,7 +15,7 @@ import { Event, Emitter } from 'vs/base/common/event';
import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { IWorkspaceProvider, IWorkspace } from 'vs/workbench/services/host/browser/browserHostService';
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
import { IProductConfiguration } from 'vs/platform/product/common/productService';
import { IProductConfiguration } from 'vs/base/common/product';
import { mark } from 'vs/base/common/performance';
import { ICredentialsProvider } from 'vs/workbench/services/credentials/common/credentials';
import { TunnelProviderFeatures } from 'vs/platform/remote/common/tunnel';
@@ -27,7 +26,7 @@ interface IResourceUriProvider {
interface IStaticExtension {
packageJSON: IExtensionManifest;
extensionLocation: URI;
extensionLocation: UriComponents;
isBuiltin?: boolean;
}
@@ -201,6 +200,8 @@ interface IDefaultEditor {
interface IDefaultLayout {
readonly views?: IDefaultView[];
readonly editors?: IDefaultEditor[];
/** Forces this layout to be applied even if this isn't the first time the workspace has been opened */
readonly force?: boolean;
}
interface IProductQualityChangeHandler {
@@ -222,6 +223,12 @@ interface ISettingsSyncOptions {
*/
readonly enabled: boolean;
/**
* Version of extensions sync state.
* Extensions sync state will be reset if version is provided and different from previous version.
*/
readonly extensionsSyncStateVersion?: string;
/**
* Handler is being called when the user changes Settings Sync enablement.
*/
@@ -312,22 +319,15 @@ interface IWorkbenchConstructionOptions {
/**
* Add static extensions that cannot be uninstalled but only be disabled.
*/
readonly staticExtensions?: ReadonlyArray<IStaticExtension>;
readonly staticExtensions?: readonly IStaticExtension[];
/**
* [TEMPORARY]: This will be removed soon.
* Enable inlined extensions.
* Defaults to false on serverful and true on serverless.
* Defaults to true.
*/
readonly _enableBuiltinExtensions?: boolean;
/**
* [TEMPORARY]: This will be removed soon.
* Enable `<iframe>` wrapping.
* Defaults to false.
*/
readonly _wrapWebWorkerExtHostInIframe?: boolean;
/**
* Support for URL callbacks.
*/
@@ -347,7 +347,7 @@ interface IWorkbenchConstructionOptions {
readonly commands?: readonly ICommand[];
/**
* Optional default layout to apply on first time the workspace is opened.
* Optional default layout to apply on first time the workspace is opened (uness `force` is specified).
*/
readonly defaultLayout?: IDefaultLayout;
@@ -403,19 +403,35 @@ interface IWorkbenchConstructionOptions {
//#endregion
//#region Diagnostics
//#region Development options
readonly developmentOptions?: IDevelopmentOptions;
//#endregion
}
interface IDevelopmentOptions {
/**
* Current logging level. Default is `LogLevel.Info`.
*/
readonly logLevel?: LogLevel;
/**
* Location of a module containing extension tests to run once the workbench is open.
*/
readonly extensionTestsPath?: UriComponents;
/**
* Add extensions under development.
*/
readonly extensions?: readonly IStaticExtension[];
/**
* Whether to enable the smoke test driver.
*/
readonly driver?: boolean;
//#endregion
readonly enableSmokeTestDriver?: boolean;
}
interface IPerformanceMark {
@@ -565,12 +581,6 @@ export {
IWorkspace,
IWorkspaceProvider,
// FileSystem
IFileSystemProvider,
FileSystemProviderCapabilities,
IFileChange,
FileChangeType,
// WebSockets
IWebSocketFactory,
IWebSocket,
@@ -631,7 +641,10 @@ export {
// Env
IPerformanceMark,
env
env,
// Development
IDevelopmentOptions
};
//#endregion