Merge branch 'main' into merogge/re-view

Author: meganrogge

extensions/typescript-language-features/src/configuration/fileSchemes.ts

@@ -10,6 +10,7 @@ export const file = 'file';
 export const untitled = 'untitled';
 export const git = 'git';
 export const github = 'github';
+export const azurerepos = 'azurerepos';
 
 /** Live share scheme */
 export const vsls = 'vsls';
@@ -39,4 +40,5 @@ export const disabledSchemes = new Set([
 	git,
 	vsls,
 	github,
+	azurerepos,
 ]);

src/vs/platform/extensionManagement/test/node/installGalleryExtensionTask.test.ts

@@ -70,8 +70,9 @@ class TestInstallGalleryExtensionTask extends InstallGalleryExtensionTask {
 	constructor(
 		extension: IGalleryExtension,
 		extensionDownloader: ExtensionsDownloader,
+		disposables: DisposableStore,
 	) {
-		const instantiationService = new TestInstantiationService();
+		const instantiationService = disposables.add(new TestInstantiationService());
 		const logService = instantiationService.stub(ILogService, new NullLogService());
 		const fileService = instantiationService.stub(IFileService, new FileService(logService));
 		const fileSystemProvider = new InMemoryFileSystemProvider();
@@ -131,7 +132,7 @@ suite('InstallGalleryExtensionTask Tests', () => {
 	teardown(() => disposables.clear());
 
 	test('if verification is enabled by default, the task completes', async () => {
-		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: true, didExecute: true }));
+		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: true, didExecute: true }), disposables);
 
 		await testObject.run();
 
@@ -140,7 +141,7 @@ suite('InstallGalleryExtensionTask Tests', () => {
 	});
 
 	test('if verification is enabled in stable, the task completes', async () => {
-		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: true, didExecute: true, quality: 'stable' }));
+		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: true, didExecute: true, quality: 'stable' }), disposables);
 
 		await testObject.run();
 
@@ -149,7 +150,7 @@ suite('InstallGalleryExtensionTask Tests', () => {
 	});
 
 	test('if verification is disabled by setting set to false, the task skips verification', async () => {
-		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: false, verificationResult: 'error', didExecute: false }));
+		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: false, verificationResult: 'error', didExecute: false }), disposables);
 
 		await testObject.run();
 
@@ -158,7 +159,7 @@ suite('InstallGalleryExtensionTask Tests', () => {
 	});
 
 	test('if verification is disabled because the module is not loaded, the task skips verification', async () => {
-		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: false, didExecute: false }));
+		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: false, didExecute: false }), disposables);
 
 		await testObject.run();
 
@@ -168,7 +169,7 @@ suite('InstallGalleryExtensionTask Tests', () => {
 
 	test('if verification fails to execute, the task completes', async () => {
 		const errorCode = 'ENOENT';
-		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: errorCode, didExecute: false }));
+		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: errorCode, didExecute: false }), disposables);
 
 		await testObject.run();
 
@@ -179,7 +180,7 @@ suite('InstallGalleryExtensionTask Tests', () => {
 	test('if verification fails', async () => {
 		const errorCode = 'IntegrityCheckFailed';
 
-		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: errorCode, didExecute: true }));
+		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: errorCode, didExecute: true }), disposables);
 
 		await testObject.run();
 
@@ -188,7 +189,7 @@ suite('InstallGalleryExtensionTask Tests', () => {
 	});
 
 	test('if verification succeeds, the task completes', async () => {
-		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: true, didExecute: true }));
+		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: true }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: true, didExecute: true }), disposables);
 
 		await testObject.run();
 
@@ -197,7 +198,7 @@ suite('InstallGalleryExtensionTask Tests', () => {
 	});
 
 	test('task completes for unsigned extension', async () => {
-		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: false }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: true, didExecute: false }));
+		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: false }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: true, didExecute: false }), disposables);
 
 		await testObject.run();
 
@@ -206,7 +207,7 @@ suite('InstallGalleryExtensionTask Tests', () => {
 	});
 
 	test('task completes for an unsigned extension even when signature verification throws error', async () => {
-		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: false }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: 'error', didExecute: true }));
+		const testObject = new TestInstallGalleryExtensionTask(aGalleryExtension('a', { isSigned: false }), anExtensionsDownloader({ isSignatureVerificationEnabled: true, verificationResult: 'error', didExecute: true }), disposables);
 
 		await testObject.run();
 

src/vs/platform/userDataSync/test/common/userDataSyncClient.ts

@@ -52,7 +52,7 @@ export class UserDataSyncClient extends Disposable {
 
 	constructor(readonly testServer: UserDataSyncTestServer = new UserDataSyncTestServer()) {
 		super();
-		this.instantiationService = new TestInstantiationService();
+		this.instantiationService = this._register(new TestInstantiationService());
 	}
 
 	async setUp(empty: boolean = false): Promise<void> {

src/vs/workbench/contrib/accessibility/browser/accessibleView.ts

@@ -23,8 +23,9 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { SelectionClipboardContributionID } from 'vs/workbench/contrib/codeEditor/browser/selectionClipboard';
 import { getSimpleEditorOptions } from 'vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 
-const enum DIMENSION_DEFAULT {
-	WIDTH = 800
+const enum DEFAULT {
+	WIDTH = 800,
+	TOP = 25
 }
 
 export interface IAccessibleContentProvider {
@@ -94,7 +95,7 @@ class AccessibleView extends Disposable {
 
 	show(provider: IAccessibleContentProvider): void {
 		const delegate: IContextViewDelegate = {
-			getAnchor: () => { return { x: (window.innerWidth / 2) - (DIMENSION_DEFAULT.WIDTH / 2), y: (window.innerHeight / 2) - (this.editorWidget.getContentHeight() / 2) }; },
+			getAnchor: () => { return { x: (window.innerWidth / 2) - (DEFAULT.WIDTH / 2), y: DEFAULT.TOP }; },
 			render: (container) => {
 				return this._render(provider, container);
 			},
@@ -160,7 +161,7 @@ class AccessibleView extends Disposable {
 	}
 
 	private _layout(): void {
-		this._editorWidget.layout({ width: DIMENSION_DEFAULT.WIDTH, height: this._editorWidget.getContentHeight() });
+		this._editorWidget.layout({ width: DEFAULT.WIDTH, height: this._editorWidget.getContentHeight() });
 	}
 
 	private async _getTextModel(resource: URI): Promise<ITextModel | null> {

src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts

@@ -69,7 +69,7 @@ suite('ExtensionsWorkbenchServiceTest', () => {
 		uninstallEvent = suiteDisposables.add(new Emitter<UninstallExtensionEvent>());
 		didUninstallEvent = suiteDisposables.add(new Emitter<DidUninstallExtensionEvent>());
 
-		instantiationService = new TestInstantiationService();
+		instantiationService = suiteDisposables.add(new TestInstantiationService());
 		instantiationService.stub(ITelemetryService, NullTelemetryService);
 		instantiationService.stub(ILogService, NullLogService);
 		instantiationService.stub(IProgressService, ProgressService);