Smarter CL package search

We now search backwards for the first in-package or defpackage (although maybe it should just be in-package?) above the cursor. So you can have many in-pckages in a file and they should all work contextually.

We also reuse *package* if we can't find one. I was hoping that would mean it'd be stateful but it looks like it always reverts to the outer user package.

Author: Olical

dev/common-lisp/collider.lisp

@@ -0,0 +1,31 @@
+(ql:quickload :cl-collider)
+
+(in-package :sc-user)
+(named-readtables:in-readtable :sc)
+
+;; please check *sc-synth-program*, *sc-plugin-paths*, *sc-synthdefs-path*
+;; if you have different path then set to
+;;
+;; (setf *sc-synth-program* "/path/to/scsynth")
+;; (setf *sc-plugin-paths* (list "/path/to/plugin_path" "/path/to/extension_plugin_path"))
+;; (setf *sc-synthdefs-path* "/path/to/synthdefs_path")
+
+;; `*s*` defines the server for the entire session
+;; functions may use it internally.
+
+(setf *s* (make-external-server "localhost" :port 48800))
+(server-boot *s*)
+
+;; in Linux, maybe you need to call this function
+#+linux
+(jack-connect)
+
+;; Hack music
+(defvar *synth*)
+(setf *synth* (play (sin-osc.ar [320 321] 0 .2)))
+
+;; Stop music
+(free *synth*)
+
+;; Quit SuperCollider server
+(server-quit *s*)

dev/common-lisp/ros-swank-server.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+ros run --eval '(ql:quickload :swank)' --eval '(swank:create-server :dont-close t)'

fnl/conjure/client/common-lisp/swank.fnl

@@ -9,13 +9,29 @@
              config conjure.config
              client conjure.client
              remote conjure.remote.swank
+             util conjure.util
              ts conjure.tree-sitter}})
 
 (def buf-suffix ".lisp")
-(def context-pattern "%(%s*defpackage%s+(.-)[%s){]")
 (def comment-prefix "; ")
 (def form-node? ts.node-surrounded-by-form-pair-chars?)
 
+(defn- iterate-backwards [f lines]
+  (for [i (length lines) 1 (- 1)] (local line (. lines i))
+    (let [res (f line)]
+      (when res
+        (lua "return res"))))
+  nil)
+
+(defn context [_code]
+  (let [[line _col] (vim.api.nvim_win_get_cursor 0)
+        lines (vim.api.nvim_buf_get_lines 0 0 line false)]
+    (iterate-backwards
+      (fn [line]
+        (or (string.match line "%(%s*defpackage%s+(.-)[%s){]")
+            (string.match line "%(%s*in%-package%s+(.-)[%s){]")))
+      lines)))
+
 ;; ------------ common lisp client
 ;; Can parse simple forms
 ;; and return the result.
@@ -89,7 +105,7 @@
           (str.join
             ["(:emacs-rex (swank:eval-and-grab-output \""
              (escape-string msg)
-             "\") \"" (or context ":common-lisp-user") "\" t " eval-id ")"])
+             "\") \"" (or context "*package*") "\" t " eval-id ")"])
           cb)))))
 
 (defn connect [opts]