mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

css-mode.el: Support multi-line comment filling

Browse source 
Fixes: debbugs:20256

* lisp/textmodes/css-mode.el (css-fill-paragraph): Support multi-line
comment filling.
(css-adaptive-fill): New function.
(css-mode): Set `adaptive-fill-function'.
(scss-mode): Set `comment-continue'.
This commit is contained in:
Simen Heggestøyl 2015-04-18 20:25:40 +02:00
parent 9760c6cde3
commit 1dee790fc1
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lisp/textmodes/css-mode.el
View file

@ -381,7 +381,8 @@ pseudo-classes, and at-rules."
(setq-local comment-start-skip "/\\*+[ \t]*")
(setq-local comment-end "*/")
(setq-local comment-end-skip "[ \t]*\\*+/")
(setq-local fill-paragraph-function 'css-fill-paragraph)
(setq-local fill-paragraph-function #'css-fill-paragraph)
(setq-local adaptive-fill-function #'css-adaptive-fill)
(setq-local add-log-current-defun-function #'css-current-defun-name)
(smie-setup css-smie-grammar #'css-smie-rules
:forward-token #'css-smie--forward-token
@ -395,6 +396,12 @@ pseudo-classes, and at-rules."
(defun css-fill-paragraph (&optional justify)
(save-excursion
;; Fill succeeding comment when invoked right before a multi-line
;; comment.
(when (save-excursion
(beginning-of-line)
(comment-search-forward (point-at-eol) t))
(goto-char (match-end 0)))
(let ((ppss (syntax-ppss))
(eol (line-end-position)))
(cond
@ -414,8 +421,11 @@ pseudo-classes, and at-rules."
(paragraph-separate
(if (and comment-continue
(string-match "[^ \t]" comment-continue))
(concat "\\(?:[ \t]*" (regexp-quote comment-continue)
"\\)?\\(?:" paragraph-separate "\\)")
(concat "\\(?:[ \t]*\\(?:"
(regexp-quote comment-continue) "\\|"
comment-start-skip "\\|"
comment-end-skip "\\)\\)?"
"\\(?:" paragraph-separate "\\)")
paragraph-separate))
(paragraph-start
(if (and comment-continue
@ -468,6 +478,12 @@ pseudo-classes, and at-rules."
;; Don't use the default filling code.
t)))))))
(defun css-adaptive-fill ()
(when (looking-at "[ \t]*/\\*[ \t]*")
(let ((str (match-string 0)))
(and (string-match "/\\*" str)
(replace-match " *" t t str)))))
(defun css-current-defun-name ()
"Return the name of the CSS section at point, or nil."
(save-excursion
@ -504,6 +520,7 @@ pseudo-classes, and at-rules."
"Major mode to edit \"Sassy CSS\" files."
(setq-local comment-start "// ")
(setq-local comment-end "")
(setq-local comment-continue " *")
(setq-local comment-start-skip "/[*/]+[ \t]*")
(setq-local comment-end-skip "[ \t]*\\(?:\n\\|\\*+/\\)")
(setq-local font-lock-defaults '(scss-font-lock-keywords nil t)))