Zander671/emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Many changes

Browse Source
This commit is contained in:
Alexander Rosenberg
2025-02-13 00:13:43 -08:00
parent e2db4e1193
commit 816e696f47
2 changed files with 152 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
elisp/inferior-jshell.el
View File

@ -224,7 +224,9 @@ the arguments to pass. They default to `jshell-switches'."
(goto-char (point-max))
(insert code)
(goto-char (point-max))
(jshell-send-input)
;; don't save history
(let ((comint-input-filter #'ignore))
(jshell-send-input))
(goto-char (point-max))
(insert old)
(goto-char (point-max))))))
@ -252,35 +254,40 @@ START and END default to the current region."
"Send the Java expression under point to a live JShell buffer.
This only works in `java-ts-mode'."
(interactive)
(let ((root (treesit-buffer-root-node)))
(let ((node (car (or (treesit-query-range
root '([(expression_statement)
(field_declaration)
(local_variable_declaration)
(import_declaration)]
@exp)
(point) (1+ (point)))
(treesit-query-range
root '([(parenthesized_expression)
(binary_expression)
(update_expression)
(unary_expression)]
@exp)
(point) (1+ (point)))))))
(unless node
(user-error "No expression found under point"))
(let ((text (buffer-substring-no-properties (car node) (cdr node))))
(when (string-match (rx (* (syntax whitespace))
";"
(* (syntax whitespace)) eos)
text)
(setq text (substring text 0 (match-beginning 0))))
(when (string-match (rx bos (* (syntax whitespace)) "("
(group (* any))
")" (* (syntax whitespace)) eos)
text)
(setq text (match-string 1 text)))
(jshell-eval text)))))
(save-excursion
(let ((start (point)))
(back-to-indentation)
(unless (> (point) start)
(goto-char start)))
(let ((root (treesit-buffer-root-node)))
(let ((node (car (or (treesit-query-range
root '([(expression_statement)
(field_declaration)
(local_variable_declaration)
(import_declaration)]
@exp)
(point) (1+ (point)))
(treesit-query-range
root '([(parenthesized_expression)
(binary_expression)
(update_expression)
(unary_expression)]
@exp)
(point) (1+ (point)))))))
(unless node
(user-error "No expression found under point"))
(let ((text (buffer-substring-no-properties (car node) (cdr node))))
(when (string-match (rx (* (syntax whitespace))
";"
(* (syntax whitespace)) eos)
text)
(setq text (substring text 0 (match-beginning 0))))
(when (string-match (rx bos (* (syntax whitespace)) "("
(group (* any))
")" (* (syntax whitespace)) eos)
text)
(setq text (match-string 1 text)))
(jshell-eval text))))))
(provide 'inferior-jshell)