From 4e963d7592cd4649181bd562e8dfd74669b24a85 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Fri, 16 Jun 2017 11:32:38 +0200
Subject: [PATCH] #28538 Move getRoot method to Workspace object

---
 src/vs/platform/workspace/common/workspace.ts  | 18 +++++++++++++++++-
 .../configuration/node/configuration.ts        | 16 +++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index 7534ba70696..7733f14a34c 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -6,7 +6,8 @@
 
 import URI from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import paths = require('vs/base/common/paths');
+import * as paths from 'vs/base/common/paths';
+import { TrieMap } from 'vs/base/common/map';
 import { isEqualOrParent } from 'vs/platform/files/common/files';
 import { isLinux } from 'vs/base/common/platform';
 import Event from 'vs/base/common/event';
@@ -145,11 +146,14 @@ export class LegacyWorkspace implements ILegacyWorkspace {
 
 export class Workspace implements IWorkspace {
 
+	private _rootsMap: TrieMap<URI> = new TrieMap<URI>(TrieMap.PathSplitter);
+
 	constructor(
 		public readonly id: string,
 		private _name: string,
 		private _roots: URI[]
 	) {
+		this.updateRootsMap();
 	}
 
 	public get roots(): URI[] {
@@ -158,6 +162,7 @@ export class Workspace implements IWorkspace {
 
 	public set roots(roots: URI[]) {
 		this._roots = roots;
+		this.updateRootsMap();
 	}
 
 	public get name(): string {
@@ -168,6 +173,17 @@ export class Workspace implements IWorkspace {
 		this._name = name;
 	}
 
+	public getRoot(resource: URI): URI {
+		return this._rootsMap.findSubstr(resource.fsPath);
+	}
+
+	private updateRootsMap(): void {
+		this._rootsMap = new TrieMap<URI>(TrieMap.PathSplitter);
+		for (const root of this.roots) {
+			this._rootsMap.insert(root.fsPath, root);
+		}
+	}
+
 	public toJSON(): IWorkspace {
 		return { id: this.id, roots: this.roots, name: this.name };
 	}
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
index 0a959e38a65..cd6fa13bedc 100644
--- a/src/vs/workbench/services/configuration/node/configuration.ts
+++ b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -8,7 +8,7 @@ import URI from 'vs/base/common/uri';
 import * as paths from 'vs/base/common/paths';
 import { TPromise } from 'vs/base/common/winjs.base';
 import Event, { Emitter } from 'vs/base/common/event';
-import { StrictResourceMap, TrieMap } from 'vs/base/common/map';
+import { StrictResourceMap } from 'vs/base/common/map';
 import { distinct, equals } from "vs/base/common/arrays";
 import * as objects from 'vs/base/common/objects';
 import * as errors from 'vs/base/common/errors';
@@ -63,18 +63,13 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp
 	private cachedFolderConfigs: StrictResourceMap<FolderConfiguration<any>>;
 
 	private readonly workspace: Workspace;
-	private rootsTrieMap: TrieMap<URI> = new TrieMap<URI>(TrieMap.PathSplitter);
+
 	private _configuration: Configuration<any>;
 
 	constructor(private environmentService: IEnvironmentService, private readonly legacyWorkspace?: LegacyWorkspace, private workspaceSettingsRootFolder: string = WORKSPACE_CONFIG_FOLDER_DEFAULT_NAME) {
 		super();
 
 		this.workspace = legacyWorkspace ? new Workspace(createHash('md5').update(legacyWorkspace.resource.fsPath).update(legacyWorkspace.ctime ? String(legacyWorkspace.ctime) : '').digest('hex'), basename(legacyWorkspace.resource.fsPath), [legacyWorkspace.resource]) : null;
-
-		this.rootsTrieMap = new TrieMap<URI>(TrieMap.PathSplitter);
-		if (this.workspace) {
-			this.rootsTrieMap.insert(this.workspace.roots[0].fsPath, this.workspace.roots[0]);
-		}
 		this._register(this.onDidUpdateConfiguration(e => this.resolveAdditionalFolders(true)));
 
 		this.baseConfigurationService = this._register(new GlobalConfigurationService(environmentService));
@@ -115,11 +110,6 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp
 			this.workspace.roots = configuredFolders;
 			this.workspace.name = configuredFolders.map(root => basename(root.fsPath) || root.fsPath).join(', ');
 
-			this.rootsTrieMap = new TrieMap<URI>(TrieMap.PathSplitter);
-			for (const folder of this.workspace.roots) {
-				this.rootsTrieMap.insert(folder.fsPath, folder);
-			}
-
 			if (notify) {
 				this._onDidChangeWorkspaceRoots.fire(configuredFolders);
 			}
@@ -139,7 +129,7 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp
 	}
 
 	public getRoot(resource: URI): URI {
-		return this.rootsTrieMap.findSubstr(resource.fsPath);
+		return this.workspace ? this.workspace.getRoot(resource) : null;
 	}
 
 	private get workspaceUri(): URI {