From 36a73e3472bbe55ce302b7370f9dbd88ad329680 Mon Sep 17 00:00:00 2001
From: Alex Ross <alros@microsoft.com>
Date: Thu, 29 Jul 2021 15:06:57 +0200
Subject: [PATCH] Remove deprecated use of rootPath Fixes
 https://github.com/microsoft/vscode-extension-samples/issues/375

---
 tree-view-sample/src/extension.ts        |  4 +++-
 tree-view-sample/src/nodeDependencies.ts |  2 +-
 tree-view-sample/vscode.proposed.d.ts    | 12 ------------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/tree-view-sample/src/extension.ts b/tree-view-sample/src/extension.ts
index 3e79d425..142cf138 100644
--- a/tree-view-sample/src/extension.ts
+++ b/tree-view-sample/src/extension.ts
@@ -9,9 +9,11 @@ import { FileExplorer } from './fileExplorer';
 import { TestView } from './testView';
 
 export function activate(context: vscode.ExtensionContext) {
+	const rootPath = (vscode.workspace.workspaceFolders && (vscode.workspace.workspaceFolders.length > 0))
+		? vscode.workspace.workspaceFolders[0].uri.fsPath : undefined;
 
 	// Samples of `window.registerTreeDataProvider`
-	const nodeDependenciesProvider = new DepNodeProvider(vscode.workspace.rootPath);
+	const nodeDependenciesProvider = new DepNodeProvider(rootPath);
 	vscode.window.registerTreeDataProvider('nodeDependencies', nodeDependenciesProvider);
 	vscode.commands.registerCommand('nodeDependencies.refreshEntry', () => nodeDependenciesProvider.refresh());
 	vscode.commands.registerCommand('extension.openPackageOnNpm', moduleName => vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(`https://www.npmjs.com/package/${moduleName}`)));
diff --git a/tree-view-sample/src/nodeDependencies.ts b/tree-view-sample/src/nodeDependencies.ts
index 57486956..853abbf4 100644
--- a/tree-view-sample/src/nodeDependencies.ts
+++ b/tree-view-sample/src/nodeDependencies.ts
@@ -7,7 +7,7 @@ export class DepNodeProvider implements vscode.TreeDataProvider<Dependency> {
 	private _onDidChangeTreeData: vscode.EventEmitter<Dependency | undefined | void> = new vscode.EventEmitter<Dependency | undefined | void>();
 	readonly onDidChangeTreeData: vscode.Event<Dependency | undefined | void> = this._onDidChangeTreeData.event;
 
-	constructor(private workspaceRoot: string) {
+	constructor(private workspaceRoot: string | undefined) {
 	}
 
 	refresh(): void {
diff --git a/tree-view-sample/vscode.proposed.d.ts b/tree-view-sample/vscode.proposed.d.ts
index 2e9d85ec..64d16589 100644
--- a/tree-view-sample/vscode.proposed.d.ts
+++ b/tree-view-sample/vscode.proposed.d.ts
@@ -2879,18 +2879,6 @@
 
 	//#endregion
 
-	//#region https://github.com/microsoft/vscode/issues/87110 @eamodio
-
-	export interface Memento {
-
-		/**
-		 * The stored keys.
-		 */
-		readonly keys: readonly string[];
-	}
-
-	//#endregion
-
 	//#region https://github.com/microsoft/vscode/issues/126258 @aeschli
 
 	export interface StatusBarItem {