branch: elpa/geiser-kawa
commit 1538f1fe021b25c4fe28295339cf8fed8af28749
Author: spellcard199 <spellcard...@protonmail.com>
Commit: spellcard199 <spellcard...@protonmail.com>
TODO.org: update
---
TODO.org | 7 +---
elisp/geiser-kawa-etree.el | 85 ----------------------------------------------
elisp/geiser-kawa.el | 1 -
3 files changed, 1 insertion(+), 92 deletions(-)
diff --git a/TODO.org b/TODO.org
index 0abcd6f..f38d53d 100644
--- a/TODO.org
+++ b/TODO.org
@@ -24,12 +24,7 @@ As of 2020-3-21 using =geiser-kawa= as a dependency for
another Cask project usi
"src"))
#+END_SRC
-** Check if Kawa, Emacs and Geiser work on Windows. If yes, when on Windows
make the maven wrapper elisp wrapper run =mvnw.cmd= instead of =mvnw=
-** Add geiser-kawa-dev
-
-1. =geiser-kawa-dev--ast-expression=
-2. =geiser-kawa-dev--ast-for-fmp-completion=
-
+** Check if Kawa, Emacs and Geiser work on Windows. If yes, make the elisp
function wrapping maven wrapper run =mvnw.cmd= instead of =mvnw= when on Windows
** Add geiser-kawa-java-find-pc (package or class)
1. =geiser-kawa-java-find-pc-default-classloaders=
diff --git a/elisp/geiser-kawa-etree.el b/elisp/geiser-kawa-etree.el
deleted file mode 100644
index 9941068..0000000
--- a/elisp/geiser-kawa-etree.el
+++ /dev/null
@@ -1,85 +0,0 @@
-;; Copyright (C) 2020 spellcard199 <spellcard...@protonmail.com>
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the Modified BSD License. You should
-;; have received a copy of the license along with this program. If
-;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
-
-(require 'geiser-kawa-complete-java)
-
-(defvar geiser-kawa-exprtree-buffer "*kawa exprtree*"
- "Buffer where Expression tree is showed")
-
-(defun geiser-kawa-eval--to-res (sexp)
- (let* ((question
- (format "(geiser:eval (interaction-environment) %S)"
- (format "%S" sexp)))
- (answer (geiser-eval--send/wait question)))
-
- (if (assoc 'error answer)
- (signal 'peculiar-error
- (list (string-trim
- (car (split-string (geiser-eval--retort-output
- answer)
- "\t")))))
- ;; from: ((result "expr-tree") (output . ...))
- ;; to: "expr-tree"
- (cadr (car answer)))))
-
-(defun geiser-kawa-exprtree--view (expr-tree)
- (with-current-buffer (get-buffer-create
- geiser-kawa-exprtree-buffer)
- (View-quit)
- (delete-region (point-min) (point-max))
- (insert expr-tree)
- (goto-char (point-min)))
-
- (view-buffer-other-window
- geiser-kawa-exprtree-buffer))
-
-(defun geiser-kawa-exprtree--for-expression (code-str)
- (geiser-kawa-eval--to-res
- ;; Kawa sexp here
- `(invoke
- (kawadevutil.ast.AstElemWrapper
- (kawadevutil.compile.Compile:compileStr
- ,code-str))
- 'formatElem java.lang.Boolean:TRUE)))
-
-(defun geiser-kawa-exprtree-for-expression ()
- (interactive)
- "If region is active send region, otherwise send last expression."
- (let* ((code-str
- (if (region-active-p)
- (buffer-substring-no-properties reg-beg reg-end)
- (save-excursion
- (let ((sexp-beg (progn (backward-sexp) (point)))
- (sexp-end (progn (forward-sexp) (point))))
- (buffer-substring-no-properties sexp-beg sexp-end)))))
- (expr-tree (geiser-kawa-exprtree--for-expression
- code-str)))
- (geiser-kawa-exprtree--view expr-tree)))
-
-(defun geiser-kawa-exprtree--for-fmp-completion(code-str cursor-index)
- (geiser-kawa-eval--to-res
- ;; Kawa sexp here
- `(kawageiser.java.GeiserCompleteJava:getExprTreeAndFormat
- ,code-str
- ,cursor-index)))
-
-(defun geiser-kawa-exprtree-for-fmp-completion ()
- (interactive)
- (let* ((code-and-point-data
- (geiser-kawa-complete-java--code-point-from-toplevel))
- (code-str (cdr (assoc "code-str"
- code-and-point-data)))
- (cursor-index (cdr (assoc "cursor-index"
- code-and-point-data)))
- (expr-tree (geiser-kawa-exprtree--for-fmp-completion
- code-str cursor-index)))
- (geiser-kawa-exprtree--view expr-tree)))
-
-(provide 'geiser-kawa-exprtree)
-
-;;; geiser-kawa-exprtree.el ends here
-
diff --git a/elisp/geiser-kawa.el b/elisp/geiser-kawa.el
index c9207a2..cb5577b 100644
--- a/elisp/geiser-kawa.el
+++ b/elisp/geiser-kawa.el
@@ -229,7 +229,6 @@
(format
"(geiser:eval (interaction-environment) %S)"
(cadr args))))
- (setq moo send-this)
send-this))
((load-file compile-file)
