From: Jackson Ray Hamilton <jackson@jacksonrayhamilton.com>
Date: Tue, 9 Apr 2019 05:27:41 +0000 (-0700)
Subject: Move curly functions closer to where they’re used
X-Git-Tag: emacs-27.0.90~3261^2~34
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7c3ffdaf4b17e9f93aa929fc9a5c154e8e68e5fb;p=emacs.git

Move curly functions closer to where they’re used

* lisp/progmodes/js.el (js-jsx--enclosing-curly-pos)
(js-jsx--goto-outermost-enclosing-curly): As the code evolved, these
functions’ definitions ended up being far away from the only places
where they were used.  Move them there.
---

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 1cec41d9270..a1f5e694ede 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1956,26 +1956,6 @@ the match.  Return nil if a match can’t be found."
               (setq tag-stack (1+ tag-stack))))
           (setq last-pos (point)))))))
 
-(defun js-jsx--enclosing-curly-pos ()
-  "Return position of enclosing “{” in a “{/}” pair about point."
-  (let ((parens (reverse (nth 9 (syntax-ppss)))) paren-pos curly-pos)
-    (while
-        (and
-         (setq paren-pos (car parens))
-         (not (when (= (char-after paren-pos) ?{)
-                (setq curly-pos paren-pos)))
-         (setq parens (cdr parens))))
-    curly-pos))
-
-(defun js-jsx--goto-outermost-enclosing-curly (limit)
-  "Set point to enclosing “{” at or closest after LIMIT."
-  (let (pos)
-    (while
-        (and
-         (setq pos (js-jsx--enclosing-curly-pos))
-         (if (>= pos limit) (goto-char pos))
-         (> pos limit)))))
-
 (defun js-jsx--enclosing-tag-pos ()
   "Return beginning and end of a JSXElement about point.
 Look backward for a JSXElement that both starts before point and
@@ -2646,6 +2626,26 @@ The column calculation is based off of `sgml-calculate-indent'."
 
     ))
 
+(defun js-jsx--enclosing-curly-pos ()
+  "Return position of enclosing “{” in a “{/}” pair about point."
+  (let ((parens (reverse (nth 9 (syntax-ppss)))) paren-pos curly-pos)
+    (while
+        (and
+         (setq paren-pos (car parens))
+         (not (when (= (char-after paren-pos) ?{)
+                (setq curly-pos paren-pos)))
+         (setq parens (cdr parens))))
+    curly-pos))
+
+(defun js-jsx--goto-outermost-enclosing-curly (limit)
+  "Set point to enclosing “{” at or closest after LIMIT."
+  (let (pos)
+    (while
+        (and
+         (setq pos (js-jsx--enclosing-curly-pos))
+         (if (>= pos limit) (goto-char pos))
+         (> pos limit)))))
+
 (defun js-jsx--expr-attribute-pos (start limit)
   "Look back from START to LIMIT for a JSXAttribute."
   (save-excursion