mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

Use font-lock-doc-face in js-mode

Browse Source 
Bug#25858:
* lisp/progmodes/js.el (js-font-lock-syntactic-face-function): New
defun.
(js-mode): Use it.
* test/lisp/progmodes/js-tests.el (js-mode-doc-comment-face): New
test.
This commit is contained in:
Tom Tromey 2017-02-25 10:27:48 -07:00
parent 546d30ed14
commit 8db75f0ef9
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/progmodes/js.el
View File

@ -1687,6 +1687,16 @@ This performs fontification according to `js--class-styles'."
js--font-lock-keywords-3)
"Font lock keywords for `js-mode'. See `font-lock-keywords'.")
(defun js-font-lock-syntactic-face-function (state)
"Return syntactic face given STATE."
(if (nth 3 state)
font-lock-string-face
(if (save-excursion
(goto-char (nth 8 state))
(looking-at "/\\*\\*"))
font-lock-doc-face
font-lock-comment-face)))
(defconst js--syntax-propertize-regexp-regexp
(rx
;; Start of regexp.
@ -3828,7 +3838,10 @@ If one hasn't been set, or if it's stale, prompt for a new one."
(setq-local beginning-of-defun-function #'js-beginning-of-defun)
(setq-local end-of-defun-function #'js-end-of-defun)
(setq-local open-paren-in-column-0-is-defun-start nil)
(setq-local font-lock-defaults (list js--font-lock-keywords))
(setq-local font-lock-defaults
(list js--font-lock-keywords nil nil nil nil
'(font-lock-syntactic-face-function
. js-font-lock-syntactic-face-function)))
(setq-local syntax-propertize-function #'js-syntax-propertize)
(setq-local prettify-symbols-alist js--prettify-symbols-alist)

12
test/lisp/progmodes/js-tests.el
View File

@ -128,6 +128,18 @@ if (!/[ (:,='\"]/.test(value)) {
;; Any success is ok here.
(should t)))
(ert-deftest js-mode-doc-comment-face ()
(dolist (test '(("/*" "*/" font-lock-comment-face)
("//" "\n" font-lock-comment-face)
("/**" "*/" font-lock-doc-face)
("\"" "\"" font-lock-string-face)))
(with-temp-buffer
(js-mode)
(insert (car test) " he")
(save-excursion (insert "llo " (cadr test)))
(font-lock-ensure)
(should (eq (get-text-property (point) 'face) (caddr test))))))
(provide 'js-tests)
;;; js-tests.el ends here