diff --git a/src/vs/base/common/console.ts b/src/vs/base/common/console.ts index 54bfadefbaed0..6527f72f5e1b2 100644 --- a/src/vs/base/common/console.ts +++ b/src/vs/base/common/console.ts @@ -125,7 +125,7 @@ export function log(entry: IRemoteConsoleLog, label: string): void { consoleArgs = [`%c[${label}]%`, color('blue'), ...args]; } - // Stack: add to args unless already aded + // Stack: add to args unless already added if (topFrame && !isOneStringArg) { consoleArgs.push(topFrame); } diff --git a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts index 92e20067052fa..aa5eaed881473 100644 --- a/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts +++ b/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.ts @@ -264,7 +264,7 @@ export class ExtensionEnablementService extends Disposable implements IWorkbench const index = extensionsToEnable.findIndex(e => areSameExtensions(e.identifier, extension.identifier)); - // Extension is not aded to the disablement list so add it + // Extension is not added to the disablement list so add it if (index === -1) { extensionsToEnable.push(extension); } diff --git a/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts b/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts index b03d975f3fdcc..9c890337351da 100644 --- a/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts +++ b/src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts @@ -108,9 +108,9 @@ if (!isWeb) { teardown(() => testObject.dispose()); - function assertUntrustedWorkspaceSupport(extensionMaifest: IExtensionManifest, expected: ExtensionUntrustedWorkspaceSupportType): void { + function assertUntrustedWorkspaceSupport(extensionManifest: IExtensionManifest, expected: ExtensionUntrustedWorkspaceSupportType): void { testObject = instantiationService.createInstance(ExtensionManifestPropertiesService); - const untrustedWorkspaceSupport = testObject.getExtensionUntrustedWorkspaceSupportType(extensionMaifest); + const untrustedWorkspaceSupport = testObject.getExtensionUntrustedWorkspaceSupportType(extensionManifest); assert.strictEqual(untrustedWorkspaceSupport, expected); } @@ -123,16 +123,16 @@ if (!isWeb) { instantiationService.stub(IProductService, >{}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); - const extensionMaifest = getExtensionManifest(); - assertUntrustedWorkspaceSupport(extensionMaifest, true); + const extensionManifest = getExtensionManifest(); + assertUntrustedWorkspaceSupport(extensionManifest, true); }); test('test extension workspace trust request when workspace trust is disabled', async () => { instantiationService.stub(IProductService, >{}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService(false)); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js' }); - assertUntrustedWorkspaceSupport(extensionMaifest, true); + const extensionManifest = getExtensionManifest({ main: './out/extension.js' }); + assertUntrustedWorkspaceSupport(extensionManifest, true); }); test('test extension workspace trust request when "true" override exists in settings.json', async () => { @@ -140,8 +140,8 @@ if (!isWeb) { instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); await testConfigurationService.setUserConfiguration('extensions', { supportUntrustedWorkspaces: { 'pub.a': { supported: true } } }); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); - assertUntrustedWorkspaceSupport(extensionMaifest, true); + const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); + assertUntrustedWorkspaceSupport(extensionManifest, true); }); test('test extension workspace trust request when override (false) exists in settings.json', async () => { @@ -149,8 +149,8 @@ if (!isWeb) { instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); await testConfigurationService.setUserConfiguration('extensions', { supportUntrustedWorkspaces: { 'pub.a': { supported: false } } }); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); - assertUntrustedWorkspaceSupport(extensionMaifest, false); + const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); + assertUntrustedWorkspaceSupport(extensionManifest, false); }); test('test extension workspace trust request when override (true) for the version exists in settings.json', async () => { @@ -158,8 +158,8 @@ if (!isWeb) { instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); await testConfigurationService.setUserConfiguration('extensions', { supportUntrustedWorkspaces: { 'pub.a': { supported: true, version: '1.0.0' } } }); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); - assertUntrustedWorkspaceSupport(extensionMaifest, true); + const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); + assertUntrustedWorkspaceSupport(extensionManifest, true); }); test('test extension workspace trust request when override (false) for the version exists in settings.json', async () => { @@ -167,8 +167,8 @@ if (!isWeb) { instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); await testConfigurationService.setUserConfiguration('extensions', { supportUntrustedWorkspaces: { 'pub.a': { supported: false, version: '1.0.0' } } }); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); - assertUntrustedWorkspaceSupport(extensionMaifest, false); + const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); + assertUntrustedWorkspaceSupport(extensionManifest, false); }); test('test extension workspace trust request when override for a different version exists in settings.json', async () => { @@ -176,56 +176,56 @@ if (!isWeb) { instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); await testConfigurationService.setUserConfiguration('extensions', { supportUntrustedWorkspaces: { 'pub.a': { supported: true, version: '2.0.0' } } }); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); - assertUntrustedWorkspaceSupport(extensionMaifest, 'limited'); + const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); + assertUntrustedWorkspaceSupport(extensionManifest, 'limited'); }); test('test extension workspace trust request when default (true) exists in product.json', () => { instantiationService.stub(IProductService, >{ extensionUntrustedWorkspaceSupport: { 'pub.a': { default: true } } }); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js' }); - assertUntrustedWorkspaceSupport(extensionMaifest, true); + const extensionManifest = getExtensionManifest({ main: './out/extension.js' }); + assertUntrustedWorkspaceSupport(extensionManifest, true); }); test('test extension workspace trust request when default (false) exists in product.json', () => { instantiationService.stub(IProductService, >{ extensionUntrustedWorkspaceSupport: { 'pub.a': { default: false } } }); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js' }); - assertUntrustedWorkspaceSupport(extensionMaifest, false); + const extensionManifest = getExtensionManifest({ main: './out/extension.js' }); + assertUntrustedWorkspaceSupport(extensionManifest, false); }); test('test extension workspace trust request when override (limited) exists in product.json', () => { instantiationService.stub(IProductService, >{ extensionUntrustedWorkspaceSupport: { 'pub.a': { override: 'limited' } } }); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: true } } }); - assertUntrustedWorkspaceSupport(extensionMaifest, 'limited'); + const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: true } } }); + assertUntrustedWorkspaceSupport(extensionManifest, 'limited'); }); test('test extension workspace trust request when override (false) exists in product.json', () => { instantiationService.stub(IProductService, >{ extensionUntrustedWorkspaceSupport: { 'pub.a': { override: false } } }); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: true } } }); - assertUntrustedWorkspaceSupport(extensionMaifest, false); + const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: true } } }); + assertUntrustedWorkspaceSupport(extensionManifest, false); }); test('test extension workspace trust request when value exists in package.json', () => { instantiationService.stub(IProductService, >{}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); - assertUntrustedWorkspaceSupport(extensionMaifest, 'limited'); + const extensionManifest = getExtensionManifest({ main: './out/extension.js', capabilities: { untrustedWorkspaces: { supported: 'limited' } } }); + assertUntrustedWorkspaceSupport(extensionManifest, 'limited'); }); test('test extension workspace trust request when no value exists in package.json', () => { instantiationService.stub(IProductService, >{}); instantiationService.stub(IWorkspaceTrustEnablementService, new TestWorkspaceTrustEnablementService()); - const extensionMaifest = getExtensionManifest({ main: './out/extension.js' }); - assertUntrustedWorkspaceSupport(extensionMaifest, false); + const extensionManifest = getExtensionManifest({ main: './out/extension.js' }); + assertUntrustedWorkspaceSupport(extensionManifest, false); }); }); }