Merge branch 'develop' into bobbrow/ninjaPathCrash

src/tree.ts

@@ -520,7 +520,7 @@ export class ProjectOutlineProvider implements vscode.TreeDataProvider<BaseNode>
   updateCodeModel(folder: vscode.WorkspaceFolder, model: codemodel_api.CodeModelContent|null, ctx: ExternalUpdateContext) {
     let existing = this._folders.get(folder.uri.fsPath);
     if (!existing) {
-      rollbar.error(localize('error.update.code.model.on.nonexist.folder', 'Updating code model on folder that does not yet exist.'));
+      rollbar.error(localize('error.update.code.model.on.nonexist.folder', 'Updating code model on folder that has not yet been loaded.'));
       // That's an error, but we can keep going otherwise.
       existing = new WorkspaceFolderNode(folder);
       this._folders.set(folder.uri.fsPath, existing);