Skip to content

make the delay before middleware loading adjustable, fix not in a git repo error #662

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

make the delay before middleware loading adjustable, fix not in a git repo error #662

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4ac7a
make the delay before middleware loading adjustable, fix not in a git…
QiangF May 1, 2023
88da805
delete temp file in lispy--eval-python
QiangF May 15, 2023
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
23 changes: 14 additions & 9 deletions le-python.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@ it at one time."
(lispy-short-process-name (get-buffer-process lispy-python-buf)))
:caller 'lispy-set-python-process)))

(defvar lispy--python-proc-init-time 1
"Time delay in second before middleware loading, if it's too short, the middleware loading will fail.")

(defvar lispy--python-middleware-loaded-p nil
"Nil if the Python middleware in \"lispy-python.py\" wasn't loaded yet.")

Expand All @@ -298,7 +301,7 @@ it at one time."
(defvar lispy--python-init-file nil)

(defun lispy--python-poetry-name ()
(let ((pyproject (expand-file-name "pyproject.toml" (counsel-locate-git-root))))
(let ((pyproject (expand-file-name "pyproject.toml" (counsel--git-root))))
(and (file-exists-p pyproject)
(not (equal python-shell-interpreter "python"))
(with-current-buffer (find-file-noselect pyproject)
Expand Down Expand Up @@ -355,7 +358,7 @@ it at one time."
(buffer
(let ((python-shell-completion-native-enable nil)
(default-directory (if poetry-name
(counsel-locate-git-root)
(counsel--git-root)
default-directory)))
(python-shell-make-comint
python-binary-name proc-name nil nil))))
Expand All @@ -365,7 +368,7 @@ it at one time."
(expand-file-name "lispy-python.py" lispy-site-directory)))
(setq lispy--python-init-file lispy-python-init-file)
(setq process (get-buffer-process buffer))
(sit-for 0.1)
(sit-for lispy--python-proc-init-time)
(unless (process-live-p process)
(pop-to-buffer buffer)
(user-error "Could not start %s" python-binary-name))
Expand Down Expand Up @@ -617,17 +620,18 @@ If so, return an equivalent of ITEM = ARRAY_LIKE[IDX]; ITEM."
(defun lispy--eval-python (str &optional use-in-expr)
(setq lispy-eval-output nil)
(let* ((echo (if (eq current-prefix-arg 2) nil t))
temp-file-name
(fstr
(cond
((eq current-prefix-arg 3)
(format "lp.eval_to_json(\"\"\"lp.select_item(\"%s\", 0)\"\"\")" str))
((or (string-match-p ".\n+." str) (string-match-p "\"\"\"" str))
(let ((temp-file-name (python-shell--save-temp-file str)))
(format "lp.eval_to_json('', %s)"
(lispy--dict
:code temp-file-name
:fname (buffer-file-name)
:echo echo))))
(setq temp-file-name (python-shell--save-temp-file str))
(format "lp.eval_to_json('', %s)"
(lispy--dict
:code temp-file-name
:fname (buffer-file-name)
:echo echo)))
(t
(format "lp.eval_to_json(\"\"\"%s \"\"\", %s)"
(replace-regexp-in-string "\\\\n" "\\\\n" str nil t)
Expand All @@ -646,6 +650,7 @@ If so, return an equivalent of ITEM = ARRAY_LIKE[IDX]; ITEM."
(err (plist-get res :err)))
(when (eq current-prefix-arg 3)
(kill-new fstr))
(when temp-file-name (delete-file temp-file-name))
(if err
(signal 'eval-error (concat out err))
(unless (equal out "")
Expand Down