Make standalone connect start working again

- Creates a temporary project root if no workspace folder present Fixes #814
BetterThanTomorrow · Feb 14, 2021 · 005c54b · 005c54b
1 parent 28b8fa0
commit 005c54b
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 101 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,6 +13,8 @@
         "Insourcing",
         "Jackin",
         "Jackout",
+        "Libspec",
+        "Notespace",
         "OVSX",
         "Pseudoterminal",
         "REBL",
@@ -66,6 +68,7 @@
         "entrypoint",
         "errored",
         "eval",
+        "evals",
         "falsesomething",
         "fehse",
         "feldman",
@@ -120,6 +123,7 @@
         "sbin",
         "scaturro",
         "schäfer",
+        "seqs",
         "sivertsen",
         "stacktraces",
         "stian",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Changes to Calva.
 
 ## [Unreleased]
+- Fix [Connect ”not in project” glitches](https://github.com/BetterThanTomorrow/calva/issues/814)
 
 ## [2.0.171] - 2021-02-10
 - Update clojure-lsp to version 2021.02.09-18.28.06 (Fix: [Auto completion does not work in clojure-lsp only mode (no repl connection)](https://github.com/BetterThanTomorrow/calva/issues/996#issuecomment-776148282))

diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
         "onLanguage:clojure",
         "onCommand:calva.startNewRepl",
         "onCommand:calva.jackIn",
-        "onCommand:calva.jackInOrConnect",
+        "onCommand:calva.startOrConnectRepl",
         "onCommand:calva.connect",
         "onCommand:calva.connectNonProjectREPL",
         "workspaceContains:**/project.clj",
@@ -658,14 +658,8 @@
                 "category": "Calva"
             },
             {
-                "command": "calva.jackInOrConnect",
-                "title": "Jack-in or Connect to REPL Server",
-                "enablement": "!calva:connected && !calva:connecting",
-                "category": "Calva"
-            },
-            {
-                "command": "calva.startNewRepl",
-                "title": "Start a Clojure REPL",
+                "command": "calva.startOrConnectRepl",
+                "title": "Start or Connect to a Clojure REPL",
                 "category": "Calva"
             },
             {
@@ -1241,7 +1235,7 @@
                 "when": "calva:keybindingsEnabled"
             },
             {
-                "command": "calva.startNewRepl",
+                "command": "calva.startOrConnectRepl",
                 "key": "ctrl+alt+c ctrl+alt+r"
             },
             {
@@ -1724,11 +1718,7 @@
         "menus": {
             "commandPalette": [
                 {
-                    "command": "calva.jackInOrConnect",
-                    "when": "false"
-                },
-                {
-                    "command": "calva.startNewRepl",
+                    "command": "calva.startOrConnectRepl",
                     "when": "true"
                 },
                 {
@@ -1767,7 +1757,7 @@
                 {
                     "when": "editorLangId == clojure",
                     "enablement": "!calva:connected",
-                    "command": "calva.jackInOrConnect",
+                    "command": "calva.startOrConnectRepl",
                     "group": "calva/x-connect"
                 },
                 {

diff --git a/src/connector.ts b/src/connector.ts
@@ -452,8 +452,13 @@ export async function connect(connectSequence: ReplConnectSequence,
 
     try {
         if (port === undefined) {
-            let bytes = await vscode.workspace.fs.readFile(portFile);
-            port = new TextDecoder("utf-8").decode(bytes);
+            try {
+                await vscode.workspace.fs.stat(portFile);
+                let bytes = await vscode.workspace.fs.readFile(portFile);
+                port = new TextDecoder("utf-8").decode(bytes);
+            } catch {
+                throw new Error("No nrepl port found");
+            }
         }
         if (port) {
             hostname = hostname !== undefined ? hostname : "localhost";
@@ -476,7 +481,13 @@ export async function connect(connectSequence: ReplConnectSequence,
 
 }
 
-async function standaloneConnect(connectSequence: ReplConnectSequence) {
+async function standaloneConnect(context: vscode.ExtensionContext, connectSequence: ReplConnectSequence) {
+    await state.initProjectDir();
+    let projectDirUri = state.getProjectRootUri();
+    if (!projectDirUri) {
+        projectDirUri = await state.getOrCreateNonProjectRoot(context);
+    }
+    await state.initProjectDir(projectDirUri);
     await outputWindow.initResultsDoc();
     await outputWindow.openResultsDoc();
 
@@ -492,25 +503,25 @@ async function standaloneConnect(connectSequence: ReplConnectSequence) {
 }
 
 export default {
-    connectNonProjectREPLCommand: async () => {
+    connectNonProjectREPLCommand: async (context: vscode.ExtensionContext) => {
         status.updateNeedReplUi(true);
         const connectSequence = await askForConnectSequence(projectTypes.getAllProjectTypes(), 'connect-type', "ConnectInterrupted");
-        standaloneConnect(connectSequence);
+        standaloneConnect(context, connectSequence);
     },
-    connectCommand: async () => {
+    connectCommand: async (context: vscode.ExtensionContext) => {
         status.updateNeedReplUi(true);
         // TODO: Figure out a better way to have an initialized project directory.
         try {
             await state.initProjectDir();
             await liveShareSupport.setupLiveShareListener();
         } catch {
             // Could be a bae file, user makes the call
-            vscode.commands.executeCommand('calva.jackInOrConnect');
+            vscode.commands.executeCommand('calva.startOrConnectRepl');
             return;
         }
         const cljTypes = await projectTypes.detectProjectTypes(),
             connectSequence = await askForConnectSequence(cljTypes, 'connect-type', "ConnectInterrupted");
-        standaloneConnect(connectSequence);
+        standaloneConnect(context, connectSequence);
     },
     disconnect: (options = null, callback = () => { }) => {
         status.updateNeedReplUi(false);

diff --git a/src/extension.ts b/src/extension.ts
@@ -133,11 +133,13 @@ async function activate(context: vscode.ExtensionContext) {
     status.update(context);
 
     // COMMANDS
-    context.subscriptions.push(vscode.commands.registerCommand('calva.jackInOrConnect', jackIn.calvaJackInOrConnect));
-    context.subscriptions.push(vscode.commands.registerCommand('calva.startNewRepl', jackIn.calvaJackInOrConnect));
+    context.subscriptions.push(vscode.commands.registerCommand('calva.startOrConnectRepl', jackIn.startOrConnectRepl));
+    context.subscriptions.push(vscode.commands.registerCommand('calva.startNewRepl', jackIn.startOrConnectRepl));
     context.subscriptions.push(vscode.commands.registerCommand('calva.jackIn', jackIn.calvaJackIn));
     context.subscriptions.push(vscode.commands.registerCommand('calva.copyJackInCommandToClipboard', jackIn.copyJackInCommandToClipboard));
-    context.subscriptions.push(vscode.commands.registerCommand('calva.connectNonProjectREPL', connector.connectNonProjectREPLCommand));
+    context.subscriptions.push(vscode.commands.registerCommand('calva.connectNonProjectREPL', () => {
+        connector.connectNonProjectREPLCommand(context)
+    }));
     context.subscriptions.push(vscode.commands.registerCommand('calva.connect', connector.connectCommand));
     context.subscriptions.push(vscode.commands.registerCommand('calva.disconnect', jackIn.calvaDisconnect));
     context.subscriptions.push(vscode.commands.registerCommand('calva.toggleCLJCSession', connector.toggleCLJCSession));

diff --git a/src/nrepl/connectSequence.ts b/src/nrepl/connectSequence.ts
@@ -205,7 +205,7 @@ function getCustomConnectSequences(): ReplConnectSequence[] {
  */
 function getConnectSequences(projectTypes: string[]): ReplConnectSequence[] {
     const customSequences = getCustomConnectSequences();
-    const defSequences = projectTypes.reduce((seqs, projecType) => seqs.concat(defaultSequences[projecType]), []);
+    const defSequences = projectTypes.reduce((seqs, projectType) => seqs.concat(defaultSequences[projectType]), []);
     const defSequenceProjectTypes = [...new Set(defSequences.map(s => s.projectType))];
     const sequences = customSequences.filter(customSequence => defSequenceProjectTypes.includes(customSequence.projectType)).concat(defSequences);
     return sequences;

diff --git a/src/nrepl/jack-in.ts b/src/nrepl/jack-in.ts
@@ -247,7 +247,7 @@ export async function calvaDisconnect() {
     vscode.window.showInformationMessage("Not connected to a REPL server");
 }
 
-export async function calvaJackInOrConnect() {
+export async function startOrConnectRepl() {
     const JACK_IN_OPTION = "Start a REPL server and connect (a.k.a. Jack-in)";
     const JACK_IN_COMMAND = "calva.jackIn";
     let commands = {};

diff --git a/src/nrepl/project-types.ts b/src/nrepl/project-types.ts
@@ -7,6 +7,7 @@ import * as pprint from '../printer';
 
 import { keywordize, unKeywordize } from '../util/string';
 import { CljsTypes, ReplConnectSequence } from './connectSequence';
+import { pathToNs } from '../util/ns-form';
 const { parseForms, parseEdn } = require('../../out/cljs-lib/cljs-lib');
 
 export const isWin = /^win/.test(process.platform);
@@ -60,7 +61,7 @@ export function nreplPortFileUri(connectSequence: ReplConnectSequence): vscode.U
         try {
             return vscode.Uri.joinPath(projectRoot, relativePath);
         } catch (e) {
-            console.log(e);
+            return vscode.Uri.file(path.join(projectRoot.fsPath, relativePath));
         }
     }
     return vscode.Uri.file(relativePath);
@@ -495,7 +496,7 @@ export async function detectProjectTypes(): Promise<string[]> {
 }
 
 export function getAllProjectTypes(): string[] {
-    return [...Object.keys(projectTypes)];
+    return ['generic', ...Object.keys(projectTypes).filter(pt => pt !== 'generic')];
 }
 
 export function getCljsTypeName(connectSequence: ReplConnectSequence) {

diff --git a/src/results-output/results-doc.ts b/src/results-output/results-doc.ts
@@ -36,12 +36,14 @@ export const CLJS_CONNECT_GREETINGS = '; TIPS: You can choose which REPL to use
 ;    *Calva: Toggle REPL connection*\n\
 ;    (There is a button in the status bar for this)';
 
+
 function outputFileDir() {
     let projectRoot = state.getProjectRootUri();
-    if (!projectRoot) {
-        projectRoot = vscode.Uri.file(os.tmpdir());
+    try {
+        return vscode.Uri.joinPath(projectRoot, ".calva", "output-window");
+    } catch {
+        return vscode.Uri.file(path.join(projectRoot.fsPath, ".calva", "output-window"));
     }
-    return vscode.Uri.joinPath(projectRoot, ".calva", "output-window");
 };
 
 const DOC_URI = () => {