ENHANCED: also complete predicate names from xref

diff --git a/sweep.el b/sweep.el
index b522dd1c1f5aebe2e7df753fcb336c502bb5eb00..d081839c389cdc3f3e1e01f651f3e37d7e8566db 100644 (file)
--- a/sweep.el
+++ b/sweep.el
@@ -199,7 +199,7 @@
               (when (eq sts 'finished)
                 (let ((opoint (point)))
                   (save-match-data
-                    (with-silent-modifications
+                    (combine-after-change-calls
                       (skip-chars-backward "1234567890")
                       (when (= ?/ (preceding-char))
                         (backward-char)

diff --git a/sweep.pl b/sweep.pl
index c24bae8b60569f65e6764664e47bf53bdd715261..a856240e575187d478ef35c8738c6e8cd95bb343 100644 (file)
--- a/sweep.pl
+++ b/sweep.pl
@@ -210,8 +210,16 @@ sweep_local_predicate_completion([Mod|Sub], Preds) :-
     atom_string(M, Mod),
     findall(F/N,
             @(current_predicate(F/N), M),
-            Preds0),
-    convlist(sweep_predicate_completion_annotated(Sub, M), Preds0, Preds).
+            Preds0,
+            Tail),
+    findall(XF/XN,
+            (   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/~w', [F, [quoted(true), character_escapes(true)], N]),