Fix error when rootRui is null. (#2614)

sean-mcmanus · web-flow · commit e819f36e91c5 · 2018-10-05T15:34:44.000-07:00
diff --git a/Extension/src/LanguageServer/configurations.ts b/Extension/src/LanguageServer/configurations.ts
@@ -264,7 +264,7 @@ export class CppProperties {
             Object.assign(result, this.configurationJson.env);
         }
 
-        result["workspaceFolderBasename"] = path.basename(this.rootUri.fsPath);
+        result["workspaceFolderBasename"] = this.rootUri ? path.basename(this.rootUri.fsPath) : "";
         return result;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ export class CppProperties {`
`264`	`264`	`Object.assign(result, this.configurationJson.env);`
`265`	`265`	`}`
`266`	`266`
`267`		`- result["workspaceFolderBasename"] = path.basename(this.rootUri.fsPath);`
	`267`	`+ result["workspaceFolderBasename"] = this.rootUri ? path.basename(this.rootUri.fsPath) : "";`
`268`	`268`	`return result;`
`269`	`269`	`}`
`270`	`270`