mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-09 09:42:34 -05:00
Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 (#14883)
* Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 * Bump distro * Upgrade GCC to 4.9 due to yarn install errors * Update build image * Fix bootstrap base url * Bump distro * Fix build errors * Update source map file * Disable checkbox for blocking migration issues (#15131) * disable checkbox for blocking issues * wip * disable checkbox fixes * fix strings * Remove duplicate tsec command * Default to off for tab color if settings not present * re-skip failing tests * Fix mocha error * Bump sqlite version & fix notebooks search view * Turn off esbuild warnings * Update esbuild log level * Fix overflowactionbar tests * Fix ts-ignore in dropdown tests * cleanup/fixes * Fix hygiene * Bundle in entire zone.js module * Remove extra constructor param * bump distro for web compile break * bump distro for web compile break v2 * Undo log level change * New distro * Fix integration test scripts * remove the "no yarn.lock changes" workflow * fix scripts v2 * Update unit test scripts * Ensure ads-kerberos2 updates in .vscodeignore * Try fix unit tests * Upload crash reports * remove nogpu * always upload crashes * Use bash script * Consolidate data/ext dir names * Create in tmp directory Co-authored-by: chlafreniere <hichise@gmail.com> Co-authored-by: Christopher Suh <chsuh@microsoft.com> Co-authored-by: chgagnon <chgagnon@microsoft.com>
This commit is contained in:
@@ -19,6 +19,7 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
|
||||
import { IProductConfiguration } from 'vs/platform/product/common/productService';
|
||||
import { mark } from 'vs/base/common/performance';
|
||||
import { ICredentialsProvider } from 'vs/workbench/services/credentials/common/credentials';
|
||||
import { TunnelProviderFeatures } from 'vs/platform/remote/common/tunnel';
|
||||
|
||||
interface IResourceUriProvider {
|
||||
(uri: URI): URI;
|
||||
@@ -46,9 +47,14 @@ interface ITunnelProvider {
|
||||
tunnelFactory?: ITunnelFactory;
|
||||
|
||||
/**
|
||||
* Support for filtering candidate ports
|
||||
* Support for filtering candidate ports.
|
||||
*/
|
||||
showPortCandidate?: IShowPortCandidate;
|
||||
|
||||
/**
|
||||
* The features that the tunnel provider supports.
|
||||
*/
|
||||
features?: TunnelProviderFeatures;
|
||||
}
|
||||
|
||||
interface ITunnelFactory {
|
||||
@@ -56,6 +62,7 @@ interface ITunnelFactory {
|
||||
}
|
||||
|
||||
interface ITunnelOptions {
|
||||
|
||||
remoteAddress: { port: number, host: string };
|
||||
|
||||
/**
|
||||
@@ -64,16 +71,20 @@ interface ITunnelOptions {
|
||||
localAddressPort?: number;
|
||||
|
||||
label?: string;
|
||||
|
||||
public?: boolean;
|
||||
}
|
||||
|
||||
export interface TunnelCreationOptions {
|
||||
|
||||
/**
|
||||
* True when the local operating system will require elevation to use the requested local port.
|
||||
*/
|
||||
elevationRequired?: boolean;
|
||||
}
|
||||
|
||||
interface ITunnel extends IDisposable {
|
||||
interface ITunnel {
|
||||
|
||||
remoteAddress: { port: number, host: string };
|
||||
|
||||
/**
|
||||
@@ -81,10 +92,14 @@ interface ITunnel extends IDisposable {
|
||||
*/
|
||||
localAddress: string;
|
||||
|
||||
public?: boolean;
|
||||
|
||||
/**
|
||||
* Implementers of Tunnel should fire onDidDispose when dispose is called.
|
||||
*/
|
||||
onDidDispose: Event<void>;
|
||||
|
||||
dispose(): Promise<void> | void;
|
||||
}
|
||||
|
||||
interface IShowPortCandidate {
|
||||
@@ -173,46 +188,6 @@ interface IInitialColorTheme {
|
||||
colors?: { [colorId: string]: string };
|
||||
}
|
||||
|
||||
interface IDefaultSideBarLayout {
|
||||
visible?: boolean;
|
||||
containers?: ({
|
||||
id: 'explorer' | 'run' | 'scm' | 'search' | 'extensions' | 'remote' | string;
|
||||
active: true;
|
||||
order?: number;
|
||||
views?: {
|
||||
id: string;
|
||||
order?: number;
|
||||
visible?: boolean;
|
||||
collapsed?: boolean;
|
||||
}[];
|
||||
} | {
|
||||
id: 'explorer' | 'run' | 'scm' | 'search' | 'extensions' | 'remote' | string;
|
||||
active?: false;
|
||||
order?: number;
|
||||
visible?: boolean;
|
||||
views?: {
|
||||
id: string;
|
||||
order?: number;
|
||||
visible?: boolean;
|
||||
collapsed?: boolean;
|
||||
}[];
|
||||
})[];
|
||||
}
|
||||
|
||||
interface IDefaultPanelLayout {
|
||||
visible?: boolean;
|
||||
containers?: ({
|
||||
id: 'terminal' | 'debug' | 'problems' | 'output' | 'comments' | string;
|
||||
order?: number;
|
||||
active: true;
|
||||
} | {
|
||||
id: 'terminal' | 'debug' | 'problems' | 'output' | 'comments' | string;
|
||||
order?: number;
|
||||
active?: false;
|
||||
visible?: boolean;
|
||||
})[];
|
||||
}
|
||||
|
||||
interface IDefaultView {
|
||||
readonly id: string;
|
||||
}
|
||||
@@ -241,6 +216,7 @@ interface IProductQualityChangeHandler {
|
||||
* Settings sync options
|
||||
*/
|
||||
interface ISettingsSyncOptions {
|
||||
|
||||
/**
|
||||
* Is settings sync enabled
|
||||
*/
|
||||
@@ -442,10 +418,43 @@ interface IWorkbenchConstructionOptions {
|
||||
//#endregion
|
||||
}
|
||||
|
||||
interface IPerformanceMark {
|
||||
|
||||
/**
|
||||
* The name of a performace marker.
|
||||
*/
|
||||
readonly name: string;
|
||||
|
||||
/**
|
||||
* The UNIX timestamp at which the marker has been set.
|
||||
*/
|
||||
readonly startTime: number;
|
||||
}
|
||||
|
||||
interface IWorkbench {
|
||||
|
||||
commands: {
|
||||
/**
|
||||
* @see [executeCommand](#commands.executeCommand)
|
||||
*/
|
||||
executeCommand(command: string, ...args: any[]): Promise<unknown>;
|
||||
},
|
||||
}
|
||||
|
||||
env: {
|
||||
/**
|
||||
* @see [retrievePerformanceMarks](#commands.retrievePerformanceMarks)
|
||||
*/
|
||||
retrievePerformanceMarks(): Promise<[string, readonly IPerformanceMark[]][]>;
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers shutdown of the workbench programmatically. After this method is
|
||||
* called, the workbench is not usable anymore and the page needs to reload
|
||||
* or closed.
|
||||
*
|
||||
* This will also remove any `beforeUnload` handlers that would bring up a
|
||||
* confirmation dialog.
|
||||
*/
|
||||
shutdown: () => void;
|
||||
}
|
||||
|
||||
@@ -461,7 +470,7 @@ const workbenchPromise = new Promise<IWorkbench>(resolve => workbenchPromiseReso
|
||||
function create(domElement: HTMLElement, options: IWorkbenchConstructionOptions): IDisposable {
|
||||
|
||||
// Mark start of workbench
|
||||
mark('didLoadWorkbenchMain');
|
||||
mark('code/didLoadWorkbenchMain');
|
||||
|
||||
// Assert that the workbench is not created more than once. We currently
|
||||
// do not support this and require a full context switch to clean-up.
|
||||
@@ -517,6 +526,26 @@ namespace commands {
|
||||
}
|
||||
}
|
||||
|
||||
namespace env {
|
||||
|
||||
/**
|
||||
* Retrieve performance marks that have been collected during startup. This function
|
||||
* returns tuples of source and marks. A source is a dedicated context, like
|
||||
* the renderer or an extension host.
|
||||
*
|
||||
* *Note* that marks can be collected on different machines and in different processes
|
||||
* and that therefore "different clocks" are used. So, comparing `startTime`-properties
|
||||
* across contexts should be taken with a grain of salt.
|
||||
*
|
||||
* @returns A promise that resolves to tuples of source and marks.
|
||||
*/
|
||||
export async function retrievePerformanceMarks(): Promise<[string, readonly IPerformanceMark[]][]> {
|
||||
const workbench = await workbenchPromise;
|
||||
|
||||
return workbench.env.retrievePerformanceMarks();
|
||||
}
|
||||
}
|
||||
|
||||
export {
|
||||
|
||||
// Factory
|
||||
@@ -599,8 +628,10 @@ export {
|
||||
IDefaultView,
|
||||
IDefaultEditor,
|
||||
IDefaultLayout,
|
||||
IDefaultPanelLayout,
|
||||
IDefaultSideBarLayout
|
||||
|
||||
// Env
|
||||
IPerformanceMark,
|
||||
env
|
||||
};
|
||||
|
||||
//#endregion
|
||||
|
||||
Reference in New Issue
Block a user