Commit 7c3ffdaf authored by Jackson Ray Hamilton's avatar Jackson Ray Hamilton

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.
parent 95455195
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment