Add setting to view output in dock by default (#1022)

* Reuse output pane config to keep watch pane open if no kernel

* Add config to open results in output pane by default

* Set output config when toggling or clearing pane

Off when clearing output
On when toggle opens a new pane instance

* Use output pane until completely closed

* Revert "Set output config when toggling or clearing pane"

This reverts commit d957c2f.

Author: BenRussert

lib/components/output-area.js

@@ -8,19 +8,11 @@ import Anser from "anser";
 
 import History from "./result-view/history";
 import ScrollList from "./result-view/list";
-import { OUTPUT_AREA_URI } from "./../utils";
+import { OUTPUT_AREA_URI, EmptyMessage } from "./../utils";
 
 import typeof store from "../store";
 import type { IObservableValue } from "mobx";
 
-const EmptyMessage = () => {
-  return (
-    <ul className="background-message centered">
-      <li>No output to display</li>
-    </ul>
-  );
-};
-
 @observer
 class OutputArea extends React.Component<{ store: store }> {
   showHistory: IObservableValue<boolean> = observable(true);

lib/components/watch-sidebar/index.js

@@ -5,16 +5,21 @@ import React from "react";
 import { observer } from "mobx-react";
 
 import Watch from "./watch";
-import { WATCHES_URI } from "../../utils";
+import { WATCHES_URI, EmptyMessage } from "../../utils";
 
 import type Kernel from "./../../kernel";
 import typeof store from "../../store";
 
 const Watches = observer(({ store: { kernel } }: { store: store }) => {
   if (!kernel) {
-    atom.workspace.hide(WATCHES_URI);
-    return null;
+    if (atom.config.get("Hydrogen.outputAreaDock")) {
+      return <EmptyMessage />;
+    } else {
+      atom.workspace.hide(WATCHES_URI);
+      return null;
+    }
   }
+
   return (
     <div className="sidebar watch-sidebar">
       {kernel.watchesStore.watches.map(watch => (

lib/config.js

@@ -100,11 +100,18 @@ const Config = {
       default: "{}"
     },
     outputAreaDock: {
-      title: "Output Area Dock",
+      title: "Leave output dock open",
       description:
         "Do not close dock when switching to an editor without a running kernel",
       type: "boolean",
       default: false
+    },
+    outputAreaDefault: {
+      title: "View output in the dock by default",
+      description:
+        "If enabled, output will be displayed in the dock by default rather than inline",
+      type: "boolean",
+      default: false
     }
   }
 };

lib/main.js

@@ -40,7 +40,6 @@ import AutocompleteProvider from "./autocomplete-provider";
 import HydrogenProvider from "./plugin-api/hydrogen-provider";
 import {
   log,
-  focus,
   reactFactory,
   isMultilanguageGrammar,
   renderDevTools,
@@ -349,11 +348,11 @@ const Hydrogen = {
       kernel.watchesStore.run();
       return;
     }
-    const globalOutputStore = atom.workspace
-      .getPaneItems()
-      .find(item => item instanceof OutputPane)
-      ? kernel.outputStore
-      : null;
+    const globalOutputStore =
+      atom.config.get("Hydrogen.outputAreaDefault") ||
+      atom.workspace.getPaneItems().find(item => item instanceof OutputPane)
+        ? kernel.outputStore
+        : null;
 
     const { outputStore } = new ResultView(
       store.markers,
@@ -367,18 +366,7 @@ const Hydrogen = {
       outputStore.appendOutput(result);
       if (globalOutputStore) {
         globalOutputStore.appendOutput(result);
-
-        if (store.kernel !== kernel) return;
-
-        const container = atom.workspace.paneContainerForURI(OUTPUT_AREA_URI);
-        const pane = atom.workspace.paneForURI(OUTPUT_AREA_URI);
-        if (
-          (container && container.isVisible && !container.isVisible()) ||
-          (pane && pane.itemForURI(OUTPUT_AREA_URI) !== pane.getActiveItem())
-        ) {
-          await atom.workspace.open(OUTPUT_AREA_URI, { searchAllPanes: true });
-          focus(store.editor);
-        }
+        openOrShowDock(OUTPUT_AREA_URI);
       }
     });
   },

lib/utils.js

@@ -38,19 +38,21 @@ export function focus(item: ?mixed) {
   }
 }
 
-export function openOrShowDock(URI: string) {
+export async function openOrShowDock(URI: string): Promise<?void> {
   // atom.workspace.open(URI) will activate/focus the dock by default
   // dock.toggle() or dock.show() will leave focus wherever it was
 
   // this function is basically workspace.open, except it
-  // will not focus the pane if there is an open instance of that view
+  // will not focus the newly opened pane
+  let dock = atom.workspace.paneContainerForURI(URI);
+  if (dock) return dock.show();
 
-  const dock = atom.workspace.paneContainerForURI(URI);
-  if (!dock) {
-    atom.workspace.open(URI, { searchAllPanes: true });
-  } else {
-    dock.show();
-  }
+  await atom.workspace.open(URI, {
+    searchAllPanes: true,
+    activatePane: false
+  });
+  dock = atom.workspace.paneContainerForURI(URI);
+  return dock ? dock.show() : null;
 }
 
 export function grammarToLanguage(grammar: ?atom$Grammar) {
@@ -216,3 +218,11 @@ export function rowRangeForCodeFoldAtBufferRow(
     return range ? [range.start.row, range.end.row] : null;
   }
 }
+
+export const EmptyMessage = () => {
+  return (
+    <ul className="background-message centered">
+      <li>No output to display</li>
+    </ul>
+  );
+};