kotovalexarian-likes-github
/
haml--haml
mirror of https://github.com/haml/haml.git
1
0
Fork 0
Code Releases Activity

[Emacs] Have haml-parse-multline-attr-hash return an alist.

This commit is contained in:
Nathan Weizenbaum 2009-03-06 15:44:15 -08:00
parent 919f13b575
commit 920102ecac
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
extra/haml-mode.el
View File

@ -391,24 +391,28 @@ character of the next line."
(defun* haml-indent-p () (defun* haml-indent-p ()
"Returns t if the current line can have lines nested beneath it." "Returns t if the current line can have lines nested beneath it."
(destructuring-bind (line-indent attr-hash-indent) (haml-parse-multiline-attr-hash) (let ((attr-props (haml-parse-multiline-attr-hash)))
(when attr-hash-indent (when attr-props
(end-of-line) (end-of-line)
(return-from haml-indent-p (return-from haml-indent-p
(if (eq (char-before) ?,) attr-hash-indent (if (eq (char-before) ?,) (cdr (assq 'hash-indent attr-props))
(beginning-of-line) (beginning-of-line)
(+ line-indent haml-indent-offset))))) (+ (cdr (assq 'indent attr-props)) haml-indent-offset)))))
(loop for opener in haml-block-openers (loop for opener in haml-block-openers
if (looking-at opener) return t if (looking-at opener) return t
finally return nil)) finally return nil))
(defun* haml-parse-multiline-attr-hash () (defun* haml-parse-multiline-attr-hash ()
"Parses a multiline attribute hash, and returns "Parses a multiline attribute hash, and returns
\(INDENTATION ATTR-HASH-INDENTATION). an alist with the following keys:
INDENTATION is the indentation of the line beginning the hash, INDENT is the indentation of the line beginning the hash.
and ATTR-HASH-INDENTATION is the indentation of the first character
within the attribute hash." HASH-INDENT is the indentation of the first character
within the attribute hash.
POINT is the character position at the beginning of the line
beginning the hash."
(save-excursion (save-excursion
(while t (while t
(beginning-of-line) (beginning-of-line)
@ -418,11 +422,13 @@ within the attribute hash."
(haml-limited-forward-sexp (save-excursion (end-of-line) (point))) (haml-limited-forward-sexp (save-excursion (end-of-line) (point)))
(when (eq (char-before) ?,) (when (eq (char-before) ?,)
(return-from haml-parse-multiline-attr-hash (return-from haml-parse-multiline-attr-hash
(list (current-indentation) (- (match-end 0) (match-beginning 0)))))) `((indent . ,(current-indentation))
(hash-indent . ,(- (match-end 0) (match-beginning 0)))
(point . ,(match-beginning 0))))))
(forward-line -1) (forward-line -1)
(end-of-line) (end-of-line)
(when (not (eq (char-before) ?,)) (when (not (eq (char-before) ?,))
(return-from haml-parse-multiline-attr-hash '(nil nil))))))) (return-from haml-parse-multiline-attr-hash nil))))))
(defun haml-compute-indentation () (defun haml-compute-indentation ()
"Calculate the maximum sensible indentation for the current line." "Calculate the maximum sensible indentation for the current line."