Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* 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

View File

@@ -27,6 +27,11 @@ export interface IWorkspaceContextService extends IWorkspaceFolderProvider {
*/
readonly onDidChangeWorkspaceName: Event<void>;
/**
* An event which fires before workspace folders change.
*/
readonly onWillChangeWorkspaceFolders: Event<IWorkspaceFoldersWillChangeEvent>;
/**
* An event which fires on workspace folders change.
*/
@@ -75,6 +80,12 @@ export const enum WorkbenchState {
WORKSPACE
}
export interface IWorkspaceFoldersWillChangeEvent {
join(promise: Promise<void>): void;
readonly changes: IWorkspaceFoldersChangeEvent;
readonly fromCache: boolean;
}
export interface IWorkspaceFoldersChangeEvent {
added: IWorkspaceFolder[];
removed: IWorkspaceFolder[];

View File

@@ -0,0 +1,75 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Event } from 'vs/base/common/event';
import { URI } from 'vs/base/common/uri';
import { localize } from 'vs/nls';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
export enum WorkspaceTrustScope {
Local = 0,
Remote = 1
}
export function workspaceTrustToString(trustState: boolean) {
if (trustState) {
return localize('trusted', "Trusted");
} else {
return localize('untrusted', "Restricted Mode");
}
}
export interface WorkspaceTrustRequestButton {
readonly label: string;
readonly type: 'ContinueWithTrust' | 'ContinueWithoutTrust' | 'Manage' | 'Cancel'
}
export interface WorkspaceTrustRequestOptions {
readonly buttons?: WorkspaceTrustRequestButton[];
readonly message?: string;
readonly modal: boolean;
}
export type WorkspaceTrustChangeEvent = Event<boolean>;
export const IWorkspaceTrustManagementService = createDecorator<IWorkspaceTrustManagementService>('workspaceTrustManagementService');
export interface IWorkspaceTrustManagementService {
readonly _serviceBrand: undefined;
onDidChangeTrust: WorkspaceTrustChangeEvent;
onDidChangeTrustedFolders: Event<void>;
isWorkpaceTrusted(): boolean;
canSetParentFolderTrust(): boolean;
setParentFolderTrust(trusted: boolean): void;
canSetWorkspaceTrust(): boolean;
setWorkspaceTrust(trusted: boolean): void;
getFolderTrustInfo(folder: URI): IWorkspaceTrustUriInfo;
setFoldersTrust(folders: URI[], trusted: boolean): void;
getTrustedFolders(): URI[];
setTrustedFolders(folders: URI[]): void;
}
export const IWorkspaceTrustRequestService = createDecorator<IWorkspaceTrustRequestService>('workspaceTrustRequestService');
export interface IWorkspaceTrustRequestService {
readonly _serviceBrand: undefined;
readonly onDidInitiateWorkspaceTrustRequest: Event<WorkspaceTrustRequestOptions>;
readonly onDidCompleteWorkspaceTrustRequest: Event<boolean>;
cancelRequest(): void;
completeRequest(trusted?: boolean): void;
requestWorkspaceTrust(options?: WorkspaceTrustRequestOptions): Promise<boolean | undefined>;
}
export interface IWorkspaceTrustUriInfo {
uri: URI,
trusted: boolean
}
export interface IWorkspaceTrustInfo {
uriTrustInfo: IWorkspaceTrustUriInfo[]
}