Fix sayid-version for native-comp

[nivekuil]

My load-file-name documentation says:

In case a .eln file is being loaded this is unreliable and ‘load-true-file-name’
should be used instead.

Indeed this seems to be always nil with native comp enabled.

https://github.com/emacs-mirror/emacs/blob/feature/native-comp/src/lread.c#L5037

load-true-file-name doesn't exist in non-native comp emacs so there needs to be some special logic for both unfortunately. If boundp is hacky comp-native-compiling might work too.

[bbatsov]

You should add some comment here explain the need for this, as it's very far from obvious. :-)

[nivekuil]

turns out this isn't the problem; sayid-version is only set every time the current emacs session compiled sayid.el, so if it's restarted it will just load the .eln and sayid-version will be nil in the new session.

[bbatsov]

Hmm, that sucks. We can add some fallback on a hardcoded version, but this will kind of defeat the purpose of retrieving the version dynamically.

[anonimitoraf]

Any other workarounds for this?

[carrete]

diff --git a/src/el/sayid.el b/src/el/sayid.el
index 9806c92..6daea46 100644
--- a/src/el/sayid.el
+++ b/src/el/sayid.el
@@ -47,11 +47,15 @@
   :group 'sayid
   :type 'boolean)
 
-(defconst sayid-version
-  (eval-when-compile
-    (lm-version (or load-file-name buffer-file-name)))
-  "The current version of `clojure-mode'.")
+(defun sayid-version-read ()
+  "The current version of `sayid.el'."
+  (lm-version (or load-file-name buffer-file-name)))
 
+(defconst sayid-version (eval-when-compile (sayid-version-read)))
+
+(defun sayid-version-fn ()
+  "Return cached version or re-read version."
+  (or sayid-version (sayid-version-read)))
 
 (defface sayid-int-face '((t :inherit default))
   "Sayid integer face"
@@ -152,7 +156,7 @@ If injecting the dependencies is not preferred set `sayid-inject-dependencies-at
   (when (and sayid-inject-dependencies-at-jack-in
              (boundp 'cider-jack-in-lein-plugins)
              (boundp 'cider-jack-in-nrepl-middlewares))
-    (add-to-list 'cider-jack-in-lein-plugins `("com.billpiel/sayid" ,sayid-version))
+    (add-to-list 'cider-jack-in-lein-plugins `("com.billpiel/sayid" ,(sayid-version-fn)))
     (add-to-list 'cider-jack-in-nrepl-middlewares "com.billpiel.sayid.nrepl-middleware/wrap-sayid")))
 
 ;;;###autoload
@@ -166,7 +170,7 @@ If injecting the dependencies is not preferred set `sayid-inject-dependencies-at
   (message "clj=%s el=%s"
            (sayid-req-get-value
             (list "op" "sayid-version"))
-           sayid-version))
+           (sayid-version-fn)))
 
 (defun sayid-select-default-buf ()
   "Select sayid default buffer."

I'm not using native compilation. I'm not sure why I have this problem, but sayid-version is always nil when I run cider-jack-in. If relevant, I've used both use-package.el and straight.el (current) to install sayid, always same behavior. I don't know that this is the best solution. This is just a patch I quickly came up with that doesn't use a hard-coded version string.

[anonimitoraf]

@carrete What do those changes do exactly?

[carrete]

@anonimitoraf I've added a function that will recompute the version when the version constant is nil at runtime. I suspect the problem is with eval-when-compile. These changes address the symptom, not the cause. Perhaps lexical binding would help?

[bbatsov]

I'm starting to think we should hardcode it again. :D I never thought such a simple change could have such ramifications.

[bbatsov]

Turns out the problem is that if load-file-name is not the .el file it's not possible for lm-version to find anything. I'll just go back to how things were for simplicity's sake. Thanks to everyone who tried to help with this!