Simplify idris-load-file

Author: keram

idris-commands.el

@@ -180,7 +180,7 @@ A prefix argument SET-LINE forces loading but only up to the current line."
     (idris-load-to (point))
     (idris-make-dirty))
   (when (and set-line (= set-line 16)) (idris-no-load-to))
-  (if (buffer-file-name)
+  (if-let ((fn (idris-filename-to-load)))
       (when (idris-current-buffer-dirty-p)
         (when idris-prover-currently-proving
           (if (y-or-n-p (format "%s is open in the prover. Abandon and load? "
@@ -194,8 +194,7 @@ A prefix argument SET-LINE forces loading but only up to the current line."
           (with-current-buffer idris-notes-buffer-name
             (let ((inhibit-read-only t)) (erase-buffer))))
         ;; Actually do the loading
-        (let ((fn (idris-filename-to-load))
-               (idris-semantic-source-highlighting (idris-buffer-semantic-source-highlighting)))
+        (let ((idris-semantic-source-highlighting (idris-buffer-semantic-source-highlighting)))
           (setq idris-currently-loaded-buffer nil)
           (idris-delete-ibc t) ;; delete the ibc to avoid interfering with partial loads
           (idris-toggle-semantic-source-highlighting)
@@ -250,24 +249,22 @@ A prefix argument SET-LINE forces loading but only up to the current line."
 This sets the load position to point, if there is one."
   (save-buffer)
   (idris-ensure-process-and-repl-buffer)
-  (if (buffer-file-name)
+  (if-let ((fn (idris-filename-to-load)))
       (unless (idris-position-loaded-p (point))
         (idris-warning-reset-all)
         (when (and idris-load-to-here
                    (< (marker-position idris-load-to-here) (point)))
           (idris-load-to (point)))
-        (let ((fn (idris-filename-to-load)))
-          (setq idris-currently-loaded-buffer nil)
-          ;; (idris-switch-working-directory srcdir)
-          (let ((result
-                 (idris-eval
-                  (if idris-load-to-here
-                      `(:load-file ,fn ,(idris-get-line-num idris-load-to-here))
-                    `(:load-file ,fn)))))
-            (idris-update-options-cache)
-            (setq idris-currently-loaded-buffer (current-buffer))
-            (idris-make-clean)
-            (idris-update-loaded-region (car result)))))
+        (setq idris-currently-loaded-buffer nil)
+        (let ((result
+               (idris-eval
+                (if idris-load-to-here
+                    `(:load-file ,fn ,(idris-get-line-num idris-load-to-here))
+                  `(:load-file ,fn)))))
+          (idris-update-options-cache)
+          (setq idris-currently-loaded-buffer (current-buffer))
+          (idris-make-clean)
+          (idris-update-loaded-region (car result))))
     (error "Cannot find file for current buffer")))