Add command ”transfering” current file ns to output window

Use default shortcut from old REPL window Addressing #711
BetterThanTomorrow · Aug 2, 2020 · 0a2024b · 0a2024b
1 parent e21bf0c
commit 0a2024b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1134,6 +1134,12 @@
                 "command": "calva.showOutputWindow",
                 "title": "Show Output Window",
                 "enablement": "calva:connected"
+            },
+            {
+                "command": "calva.setOutputWindowNamespace",
+                "title": "Switch Namespace in Output Window to Current Namespace",
+                "enablement": "calva:connected",
+                "category": "Calva"
             }
         ],
         "keybindings": [
@@ -1247,10 +1253,6 @@
                 "command": "calva.loadNamespace",
                 "key": "ctrl+alt+c ctrl+alt+n"
             },
-            {
-                "command": "calva.setREPLNamespace",
-                "key": "ctrl+alt+c alt+n"
-            },
             {
                 "command": "calva.evalCurrentFormInREPLWindow",
                 "key": "ctrl+alt+c ctrl+alt+e",
@@ -1622,7 +1624,12 @@
             {
                 "command": "calva.showOutputWindow",
                 "key": "ctrl+alt+c o",
-                "when": "calva:connected"
+                "when": "calva:connected && !calva.outputWindowActive"
+            },
+            {
+                "command": "calva.setOutputWindowNamespace",
+                "key": "ctrl+alt+c alt+n",
+                "when": "editorLangId == clojure && calva:connected && !calva:outputWindowActive"
             }
         ],
         "menus": {
@@ -1824,4 +1831,4 @@
     "extensionDependencies": [
         "borkdude.clj-kondo"
     ]
-}
+}
diff --git a/src/extension.ts b/src/extension.ts
@@ -160,6 +160,7 @@ function activate(context: vscode.ExtensionContext) {
 
     context.subscriptions.push(vscode.commands.registerCommand('calva.runCustomREPLCommand', eval.evaluateCustomCommandSnippetCommand));
     context.subscriptions.push(vscode.commands.registerCommand('calva.showOutputWindow', () => { outputWindow.revealResultsDoc(false) }));
+    context.subscriptions.push(vscode.commands.registerCommand('calva.setOutputWindowNamespace', outputWindow.setNamespaceFromCurrentFile));
 
     // Temporary command to teach new default keyboard shortcut chording key
     context.subscriptions.push(vscode.commands.registerCommand('calva.tellAboutNewChordingKey', () => {
@@ -168,6 +169,7 @@ function activate(context: vscode.ExtensionContext) {
 
     // Initial set of the provided contexts
     vscode.commands.executeCommand("setContext", "calva:replWindowActive", false);
+    vscode.commands.executeCommand("setContext", "calva:outputWindowActive", false);
     vscode.commands.executeCommand("setContext", "calva:launching", false);
     vscode.commands.executeCommand("setContext", "calva:connected", false);
     vscode.commands.executeCommand("setContext", "calva:connecting", false);

diff --git a/src/result-output.ts b/src/result-output.ts
@@ -45,7 +45,7 @@ export function getSession(): NReplSession {
     return _sessionInfo[_sessionType].session;
 }
 
-export function setSession(session: NReplSession, newNs: string): void {
+export function setSession(session: NReplSession, newNs: string, onPromptAdded: OnResultAppendedCallback = null): void {
     if (session) {
         if (session.replType) {
             _sessionType = session.replType;
@@ -56,7 +56,7 @@ export function setSession(session: NReplSession, newNs: string): void {
         _sessionInfo[_sessionType].ns = newNs;
     }
     _prompt = `${_sessionType}::${getNs()}=> `;
-    appendToResultsDoc(_prompt, null);
+    appendToResultsDoc(_prompt, onPromptAdded);
 }
 
 export function isResultsDoc(doc: vscode.TextDocument): boolean {
@@ -109,7 +109,9 @@ export async function initResultsDoc(): Promise<vscode.TextDocument> {
     resultsEditor.revealRange(new vscode.Range(firstPos, firstPos));
     // For some reason onDidChangeTextEditorViewColumn won't fire
     state.extensionContext.subscriptions.push(vscode.window.onDidChangeActiveTextEditor(event => {
-        if (isResultsDoc(event.document)) {
+        const isOutputWindow = isResultsDoc(event.document);
+        vscode.commands.executeCommand("setContext", "calva:outputWindowActive", isOutputWindow);
+        if (isOutputWindow) {
             setViewColumn(event.viewColumn);
         }
     }));
@@ -127,6 +129,15 @@ export function revealResultsDoc(preserveFocus: boolean = true) {
     });
 }
 
+export function setNamespaceFromCurrentFile() {
+    const session = util.getSession();
+    const ns = util.getNamespace(util.getDocument({}));
+    setSession(session, ns, _ => {
+        revealResultsDoc(false);
+        util.updateREPLSessionType();
+    });
+}
+
 let scrollToBottomSub: vscode.Disposable;
 interface OnResultAppendedCallback {
     (insertLocation: vscode.Location): any
@@ -228,4 +239,4 @@ function scrollToBottom(editor: vscode.TextEditor) {
 
 export {
     OnResultAppendedCallback
-};
+};