@@ -254,7 +254,7 @@ class DefaultClient implements Client {
254254 private disposables : vscode . Disposable [ ] = [ ] ;
255255 private configuration : configs . CppProperties ;
256256 private rootPathFileWatcher : vscode . FileSystemWatcher ;
257- private workspaceRoot : vscode . WorkspaceFolder | undefined ;
257+ private rootFolder : vscode . WorkspaceFolder | undefined ;
258258 private trackedDocuments = new Set < vscode . TextDocument > ( ) ;
259259 private outputChannel : vscode . OutputChannel ;
260260 private debugChannel : vscode . OutputChannel ;
@@ -279,16 +279,16 @@ class DefaultClient implements Client {
279279 public get ActiveConfigChanged ( ) : vscode . Event < string > { return this . model . activeConfigName . ValueChanged ; }
280280
281281 /**
282- * don't use this.workspaceRoot directly since it can be undefined
282+ * don't use this.rootFolder directly since it can be undefined
283283 */
284284 public get RootPath ( ) : string {
285- return ( this . workspaceRoot ) ? this . workspaceRoot . uri . fsPath : "" ;
285+ return ( this . rootFolder ) ? this . rootFolder . uri . fsPath : "" ;
286286 }
287287 public get RootUri ( ) : vscode . Uri {
288- return ( this . workspaceRoot ) ? this . workspaceRoot . uri : null ;
288+ return ( this . rootFolder ) ? this . rootFolder . uri : null ;
289289 }
290290 public get Name ( ) : string {
291- return this . getName ( this . workspaceRoot ) ;
291+ return this . getName ( this . rootFolder ) ;
292292 }
293293 public get TrackedDocuments ( ) : Set < vscode . TextDocument > {
294294 return this . trackedDocuments ;
@@ -312,7 +312,7 @@ class DefaultClient implements Client {
312312 languageClient . registerProposedFeatures ( ) ;
313313 languageClient . start ( ) ; // This returns Disposable, but doesn't need to be tracked because we call .stop() explicitly in our dispose()
314314 util . setProgress ( util . getProgressExecutableStarted ( ) ) ;
315- this . workspaceRoot = workspaceFolder ;
315+ this . rootFolder = workspaceFolder ;
316316 ui = getUI ( ) ;
317317 ui . bind ( this ) ;
318318
@@ -520,12 +520,12 @@ class DefaultClient implements Client {
520520 }
521521
522522 /**
523- * listen for file created/deleted events under the ${workspaceRoot } folder
523+ * listen for file created/deleted events under the ${workspaceFolder } folder
524524 */
525525 private registerFileWatcher ( ) : void {
526526 console . assert ( this . languageClient !== undefined , "This method must not be called until this.languageClient is set in \"onReady\"" ) ;
527527
528- if ( this . workspaceRoot ) {
528+ if ( this . rootFolder ) {
529529 // WARNING: The default limit on Linux is 8k, so for big directories, this can cause file watching to fail.
530530 this . rootPathFileWatcher = vscode . workspace . createFileSystemWatcher (
531531 path . join ( this . RootPath , "*" ) ,
0 commit comments