From cb226f7c7ea7e15fcd852be616cdc8658cc7d995 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 2 Dec 2022 12:47:22 +0100
Subject: [PATCH] add logs (#167847)

add logs #163418
---
 src/vs/platform/configuration/common/configurations.ts | 5 +++++
 src/vs/platform/policy/common/filePolicyService.ts     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/configuration/common/configurations.ts b/src/vs/platform/configuration/common/configurations.ts
index af542f3777b..ce69e3bb06b 100644
--- a/src/vs/platform/configuration/common/configurations.ts
+++ b/src/vs/platform/configuration/common/configurations.ts
@@ -107,6 +107,7 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 	}
 
 	async initialize(): Promise<ConfigurationModel> {
+		this.logService.trace('PolicyConfiguration#initialize');
 		this.update(await this.updatePolicyDefinitions(this.defaultConfiguration.configurationModel.keys), false);
 		this._register(this.policyService.onDidChange(policyNames => this.onDidChangePolicies(policyNames)));
 		this._register(this.defaultConfiguration.onDidChangeConfiguration(async ({ properties }) => this.update(await this.updatePolicyDefinitions(properties), true)));
@@ -114,6 +115,7 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 	}
 
 	private async updatePolicyDefinitions(properties: string[]): Promise<string[]> {
+		this.logService.trace('PolicyConfiguration#updatePolicyDefinitions', properties);
 		const policyDefinitions: IStringDictionary<PolicyDefinition> = {};
 		const keys: string[] = [];
 		const configurationProperties = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
@@ -143,12 +145,14 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 	}
 
 	private onDidChangePolicies(policyNames: readonly PolicyName[]): void {
+		this.logService.trace('PolicyConfiguration#onDidChangePolicies', policyNames);
 		const policyConfigurations = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getPolicyConfigurations();
 		const keys = coalesce(policyNames.map(policyName => policyConfigurations.get(policyName)));
 		this.update(keys, true);
 	}
 
 	private update(keys: string[], trigger: boolean): void {
+		this.logService.trace('PolicyConfiguration#update', keys);
 		const configurationProperties = Registry.as<IConfigurationRegistry>(Extensions.Configuration).getConfigurationProperties();
 		const changed: [string, PolicyValue | undefined][] = [];
 		const wasEmpty = this._configurationModel.isEmpty();
@@ -168,6 +172,7 @@ export class PolicyConfiguration extends Disposable implements IPolicyConfigurat
 		}
 
 		if (changed.length) {
+			this.logService.trace('PolicyConfiguration#changed', changed);
 			const old = this._configurationModel;
 			this._configurationModel = new ConfigurationModel();
 			for (const key of old.keys) {
diff --git a/src/vs/platform/policy/common/filePolicyService.ts b/src/vs/platform/policy/common/filePolicyService.ts
index 6695d82e3be..3d3a1531e92 100644
--- a/src/vs/platform/policy/common/filePolicyService.ts
+++ b/src/vs/platform/policy/common/filePolicyService.ts
@@ -15,7 +15,7 @@ import { AbstractPolicyService, IPolicyService, PolicyName, PolicyValue } from '
 function keysDiff<T>(a: Map<string, T>, b: Map<string, T>): string[] {
 	const result: string[] = [];
 
-	for (const key of Iterable.concat(a.keys(), b.keys())) {
+	for (const key of new Set(Iterable.concat(a.keys(), b.keys()))) {
 		if (a.get(key) !== b.get(key)) {
 			result.push(key);
 		}