Fix log showing problem and theia detection (#643)

eclipse-archived/codewind#3158

Signed-off-by: Tim Etchells <timetchells@ibm.com>

Author: Tim Etchells

dev/src/CWExtensionContext.ts

@@ -50,8 +50,8 @@ class CWExtensionContext implements vscode.ExtensionContext {
         private readonly vscContext: vscode.ExtensionContext,
     ) {
         this.resourcesPath = path.join(vscContext.extensionPath, "res");
-        this.isTheia = vscode.env.appName.toLowerCase().includes("theia");
         this.isChe = !!process.env[Constants.CHE_WORKSPACEID_ENVVAR];
+        this.isTheia = this.isChe || vscode.env.appName.toLowerCase().includes("theia");
 
         const thisExtension = vscode.extensions.getExtension("IBM.codewind")!;
         this.extensionVersion = thisExtension.packageJSON.version;

dev/src/codewind/project/logs/MCLogManager.ts

@@ -118,10 +118,12 @@ export default class MCLogManager {
     }
 
     public async showAll(type: "background" | "foreground"): Promise<void> {
-        Log.d("Showing all logs for " + this.project.name);
+        Log.d(`Showing all logs for ${this.project.name} in the ${type}`);
         this.isShowingAll = type;
         this.logs.forEach((log) => log.createOutput(true));
-        await this.toggleLogStreaming(true);
+        if (this.logs.length > 0) {
+            await this.toggleLogStreaming(true);
+        }
     }
 
     /**

dev/src/command/project/ManageLogsCmd.ts

@@ -75,21 +75,39 @@ async function manageLogsInner(project: Project, all?: "show" | "show-from-creat
     // https://github.com/eclipse-theia/theia/issues/5673
     // In theia, the strings are a little different because we can only manage one log at a time due to no canPickMany support.
     // Note that the MCLog's 'detail' field is only set in Theia.
-    const placeHolder = CWExtensionContext.get().isTheia ?
+    const isTheiaManageLogs = CWExtensionContext.get().isTheia;
+
+    const placeHolder = isTheiaManageLogs ?
         `Select a log to show or hide in the Output view` :
         `Select the logs you wish to see in the Output view`;
 
-    const logsToShow = await vscode.window.showQuickPick<MCLog>(logs, {
+    const logsSelected = await vscode.window.showQuickPick<MCLog>(logs, {
         canPickMany: true,
         matchOnDescription: true,
         placeHolder,
     });
-    // https://github.com/Microsoft/vscode/issues/64014
-    // }) as (MCLog[] | undefined);
 
-    if (logsToShow == null) {
+    if (logsSelected == null) {
+        // cancelled
         return;
     }
 
+    let logsToShow;
+    if (!isTheiaManageLogs) {
+        logsToShow = logsSelected;
+    }
+    else {
+        logsToShow = logs.filter((log) => {
+            if (logsSelected.includes(log)) {
+                // inside theia, we just toggle the one log that was selected
+                Log.d(`Log ${log.logName} is the selected one; toggling`);
+                return !log.isOpen;
+            }
+            // maintain the state for all the logs that are not the selected one
+            Log.d(`Log ${log.logName} is not selected; maintaining state`);
+            return log.isOpen;
+        });
+    }
+
     await project.logManager.showSome(logsToShow, true);
 }