[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/sweeprolog 5988ab50e4 1/2: ENHANCED: revise predicate comp
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/sweeprolog 5988ab50e4 1/2: ENHANCED: revise predicate completion at point |
|
Date: |
Sun, 13 Nov 2022 04:59:17 -0500 (EST) |
branch: elpa/sweeprolog
commit 5988ab50e4e1d950dd087d96498b6d213c365be8
Author: Eshel Yaron <me@eshelyaron.com>
Commit: Eshel Yaron <me@eshelyaron.com>
ENHANCED: revise predicate completion at point
Completion at point now detects whether predicate completion is
appropriate, by parsing Prolog code back from point to determine the
context of point. If predicate completion is not appropriate,
fallback to atom completion.
---
sweep.pl | 112 +++++++++---------
sweeprolog-tests.el | 24 +++-
sweeprolog.el | 330 ++++++++++++++++++++++++++++++++--------------------
3 files changed, 285 insertions(+), 181 deletions(-)
diff --git a/sweep.pl b/sweep.pl
index ffde94b2b2..fbbddf8891 100644
--- a/sweep.pl
+++ b/sweep.pl
@@ -43,7 +43,6 @@
sweep_predicate_location/2,
sweep_predicate_apropos/2,
sweep_predicates_collection/2,
- sweep_local_predicate_completion/2,
sweep_functor_arity_pi/2,
sweep_modules_collection/2,
sweep_packs_collection/2,
@@ -63,7 +62,10 @@
sweep_analyze_region/2,
sweep_xref_source/2,
sweep_beginning_of_next_predicate/2,
- sweep_beginning_of_last_predicate/2
+ sweep_beginning_of_last_predicate/2,
+ sweep_atom_collection/2,
+ sweep_context_callable/2,
+ sweep_predicate_completion_candidates/2
]).
:- use_module(library(pldoc)).
@@ -373,55 +375,6 @@ sweep_predicate_location_(M, H, Path, Line) :-
),
atom_string(Path0, Path).
-sweep_local_predicate_completion(Sub, Preds) :-
- sweep_current_module(M),
- findall(F/N,
- @(current_predicate(F/N), M),
- Preds0,
- Tail),
- findall(XF/XN,
- ( xref_module(SourceId, M),
- xref_defined(SourceId, H, _),
- H \= _:_,
- pi_head(XF/XN, H)
- ),
- Tail),
- list_to_set(Preds0, Preds1),
- convlist(sweep_predicate_completion_annotated(Sub, M), Preds1, Preds).
-
-sweep_predicate_completion_annotated(Sub, M, F/N, [S|A]) :-
- format(string(S), '~W', [F/N, [quoted(true), character_escapes(true)]]),
- sub_string(S, _, _, _, Sub),
- \+ sub_string(S, 0, _, _, "'$"),
- pi_head(F/N, Head),
- findall(P, @(predicate_property(Head, P), M), Ps0),
- sweep_predicate_completion_op_annotation(F, Ps0, Ps),
- phrase(sweep_head_annotation(Ps), A).
-
-sweep_predicate_completion_op_annotation(F, Ps, [op(Pri,Fix)|Ps]) :-
- current_op(Pri, Fix, F),
- !.
-sweep_predicate_completion_op_annotation(_, Ps, Ps).
-
-sweep_head_annotation([H|T]) -->
- sweep_head_annotation_(H),
- sweep_head_annotation(T).
-sweep_head_annotation([]) --> [].
-
-sweep_head_annotation_(built_in) --> !, ["built-in"].
-sweep_head_annotation_(det) --> !, ["!"].
-sweep_head_annotation_(dynamic) --> !, ["dynamic"].
-sweep_head_annotation_(foreign) --> !, ["C"].
-sweep_head_annotation_(iso) --> !, ["iso"].
-sweep_head_annotation_(multifile) --> !, ["multifile"].
-sweep_head_annotation_(meta_predicate(_)) --> !, [":"].
-sweep_head_annotation_(non_terminal) --> !, ["//"].
-sweep_head_annotation_(ssu) --> !, ["=>"].
-sweep_head_annotation_(tabled) --> !, ["table"].
-sweep_head_annotation_(tabled(_)) --> !, ["table"].
-sweep_head_annotation_(thread_local) --> !, ["thread-local"].
-sweep_head_annotation_(op(_,_)) --> !, ["op"].
-sweep_head_annotation_(_) --> [].
sweep_predicates_collection(Sub, Preds) :-
findall(M:F/N,
@@ -776,8 +729,63 @@ sweep_beginning_of_next_predicate(Start, Next) :-
xref_defined(Path, _, H), xref_definition_line(H, Next),
Start < Next.
-
sweep_source_id(Path) :-
sweep_main_thread,
user:sweep_funcall("buffer-file-name", Path),
string(Path).
+
+sweep_atom_collection(Sub, Col) :-
+ findall(S,
+ ( current_atom(A),
+ atom_string(A, S),
+ sub_string(S, _, _, _, Sub)
+ ),
+ Col).
+
+sweep_predicate_completion_candidates(_, Ps) :-
+ findall(H,
+ ( sweep_current_module(M),
+ @(predicate_property(H, visible), M)
+ ),
+ Hs),
+ maplist(sweep_format_predicate, Hs, Ps).
+
+sweep_format_predicate(H, S) :-
+ term_variables(H, Vs),
+ maplist(=('$VAR'('_')), Vs),
+ term_string(H, S, [quoted(true),
+ character_escapes(true),
+ spacing(next_argument),
+ numbervars(true)]).
+
+sweep_context_callable([], true) :- !.
+sweep_context_callable([[":"|2]], true) :- !.
+sweep_context_callable([H|T], R) :-
+ H = [F0|N],
+ atom_string(F, F0),
+ ( sweep_context_callable_(F, N)
+ -> sweep_context_callable(T, R)
+ ; R = []
+ ).
+
+sweep_context_callable_(Neck, _) :-
+ ( xref_op(_, op(1200, _, Neck))
+ -> true
+ ; current_op(1200, _, Neck)
+ ).
+sweep_context_callable_(F, N) :-
+ ( current_predicate(F/M), pi_head(F/M,Head)
+ ; xref_defined(_, Head, _), pi_head(F/M,Head)
+ ),
+ M >= N,
+ catch(infer_meta_predicate(Head, Spec),
+ error(permission_error(access, private_procedure, _),
+ context(system:clause/2, _)),
+ false),
+ arg(N, Spec, A),
+ callable_arg(A).
+
+callable_arg(N) :- integer(N), !.
+callable_arg(^) :- !.
+callable_arg(//) :- !.
+callable_arg(:) :- !.
diff --git a/sweeprolog-tests.el b/sweeprolog-tests.el
index 2f3e5a5500..78d767bfab 100644
--- a/sweeprolog-tests.el
+++ b/sweeprolog-tests.el
@@ -106,8 +106,28 @@ foo(Foo) :- bar.
sweeprolog-body-default-face)))))
+(ert-deftest complete-predicate ()
+ "Tests completing predicate calls."
+ (let ((temp (make-temp-file "sweeprolog-test"
+ nil
+ ".pl"
+ "
+baz(Baz) :- findall(X, b_g
+"
+ )))
+ (find-file-literally temp)
+ (sweeprolog-mode)
+ (goto-char (point-max))
+ (backward-char)
+ (call-interactively #'sweeprolog-completion-at-point)
+ (should (string= (buffer-string)
+ "
+baz(Baz) :- findall(X, b_getval(_, _)
+"
+ ))))
+
(ert-deftest complete-variable ()
- "Test marking completing variable names."
+ "Tests completing variable names."
(let ((temp (make-temp-file "sweeprolog-test"
nil
".pl"
@@ -120,7 +140,7 @@ baz(Baz) :- bar(B).
(goto-char (point-max))
(backward-word)
(forward-word)
- (call-interactively #'complete-symbol)
+ (call-interactively #'sweeprolog-completion-at-point)
(should (string= (buffer-string)
"
baz(Baz) :- bar(Baz).
diff --git a/sweeprolog.el b/sweeprolog.el
index 52ed33471e..35808a92f9 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -45,8 +45,6 @@
(defvar sweeprolog-prolog-server-port nil)
-(defvar sweeprolog-predicate-completion-collection nil)
-
(defvar sweeprolog-read-predicate-history nil)
(defvar sweeprolog-read-module-history nil)
@@ -87,8 +85,10 @@ Prolog token as returned from
`sweeprolog-last-token-boundaries'.")
(modify-syntax-entry ?\n ">" table)
(modify-syntax-entry ?* ". 23b" table)
(modify-syntax-entry ?/ ". 14" table)
+ (modify-syntax-entry ?! "w" table)
table))
+(defvar sweeprolog-top-level-mode-syntax-table sweeprolog-mode-syntax-table)
;;;; User options
@@ -342,6 +342,7 @@ buffer where the new predicate defintion should be
inserted."
#'flymake-show-diagnostics-buffer))
(define-key map (kbd "C-M-^") #'kill-backward-up-list)
(define-key map (kbd "C-M-m") #'sweeprolog-insert-term-dwim)
+ (define-key map (kbd "C-M-i") #'sweeprolog-completion-at-point)
(define-key map (kbd "M-p") #'sweeprolog-backward-predicate)
(define-key map (kbd "M-n") #'sweeprolog-forward-predicate)
(define-key map (kbd "M-h") #'sweeprolog-mark-predicate)
@@ -350,6 +351,7 @@ buffer where the new predicate defintion should be
inserted."
(defvar sweeprolog-top-level-mode-map
(let ((map (make-sparse-keymap)))
+ (define-key map (kbd "C-M-i") #'sweeprolog-completion-at-point)
(define-key map (kbd "C-c C-c") #'sweeprolog-top-level-signal-current)
map)
"Keymap for `sweeprolog-top-level-mode'.")
@@ -911,6 +913,20 @@ module name, F is a functor name and N is its arity."
;;;; Completion at point
+(defvar sweeprolog-completion-at-point-functions
+ '((sweeprolog-predicate-completion-at-point
+ ?p "predicate" "Predicate name")
+ (sweeprolog-atom-completion-at-point
+ ?a "atom" "Atom")
+ (sweeprolog-module-completion-at-point
+ ?m "module" "Module name")
+ (sweeprolog-variable-completion-at-point
+ ?v "variable" "Variable name")))
+
+(defun sweeprolog-atoms-collection (&optional sub)
+ "Return a list of atom completion candidates matchitng SUB."
+ (sweeprolog--query-once "sweep" "sweep_atom_collection" sub))
+
(defun sweeprolog-local-variables-collection (&rest exclude)
"Return a list of variable names that occur in the current clause.
@@ -960,51 +976,127 @@ resulting list even when found in the current clause."
:annotation-function
(lambda (_) " Var"))))))
-(defun sweeprolog-local-predicates-collection (&optional prefix)
- "Return a list of prediactes accessible in the current buffer.
-
-When non-nil, only predicates whose name contains PREFIX are returned."
- (setq sweeprolog-predicate-completion-collection
- (sweeprolog--query-once "sweep" "sweep_local_predicate_completion"
- prefix)))
-
-(defun sweeprolog-completion-at-point-function ()
- (when-let ((bounds (sweeprolog-predicate-prefix-boundaries)))
- (let ((start (car bounds))
- (end (cdr bounds)))
- (list start end
- (completion-table-with-cache
#'sweeprolog-local-predicates-collection)
- :exclusive 'no
- :annotation-function
- (lambda (key)
- (when-let ((ann (cdr (assoc-string key
sweeprolog-predicate-completion-collection))))
- (concat " " (mapconcat #'identity ann ","))))
- :exit-function
- (lambda (key sts)
- (when (eq sts 'finished)
- (let ((opoint (point)))
- (save-match-data
- (combine-after-change-calls
- (skip-chars-backward "1234567890")
- (when (= ?/ (preceding-char))
- (backward-char)
- (let ((arity (string-to-number
(buffer-substring-no-properties (1+ (point)) opoint))))
- (delete-region (point) opoint)
- (when (and
- (< 0 arity)
- (not
- (string=
- "op"
- (cadr
- (assoc-string
- key
-
sweeprolog-predicate-completion-collection)))))
- (insert "(")
- (dotimes (_ (1- arity))
- (insert "_, "))
- (insert "_)")
- (goto-char (1- opoint))))))))))))))
+(defun sweeprolog-module-completion-at-point ()
+ "Prolog module name completion backend for `completion-at-point'."
+ (when-let ((bounds (bounds-of-thing-at-point 'symbol))
+ (beg (car bounds))
+ (end (cdr bounds)))
+ (when (and (<= beg (point) end)
+ (let ((first (char-after beg)))
+ (not (or (sweeprolog--char-uppercase-p first)
+ (= first ?_)))))
+ (when-let ((col (sweeprolog-modules-collection)))
+ (list beg end (mapcar #'car col)
+ :exclusive 'no
+ :annotation-function
+ (lambda (_) " module"))))))
+(defun sweeprolog-atom-completion-at-point ()
+ "Prolog atom name completion backend for `completion-at-point'."
+ (when-let ((bounds (bounds-of-thing-at-point 'symbol))
+ (beg (car bounds))
+ (end (cdr bounds)))
+ (when (and (<= beg (point) end)
+ (let ((first (char-after beg)))
+ (not (or (sweeprolog--char-uppercase-p first)
+ (= first ?_)))))
+ (when-let ((col (sweeprolog-atoms-collection
+ (buffer-substring-no-properties beg end))))
+ (list beg end col
+ :exclusive 'no
+ :annotation-function
+ (lambda (_) " atom"))))))
+
+(defun sweeprolog--parse-context (&optional point)
+ (save-excursion
+ (sweeprolog-backward-term 0)
+ (let ((pos (or point (point)))
+ (commas 0)
+ (context nil))
+ (while
+ (pcase (sweeprolog-last-token-boundaries pos)
+ ('nil nil)
+ (`(open ,obeg ,oend)
+ (push (cons (buffer-substring-no-properties obeg oend)
+ (1+ commas))
+ context)
+ (setq pos obeg)
+ (setq commas 0))
+ (`(functor ,obeg ,oend)
+ (push (cons (buffer-substring-no-properties obeg (1- oend))
+ (1+ commas))
+ context)
+ (setq pos obeg)
+ (setq commas 0))
+ ((or `(operator ,obeg ,oend)
+ `(symbol ,obeg ,oend))
+ (let* ((op (buffer-substring-no-properties obeg oend))
+ (ipre (sweeprolog-op-infix-precedence op))
+ (ppre (sweeprolog-op-prefix-precedence op)))
+ (cond
+ ((and (string= "." op)
+ (member (char-syntax (char-after (1+ obeg))) '(?> ? )))
+ nil)
+ ((string= "," op)
+ (setq pos
+ (save-excursion
+ (goto-char obeg)
+ (setq commas (1+ commas))
+ (sweeprolog-backward-term 999)
+ (point))))
+ (ipre
+ (push (cons op 2) context)
+ (setq pos
+ (save-excursion
+ (goto-char obeg)
+ (sweeprolog-backward-term (1- ipre))
+ (point)))
+ (setq commas 0))
+ (ppre
+ (push (cons op 1) context)
+ (setq pos obeg)
+ (setq commas 0)))))))
+ context)))
+
+(defun sweeprolog-predicate-completion-at-point ()
+ (when-let ((bounds (bounds-of-thing-at-point 'symbol))
+ (beg (car bounds))
+ (end (cdr bounds)))
+ (when (and (<= beg (point) end)
+ (let ((first (char-after beg)))
+ (not (or (sweeprolog--char-uppercase-p first)
+ (= first ?_))))
+ (sweeprolog--query-once "sweep"
+ "sweep_context_callable"
+ (sweeprolog--parse-context)))
+ (when-let
+ ((col (sweeprolog--query-once "sweep"
"sweep_predicate_completion_candidates"
+ nil)))
+ (list beg end col
+ :exclusive 'no
+ :annotation-function
+ (lambda (_) " Predicate"))))))
+
+(defun sweeprolog-completion-at-point (&optional funs)
+ (interactive
+ (list
+ (and current-prefix-arg
+ (list
+ (let ((choice (read-multiple-choice
+ "Completion kind: "
+ (mapcar
+ #'cdr
+ sweeprolog-completion-at-point-functions))))
+ (caar (seq-filter
+ (lambda (capf)
+ (equal (cdr capf) choice))
+ sweeprolog-completion-at-point-functions)))))))
+ (let ((completion-at-point-functions
+ (or funs
+ (append (mapcar #'car
+ sweeprolog-completion-at-point-functions)
+ completion-at-point-functions))))
+ (completion-at-point)))
;;;; Packages
@@ -1026,10 +1118,6 @@ When non-nil, only predicates whose name contains PREFIX
are returned."
ver)))))))
(completing-read sweeprolog-read-pack-prompt col)))
-(defun sweeprolog-true-p (sol)
- (or (eq (car sol) '!)
- (eq (car sol) t)))
-
;;;###autoload
(defun sweeprolog-pack-install (pack)
"Install or upgrade Prolog package PACK."
@@ -1692,9 +1780,9 @@ When non-nil, only predicates whose name contains PREFIX
are returned."
(list (list beg end (sweeprolog-head-extern-face))))
(`("head" ,(rx "public ") . ,_)
(list (list beg end (sweeprolog-head-public-face))))
- (`("head",(rx "dynamic ") . ,_)
+ (`("head" ,(rx "dynamic ") . ,_)
(list (list beg end (sweeprolog-head-dynamic-face))))
- (`("head",(rx "multifile ") . ,_)
+ (`("head" ,(rx "multifile ") . ,_)
(list (list beg end (sweeprolog-head-multifile-face))))
(`("head" ,(rx "local(") . ,_)
(list (list beg end (sweeprolog-head-local-face))))
@@ -1708,21 +1796,21 @@ When non-nil, only predicates whose name contains
PREFIX are returned."
(list (list beg end (sweeprolog-undefined-face))))
(`("goal" "global" . ,_)
(list (list beg end (sweeprolog-global-face))))
- (`("goal",(rx "dynamic ") . ,_)
+ (`("goal" ,(rx "dynamic ") . ,_)
(list (list beg end (sweeprolog-dynamic-face))))
- (`("goal",(rx "multifile ") . ,_)
+ (`("goal" ,(rx "multifile ") . ,_)
(list (list beg end (sweeprolog-multifile-face))))
- (`("goal",(rx "thread_local ") . ,_)
+ (`("goal" ,(rx "thread_local ") . ,_)
(list (list beg end (sweeprolog-thread-local-face))))
- (`("goal",(rx "extern(") . ,_)
+ (`("goal" ,(rx "extern(") . ,_)
(list (list beg end (sweeprolog-extern-face))))
- (`("goal",(rx "autoload(") . ,_)
+ (`("goal" ,(rx "autoload(") . ,_)
(list (list beg end (sweeprolog-autoload-face))))
- (`("goal",(rx "imported(") . ,_)
+ (`("goal" ,(rx "imported(") . ,_)
(list (list beg end (sweeprolog-imported-face))))
- (`("goal",(rx "global(") . ,_)
+ (`("goal" ,(rx "global(") . ,_)
(list (list beg end (sweeprolog-global-face))))
- (`("goal",(rx "local(") . ,_)
+ (`("goal" ,(rx "local(") . ,_)
(list (list beg end (sweeprolog-local-face))))
("instantiation_error"
(list (list beg end (sweeprolog-instantiation-error-face))))
@@ -1784,8 +1872,9 @@ When non-nil, only predicates whose name contains PREFIX
are returned."
(setq cur (point)))
(skip-chars-forward " \t\n")
(push (list cur (point) nil) ws)
- (cons (list beg end (sweeprolog-fullstop-face))
- ws))))
+ (cons (list beg end nil)
+ (cons (list beg end (sweeprolog-fullstop-face))
+ ws)))))
("functor"
(list (list beg end (sweeprolog-functor-face))))
("arity"
@@ -2046,9 +2135,6 @@ modified."
(1 (unless (save-excursion (nth 8 (syntax-ppss (match-beginning 0))))
(string-to-syntax "."))))
((rx bow (group-n 1 "0'" anychar))
- (1 (unless (save-excursion (nth 8 (syntax-ppss (match-beginning 0))))
- (string-to-syntax "w"))))
- ((rx bow (group-n 1 "!") eow)
(1 (unless (save-excursion (nth 8 (syntax-ppss (match-beginning 0))))
(string-to-syntax "w")))))
start end)))
@@ -2223,7 +2309,6 @@ Interactively, a prefix arg means to prompt for BUFFER."
comint-delimiter-argument-list '(?,)
comment-start "%")
(add-hook 'post-self-insert-hook
#'sweeprolog-top-level--post-self-insert-function nil t)
- (add-hook 'completion-at-point-functions
#'sweeprolog-completion-at-point-function nil t)
(setq sweeprolog-top-level-timer (run-with-idle-timer 0.2 t
#'sweeprolog-colourise-query (current-buffer)))
(add-hook 'kill-buffer-hook
(lambda ()
@@ -2817,29 +2902,48 @@ predicate definition at or directly above POINT."
(scan-error nil)))
(defun sweeprolog--backward-term (pre)
- (pcase (sweeprolog-last-token-boundaries)
- ('nil
- (signal 'scan-error
- (list "Cannot scan backwards beyond beginning of buffer."
- (point-min)
- (point-min))))
- (`(open ,obeg ,oend)
- (signal 'scan-error
- (list "Cannot scan backwards beyond opening parenthesis or
bracket."
- obeg
- oend)))
- (`(functor ,obeg ,oend)
- (signal 'scan-error
- (list "Cannot scan backwards beyond functor."
- obeg
- oend)))
- (`(operator ,obeg ,oend)
- (if (and (string= "." (buffer-substring-no-properties obeg oend))
- (member (char-syntax (char-after (1+ obeg))) '(?> ? )))
- (signal 'scan-error
- (list "Cannot scan backwards beyond fullstop."
- obeg
- (1+ obeg)))
+ (while t
+ (pcase (sweeprolog-last-token-boundaries)
+ ('nil
+ (signal 'scan-error
+ (list "Cannot scan backwards beyond beginning of buffer."
+ (point-min)
+ (point-min))))
+ (`(open ,obeg ,oend)
+ (signal 'scan-error
+ (list "Cannot scan backwards beyond opening parenthesis or
bracket."
+ obeg
+ oend)))
+ (`(functor ,obeg ,oend)
+ (signal 'scan-error
+ (list "Cannot scan backwards beyond functor."
+ obeg
+ oend)))
+ (`(operator ,obeg ,oend)
+ (if (and (string= "." (buffer-substring-no-properties obeg oend))
+ (member (char-syntax (char-after (1+ obeg))) '(?> ? )))
+ (signal 'scan-error
+ (list "Cannot scan backwards beyond fullstop."
+ obeg
+ (1+ obeg)))
+ (if-let ((opre (sweeprolog-op-infix-precedence
+ (buffer-substring-no-properties obeg oend))))
+ (if (> opre pre)
+ (signal 'scan-error
+ (list (format "Cannot scan backwards beyond infix
operator of higher precedence %s." opre)
+ obeg
+ oend))
+ (goto-char obeg))
+ (if-let ((ppre (sweeprolog-op-prefix-precedence
+ (buffer-substring-no-properties obeg oend))))
+ (if (> ppre pre)
+ (signal 'scan-error
+ (list (format "Cannot scan backwards beyond prefix
operator of higher precedence %s." opre)
+ obeg
+ oend))
+ (goto-char obeg))
+ (goto-char obeg)))))
+ (`(symbol ,obeg ,oend)
(if-let ((opre (sweeprolog-op-infix-precedence
(buffer-substring-no-properties obeg oend))))
(if (> opre pre)
@@ -2847,8 +2951,7 @@ predicate definition at or directly above POINT."
(list (format "Cannot scan backwards beyond infix
operator of higher precedence %s." opre)
obeg
oend))
- (goto-char obeg)
- (sweeprolog--backward-term pre))
+ (goto-char obeg))
(if-let ((ppre (sweeprolog-op-prefix-precedence
(buffer-substring-no-properties obeg oend))))
(if (> ppre pre)
@@ -2856,40 +2959,15 @@ predicate definition at or directly above POINT."
(list (format "Cannot scan backwards beyond prefix
operator of higher precedence %s." opre)
obeg
oend))
- (goto-char obeg)
- (sweeprolog--backward-term pre))
- (goto-char obeg)
- (sweeprolog--backward-term pre)))))
- (`(symbol ,obeg ,oend)
- (if-let ((opre (sweeprolog-op-infix-precedence
- (buffer-substring-no-properties obeg oend))))
- (if (> opre pre)
- (signal 'scan-error
- (list (format "Cannot scan backwards beyond infix
operator of higher precedence %s." opre)
- obeg
- oend))
- (goto-char obeg)
- (sweeprolog--backward-term pre))
- (if-let ((ppre (sweeprolog-op-prefix-precedence
- (buffer-substring-no-properties obeg oend))))
- (if (> ppre pre)
- (signal 'scan-error
- (list (format "Cannot scan backwards beyond prefix
operator of higher precedence %s." opre)
- obeg
- oend))
- (goto-char obeg)
- (sweeprolog--backward-term pre))
- (goto-char obeg)
- (sweeprolog--backward-term pre))))
- (`(close ,lbeg ,_lend)
- (goto-char (nth 1 (syntax-ppss lbeg)))
- (when (or (= (char-syntax (char-before)) ?w)
- (= (char-syntax (char-before)) ?_))
- (skip-syntax-backward "w_"))
- (sweeprolog--backward-term pre))
- (`(,_ ,lbeg ,_)
- (goto-char lbeg)
- (sweeprolog--backward-term pre))))
+ (goto-char obeg))
+ (goto-char obeg))))
+ (`(close ,lbeg ,_lend)
+ (goto-char (nth 1 (syntax-ppss lbeg)))
+ (when (or (= (char-syntax (char-before)) ?w)
+ (= (char-syntax (char-before)) ?_))
+ (skip-syntax-backward "w_")))
+ (`(,_ ,lbeg ,_)
+ (goto-char lbeg)))))
(defun sweeprolog-backward-term (pre)
(condition-case _
@@ -3135,8 +3213,6 @@ if-then-else constructs in SWI-Prolog."
(setq sweeprolog--analyze-buffer-duration (float-time (time-since time))))
(add-hook 'xref-backend-functions #'sweeprolog--xref-backend nil t)
(add-hook 'file-name-at-point-functions #'sweeprolog-file-at-point nil t)
- (add-hook 'completion-at-point-functions
#'sweeprolog-completion-at-point-function nil t)
- (add-hook 'completion-at-point-functions
#'sweeprolog-variable-completion-at-point nil t)
(when sweeprolog-analyze-buffer-on-idle
(setq sweeprolog--timer
(run-with-idle-timer