emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/relint 8cc1017 12/15: Rename relint--pos-from-toplevel-


From: Mattias Engdegård
Subject: [elpa] externals/relint 8cc1017 12/15: Rename relint--pos-from-toplevel-pos-path
Date: Sat, 29 Feb 2020 17:22:30 -0500 (EST)

branch: externals/relint
commit 8cc1017036d524b7c51860aaa36191925dc31f1a
Author: Mattias Engdegård <address@hidden>
Commit: Mattias Engdegård <address@hidden>

    Rename relint--pos-from-toplevel-pos-path
    
    The starting position need not be at top level.
---
 relint-test.el |  2 +-
 relint.el      | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/relint-test.el b/relint-test.el
index 9b835b1..05bb8a4 100644
--- a/relint-test.el
+++ b/relint-test.el
@@ -79,7 +79,7 @@ and a path."
       (dolist (item (relint-test--enumerate-nodes toplevel-form nil))
         (let* ((node (car item))
                (path (cdr item))
-               (pos (relint--pos-from-toplevel-pos-path toplevel-pos path)))
+               (pos (relint--pos-from-start-pos-path toplevel-pos path)))
           ;; Skip sugared items; they cannot be read in isolation.
           (unless (memq node '(quote function \` \, \,@))
             (goto-char pos)
diff --git a/relint.el b/relint.el
index fc06746..bbda180 100644
--- a/relint.el
+++ b/relint.el
@@ -110,7 +110,9 @@
 
 (defun relint--follow-path (path)
   "Move point forward along PATH (reversed list of list indices
-to follow to target)."
+to follow to target).
+For example, if point is before the form (A B (C ((D E F G))))
+and PATH is (3 0 1 2), then the returned position is right before G."
   (let ((p (reverse path)))
     (while p
       (relint--skip-whitespace)
@@ -141,11 +143,11 @@ to follow to target)."
       (setq p (cdr p))))
   (relint--skip-whitespace))
 
-(defun relint--pos-from-toplevel-pos-path (toplevel-pos path)
-  "Compute position from TOPLEVEL-POS and PATH (reversed list of
+(defun relint--pos-from-start-pos-path (start-pos path)
+  "Compute position from START-POS and PATH (reversed list of
 list indices to follow to target)."
   (save-excursion
-    (goto-char toplevel-pos)
+    (goto-char start-pos)
     (relint--follow-path path)
     (point)))
 
@@ -193,7 +195,7 @@ or nil if no position could be determined."
            (setq args (cdr args)))
          (and args (stringp (car args))
               (let ((string-pos
-                     (relint--pos-from-toplevel-pos-path pos (list index))))
+                     (relint--pos-from-start-pos-path pos (list index))))
                 (relint--literal-string-pos string-pos n))))))))
 
 (defun relint--suppression (pos message)
@@ -247,8 +249,8 @@ or nil if no position could be determined."
   "Function accepting a found complaint, taking the arguments
 (FILE POS MESSAGE STRING STRING-IDX).")
 
-(defun relint--report (file toplevel-pos path message &optional str str-pos)
-  (let* ((base-pos (relint--pos-from-toplevel-pos-path toplevel-pos path))
+(defun relint--report (file start-pos path message &optional str str-pos)
+  (let* ((base-pos (relint--pos-from-start-pos-path start-pos path))
          (pos (or (and str-pos (relint--string-pos base-pos str-pos))
                   base-pos)))
     (if (relint--suppression pos message)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]