Add backward compatibility related to switching to multi root mode

plugins/workspace-plugin/src/workspace-folder-updater.ts

@@ -13,7 +13,7 @@ export class WorkspaceFolderUpdater {
   private pendingFolders: string[] = [];
   private addingWorkspaceFolderPromise: Promise<void> | undefined;
 
-  constructor(protected readonly updateWorkspaceFolderTimeout = 3000) {}
+  constructor(protected readonly updateWorkspaceFolderTimeout = 7000) {}
 
   async addWorkspaceFolder(path: string): Promise<void> {
     const workspaceFolderPath = this.toValidWorkspaceFolderPath(path);

plugins/workspace-plugin/src/workspace-projects-manager.ts

@@ -47,7 +47,8 @@ export class WorkspaceProjectsManager {
 
     this.outputChannel.appendLine(`Found devfile ${JSON.stringify(devfile, undefined, 2)}`);
 
-    const cloneCommandList = await this.buildCloneCommands(devfile.projects || []);
+    const projects = devfile.projects || [];
+    const cloneCommandList = await this.buildCloneCommands(projects);
 
     this.outputChannel.appendLine(`Clone commands are ${JSON.stringify(cloneCommandList, undefined, 2)}`);
 
@@ -59,6 +60,15 @@ export class WorkspaceProjectsManager {
     theia.window.withProgress({ location: { viewId: 'explorer' } }, () => cloningPromise);
     await cloningPromise;
 
+    if (isMultiRoot) {
+      // Backward compatibility for single-root workspaces
+      // we need it to support workspaces which were created before switching multi-root mode to ON by default
+      projects
+        .map(project => this.getProjectPath(project))
+        .filter(projectPath => fs.existsSync(projectPath))
+        .forEach(projectPath => this.workspaceFolderUpdater.addWorkspaceFolder(projectPath));
+    }
+
     await this.startSyncWorkspaceProjects();
   }