branch: elpa/geiser-kawa commit ca594ec25581377adc8d80f92cd523058cbea95e Author: spellcard199 <spellcard...@protonmail.com> Commit: spellcard199 <spellcard...@protonmail.com>
Refactor: rename some functions --- elisp/geiser-kawa-devutil-complete.el | 4 ++-- elisp/geiser-kawa-devutil-exprtree.el | 5 +++-- src/main/java/kawageiser/Geiser.java | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/elisp/geiser-kawa-devutil-complete.el b/elisp/geiser-kawa-devutil-complete.el index 5844419..ec271a9 100644 --- a/elisp/geiser-kawa-devutil-complete.el +++ b/elisp/geiser-kawa-devutil-complete.el @@ -24,7 +24,7 @@ at the end.") ;; takes a string instead of a form. (format "(geiser:eval (interaction-environment) %S)" (format "%S" - `(geiser:complete-java + `(geiser:kawa-devutil-complete ,code-str ,cursor-index)))) (geiser-answer (geiser-eval--send/wait @@ -194,7 +194,7 @@ at the end.") (defun geiser-kawa-devutil-complete--exprtree (code-str cursor-index) (geiser-kawa-util--eval-to-res - `(geiser:complete-java-show-expr-tree + `(geiser:kawa-devutil-complete-expr-tree ,code-str ,cursor-index))) diff --git a/elisp/geiser-kawa-devutil-exprtree.el b/elisp/geiser-kawa-devutil-exprtree.el index fed5671..fc39a26 100644 --- a/elisp/geiser-kawa-devutil-exprtree.el +++ b/elisp/geiser-kawa-devutil-exprtree.el @@ -23,14 +23,15 @@ (defun geiser-kawa-devutil-exprtree--for-expression (code-str) (geiser-kawa-util--eval-to-res - `(geiser:expr-tree-formatted ,code-str))) + `(geiser:kawa-devutil-expr-tree-formatted ,code-str))) (defun geiser-kawa-devutil-exprtree-sexp () (interactive) "If region is active send region, otherwise send last expression." (let* ((code-str (if (region-active-p) - (buffer-substring-no-properties (region-beginning) (region-end)) + (buffer-substring-no-properties (region-beginning) + (region-end)) (save-excursion (let ((sexp-beg (progn (backward-sexp) (point))) (sexp-end (progn (forward-sexp) (point)))) diff --git a/src/main/java/kawageiser/Geiser.java b/src/main/java/kawageiser/Geiser.java index aa5759f..60ca044 100644 --- a/src/main/java/kawageiser/Geiser.java +++ b/src/main/java/kawageiser/Geiser.java @@ -38,11 +38,11 @@ public class Geiser implements Runnable { procMap.put("geiser:load-file", "kawageiser.GeiserLoadFile:loadFile"); procMap.put("geiser:completions", "kawageiser.GeiserCompleteSymbol:getCompletions"); procMap.put("geiser:no-values", "kawageiser.GeiserNoValues:noValues"); - procMap.put("geiser:complete-java", "kawageiser.kawadevutil.Complete:completeJava"); - procMap.put("geiser:complete-java-show-expr-tree", "kawageiser.kawadevutil.Complete:getExprTreeFormatted"); + procMap.put("geiser:kawa-devutil-complete", "kawageiser.kawadevutil.Complete:completeJava"); + procMap.put("geiser:kawa-devutil-complete-expr-tree", "kawageiser.kawadevutil.Complete:getExprTreeFormatted"); procMap.put("geiser:manual-epub-unzip-to-tmp-dir", "kawageiser.docutil.ManualEpubUnzipToTmpDir:unzipToTmpDir"); procMap.put("geiser:macroexpand", "kawageiser.GeiserMacroexpand:expand"); - procMap.put("geiser:expr-tree-formatted", "kawageiser.kawadevutil.ExprTree:getExprTreeFormatted"); + procMap.put("geiser:kawa-devutil-expr-tree-formatted", "kawageiser.kawadevutil.ExprTree:getExprTreeFormatted"); try { if (lang.lookup("geiser:eval") == null) {