add root path to run script for better project detection

Author: atomicptr

src/defold/editor_config.clj

@@ -21,9 +21,9 @@
   (let [os (determine-os)
         [run-file content]
         (case os
-          :linux   ["run.sh"  (format "#!/usr/bin/env bash\n%s --config \"%s\" run launch-neovim \"%s\" \"$1\" $2" (escape-spaces bb-path) (bb-edn) config-path)]
-          :mac     ["run.sh"  (format "#!/usr/bin/env bash\nexport PATH=\"/usr/bin:/usr/local/bin:$PATH\"\n%s --config \"%s\" run launch-neovim \"%s\" \"$1\" $2" (escape-spaces bb-path) (bb-edn) config-path)]
-          :windows ["run.bat" (format "@echo off\r\n\"%s\" --config \"%s\" run launch-neovim \"%s\" \"%%~1\" %%2" bb-path (bb-edn) config-path)]
+          :linux   ["run.sh"  (format "#!/usr/bin/env bash\n%s --config \"%s\" run launch-neovim \"%s\" \"$(realpath .)\" \"$1\" $2" (escape-spaces bb-path) (bb-edn) config-path)]
+          :mac     ["run.sh"  (format "#!/usr/bin/env bash\nexport PATH=\"/usr/bin:/usr/local/bin:$PATH\"\n%s --config \"%s\" run launch-neovim \"%s\" \"$(realpath .)\" \"$1\" $2" (escape-spaces bb-path) (bb-edn) config-path)]
+          :windows ["run.bat" (format "@echo off\r\n\"%s\" --config \"%s\" run launch-neovim \"%s\" \"%CD%\" \"%%~1\" %%2" bb-path (bb-edn) config-path)]
           :unknown (let [ex (ex-info "Can't create runner script for unknown operating system" {})]
                      (log/error (ex-message ex) ex)
                      (throw ex)))

src/defold/launcher.clj

@@ -11,29 +11,6 @@
                          seq-replace-var windows?]]
    [taoensso.timbre :as log]))
 
-(defn- find-project-root-from-file [file]
-  (loop [current-dir (fs/parent (fs/path file))]
-    (if-not current-dir
-      (throw (ex-info (str "Could not determine Defold project from path: " file) {}))
-      (let [target (fs/path current-dir "game.project")]
-        (if (fs/exists? target)
-          (str current-dir)
-          (recur (fs/parent current-dir)))))))
-
-; TODO: #33 this is not a good solution, but it works for most use cases presumably
-(defn- find-project-root-from-file-or-use-old-one [file]
-  (let [path (cache-dir "defold.nvim")
-        last-used (str (fs/path path ".last-used-project-root"))]
-    (fs/create-dirs path)
-    (try
-      (let [project-root (find-project-root-from-file file)]
-        (spit last-used project-root)
-        project-root)
-      (catch Throwable t
-        (log/error (ex-message t))
-        (assert (fs/exists? last-used))
-        (slurp last-used)))))
-
 (defn- runtime-dir [project-root]
   (let [p (cache-dir "defold.nvim" "runtime" (project-id project-root))]
     (fs/create-dirs p)
@@ -172,11 +149,10 @@
     "terminal" (create-terminal-launcher cfg neovim)
     (throw (ex-info (format "Unknown launcher type: %s" (cfg "type")) {:launcher-config cfg}))))
 
-(defn run [launcher-config file-name line]
+(defn run [launcher-config root-dir file-name line]
   (let [neovim      (str (fs/which "nvim"))
         launcher    (create-launcher launcher-config neovim)
         line        (when line (Integer/parseInt line))
-        root-dir    (find-project-root-from-file-or-use-old-one file-name)
         class-name  (format base-class-name (project-id root-dir))
         edit-cmd    (make-neovim-edit-command file-name line)]
     (when (or (nil? (:cmd launcher)) (not (command-exists? (:cmd launcher))))

src/defold/main.clj

@@ -64,12 +64,12 @@
   (print-json (editor/send-command cmd)))
 
 (defmethod run :launch-neovim
-  ([_ config-file filename]
+  ([_ config-file root-dir filename]
    (let [conf (parse-config config-file)]
-     (launcher/run (get-in conf ["plugin_config" "launcher"]) filename nil)))
-  ([_ config-file filename line]
+     (launcher/run (get-in conf ["plugin_config" "launcher"]) root-dir filename nil)))
+  ([_ config-file root-dir filename line]
    (let [conf (parse-config config-file)]
-     (launcher/run (get-in conf ["plugin_config" "launcher"]) filename line))))
+     (launcher/run (get-in conf ["plugin_config" "launcher"]) root-dir filename line))))
 
 (defmethod run :focus-neovim [_ _ root-dir]
   (print-json (focus/focus-neovim root-dir)))