Merge from vscode cbeff45f80213db0ddda2183170281ed97ed3b12 (#8670)

* Merge from vscode cbeff45f80213db0ddda2183170281ed97ed3b12 * fix null strict checks
2026-02-17 02:51:36 -05:00 · 2019-12-13 00:50:37 -08:00
parent 67abc2f690
commit 642920504a
136 changed files with 2918 additions and 1729 deletions
--- a/src/vs/editor/test/common/services/modelService.test.ts
+++ b/src/vs/editor/test/common/services/modelService.test.ts
@@ -17,6 +17,7 @@ import { ITextResourcePropertiesService } from 'vs/editor/common/services/resour
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
+import { NullLogService } from 'vs/platform/log/common/log';

 const GENERATE_TESTS = false;

@@ -28,7 +29,7 @@ suite('ModelService', () => {
 		configService.setUserConfiguration('files', { 'eol': '\n' });
 		configService.setUserConfiguration('files', { 'eol': '\r\n' }, URI.file(platform.isWindows ? 'c:\\myroot' : '/myroot'));

-		modelService = new ModelServiceImpl(configService, new TestTextResourcePropertiesService(configService), new TestThemeService());
+		modelService = new ModelServiceImpl(configService, new TestTextResourcePropertiesService(configService), new TestThemeService(), new NullLogService());
 	});

 	teardown(() => {
--- a/src/vs/editor/test/common/services/resourceConfigurationService.test.ts
+++ b/src/vs/editor/test/common/services/resourceConfigurationService.test.ts
@@ -0,0 +1,301 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { IConfigurationValue, IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
+import { TextResourceConfigurationService } from 'vs/editor/common/services/resourceConfigurationImpl';
+import { URI } from 'vs/base/common/uri';
+
+
+suite('TextResourceConfigurationService - Update', () => {
+
+	let configurationValue: IConfigurationValue<any> = {};
+	let updateArgs: any[];
+	let configurationService = new class extends TestConfigurationService {
+		inspect() {
+			return configurationValue;
+		}
+		updateValue() {
+			updateArgs = [...arguments];
+			return Promise.resolve();
+		}
+	}();
+	let language: string | null = null;
+	let testObject: TextResourceConfigurationService;
+
+	setup(() => {
+		const instantiationService = new TestInstantiationService();
+		instantiationService.stub(IModelService, <Partial<IModelService>>{ getModel() { return null; } });
+		instantiationService.stub(IModeService, <Partial<IModeService>>{ getModeIdByFilepathOrFirstLine() { return language; } });
+		instantiationService.stub(IConfigurationService, configurationService);
+		testObject = instantiationService.createInstance(TextResourceConfigurationService);
+	});
+
+	test('updateValue writes without target and overrides when no language is defined', async () => {
+		const resource = URI.file('someFile');
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
+	});
+
+	test('updateValue writes with target and without overrides when no language is defined', async () => {
+		const resource = URI.file('someFile');
+		await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.USER_LOCAL);
+		assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
+	});
+
+	test('updateValue writes into given memory target without overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			workspaceFolderTarget: { value: '1' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.MEMORY);
+		assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.MEMORY]);
+	});
+
+	test('updateValue writes into given workspace target without overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			workspaceFolderTarget: { value: '2' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.WORKSPACE);
+		assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE]);
+	});
+
+	test('updateValue writes into given user target without overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			workspaceFolderTarget: { value: '2' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.USER);
+		assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER]);
+	});
+
+	test('updateValue writes into given workspace folder target with overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			workspaceFolderTarget: { value: '2', override: '1' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b', ConfigurationTarget.WORKSPACE_FOLDER);
+		assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE_FOLDER]);
+	});
+
+	test('updateValue writes into derived workspace folder target without overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			workspaceFolderTarget: { value: '2' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE_FOLDER]);
+	});
+
+	test('updateValue writes into derived workspace folder target with overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			workspaceTarget: { value: '2', override: '1' },
+			workspaceFolderTarget: { value: '2', override: '2' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE_FOLDER]);
+	});
+
+	test('updateValue writes into derived workspace target without overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			workspaceTarget: { value: '2' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.WORKSPACE]);
+	});
+
+	test('updateValue writes into derived workspace target with overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			workspaceTarget: { value: '2', override: '2' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE]);
+	});
+
+	test('updateValue writes into derived workspace target with overrides and value defined in folder', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1', override: '3' },
+			userLocalTarget: { value: '2' },
+			workspaceTarget: { value: '2', override: '2' },
+			workspaceFolderTarget: { value: '2' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.WORKSPACE]);
+	});
+
+	test('updateValue writes into derived user remote target without overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			userRemoteTarget: { value: '2' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_REMOTE]);
+	});
+
+	test('updateValue writes into derived user remote target with overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			userRemoteTarget: { value: '2', override: '3' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_REMOTE]);
+	});
+
+	test('updateValue writes into derived user remote target with overrides and value defined in workspace', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+			userRemoteTarget: { value: '2', override: '3' },
+			workspaceTarget: { value: '3' }
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_REMOTE]);
+	});
+
+	test('updateValue writes into derived user remote target with overrides and value defined in workspace folder', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2', override: '1' },
+			userRemoteTarget: { value: '2', override: '3' },
+			workspaceTarget: { value: '3' },
+			workspaceFolderTarget: { value: '3' }
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_REMOTE]);
+	});
+
+	test('updateValue writes into derived user target without overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
+	});
+
+	test('updateValue writes into derived user target with overrides', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2', override: '3' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', '2');
+		assert.deepEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
+	});
+
+	test('updateValue writes into derived user target with overrides and value is defined in remote', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2', override: '3' },
+			userRemoteTarget: { value: '3' }
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', '2');
+		assert.deepEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
+	});
+
+	test('updateValue writes into derived user target with overrides and value is defined in workspace', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+			userLocalTarget: { value: '2', override: '3' },
+			workspace: { value: '3' }
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', '2');
+		assert.deepEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
+	});
+
+	test('updateValue writes into derived user target with overrides and value is defined in workspace folder', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1', override: '3' },
+			userLocalTarget: { value: '2', override: '3' },
+			userRemoteTarget: { value: '3' },
+			workspaceFolder: { value: '3' }
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', '2');
+		assert.deepEqual(updateArgs, ['a', '2', { resource, overrideIdentifier: language }, ConfigurationTarget.USER_LOCAL]);
+	});
+
+	test('updateValue when not changed', async () => {
+		language = 'a';
+		configurationValue = {
+			defaultTarget: { value: '1' },
+		};
+		const resource = URI.file('someFile');
+
+		await testObject.updateValue(resource, 'a', 'b');
+		assert.deepEqual(updateArgs, ['a', 'b', { resource }, ConfigurationTarget.USER_LOCAL]);
+	});
+
+});