Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace swank with micros #691

Merged
merged 11 commits into from
Jun 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
sblint lem.asd
sblint lib/lisp-syntax/lem-lisp-syntax.asd
sblint modes/lisp-mode/lem-lisp-mode.asd
sblint lib/micros/micros.asd

if [ $(grep -r --include="*.lisp" 'lem::' | wc -l) -ne 0 ]; then
echo 'using `lem::` internal symbols'
Expand Down
7 changes: 5 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[submodule "lib/lsp-utils/specification/language-server-protocol"]
path = language-server-protocol
url = https://github.com/microsoft/language-server-protocol.git
[submodule "third-party/lem-base16-themes"]
path = third-party/lem-base16-themes
[submodule "submodules/lem-base16-themes"]
path = submodules/lem-base16-themes
url = https://github.com/lem-project/lem-base16-themes.git
[submodule "submodules/micros"]
path = submodules/micros
url = https://github.com/lem-project/micros
4 changes: 1 addition & 3 deletions lib/language-server/controller/language-features.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,7 @@
'vector))))))))

(defun autodoc (point)
(let* ((raw-form
(let ((lem-lisp-syntax.parse-for-swank-autodoc::*cursor-marker* 'micros::%cursor-marker%))
(lem-lisp-syntax:parse-for-swank-autodoc point)))
(let* ((raw-form (lem-lisp-syntax:parse-for-autodoc point))
(result (remote-eval-sync *server*
`(micros::autodoc-function ',raw-form)
(scan-current-package point))))
Expand Down
2 changes: 1 addition & 1 deletion lib/lisp-syntax/indent.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
(defun indentation-update ()
(do-all-symbols (symbol)
(let ((key (string-downcase symbol)))
(alexandria:when-let ((indent (swank::symbol-indentation symbol)))
(alexandria:when-let ((indent (micros::symbol-indentation symbol)))
(update-system-indentation key
indent
(list (package-name (symbol-package symbol))))))))
Expand Down
4 changes: 2 additions & 2 deletions lib/lisp-syntax/lem-lisp-syntax.asd
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
(defsystem "lem-lisp-syntax"
:depends-on ("lem-base" "cl-ppcre" "swank" "trivia")
:depends-on ("lem-base" "cl-ppcre" "micros" "trivia")
:serial t
:components ((:file "indent")
(:file "syntax-table")
(:file "misc")
(:file "enclosing")
(:file "parse-for-swank-autodoc")
(:file "parse-for-autodoc")
(:file "defstruct-to-defclass")
(:file "lem-lisp-syntax")))
2 changes: 1 addition & 1 deletion lib/lisp-syntax/lem-lisp-syntax.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
:lem-lisp-syntax.syntax-table
:lem-lisp-syntax.misc
:lem-lisp-syntax.enclosing
:lem-lisp-syntax.parse-for-swank-autodoc
:lem-lisp-syntax.parse-for-autodoc
:lem-lisp-syntax.defstruct-to-defclass))
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
(defpackage :lem-lisp-syntax.parse-for-swank-autodoc
(defpackage :lem-lisp-syntax.parse-for-autodoc
(:use :cl :lem-base)
(:export :parse-for-swank-autodoc)
(:export :parse-for-autodoc)
#+sbcl
(:lock t))
(in-package :lem-lisp-syntax.parse-for-swank-autodoc)
(in-package :lem-lisp-syntax.parse-for-autodoc)

(defvar *cursor-marker* 'swank::%cursor-marker%)
(defvar *cursor-marker* 'micros::%cursor-marker%)

(defun parsing-safe-p (point)
(not (in-string-or-comment-p point)))

(defun parse-for-swank-autodoc (point &optional (*cursor-marker* *cursor-marker*))
(defun parse-for-autodoc (point &optional (*cursor-marker* *cursor-marker*))
(and (parsing-safe-p point)
(parse-form-upto-toplevel point 10)))

Expand Down
2 changes: 0 additions & 2 deletions lib/micros/.gitignore

This file was deleted.

21 changes: 0 additions & 21 deletions lib/micros/LICENSE

This file was deleted.

Loading