[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 4e5babf 03/49: Merge pull request #345 from jacott/master
From: |
Dmitry Gutov |
Subject: |
[elpa] master 4e5babf 03/49: Merge pull request #345 from jacott/master |
Date: |
Mon, 16 Jan 2017 15:35:46 +0000 (UTC) |
branch: master
commit 4e5babf59686202e0e04c5d9499c1ae67fde1f0f
Merge: 0cda392 abe8d0c
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #345 from jacott/master
Fix Highlighting function name of form {"quoted name" () {...}}
---
js2-mode.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/js2-mode.el b/js2-mode.el
index db61389..add73ac 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -10871,7 +10871,8 @@ When `js2-is-in-destructuring' is t, forms like {a, b,
c} will be permitted."
;; method definition: {f() {...}}
((and (= (js2-peek-token) js2-LP)
(>= js2-language-version 200))
- (when (js2-name-node-p key) ; highlight function name properties
+ (when (or (js2-name-node-p key) (js2-string-node-p key))
+ ;; highlight function name properties
(js2-record-face 'font-lock-function-name-face))
(js2-parse-method-prop pos key property-type))
;; binding element with initializer
- [elpa] master updated (218fd5a -> ff072bf), Dmitry Gutov, 2017/01/16
- [elpa] master b23d9e4 01/49: Fix Highlighting function name of form {"quoted name" () {...}}, Dmitry Gutov, 2017/01/16
- [elpa] master abe8d0c 02/49: Fix comment alignment, Dmitry Gutov, 2017/01/16
- [elpa] master 8e7ed39 06/49: Merge pull request #348 from dunn/makequiet, Dmitry Gutov, 2017/01/16
- [elpa] master 357547c 09/49: js2-jsx-mode docstring fix, Dmitry Gutov, 2017/01/16
- [elpa] master 2b32301 15/49: Propertize regexp starting with /= correctly, Dmitry Gutov, 2017/01/16
- [elpa] master 68db1f5 05/49: Makefile: use -Q to avoid site-lisp loading, Dmitry Gutov, 2017/01/16
- [elpa] master 4e5babf 03/49: Merge pull request #345 from jacott/master,
Dmitry Gutov <=
- [elpa] master 980eb3d 04/49: Support ES7 exponentiation, Dmitry Gutov, 2017/01/16
- [elpa] master 49f9761 08/49: js2-jsdoc-arg-tag-regexp: Recognize @module, Dmitry Gutov, 2017/01/16
- [elpa] master e45206b 11/49: js2-parse-class: Convert positions to relative for NAME and EXTENDS, too, Dmitry Gutov, 2017/01/16
- [elpa] master bea6942 13/49: Unbind js2-mode-show-node, Dmitry Gutov, 2017/01/16
- [elpa] master c0801b2 12/49: Propertize regexp literals like js-mode does, Dmitry Gutov, 2017/01/16
- [elpa] master 9a8aaa9 28/49: Fix length of name in namespace-import nodes, Dmitry Gutov, 2017/01/16
- [elpa] master 44c289f 24/49: Copy edits, Dmitry Gutov, 2017/01/16
- [elpa] master b6d9301 17/49: Merge pull request #377 from XeCycle/memfn-delete, Dmitry Gutov, 2017/01/16
- [elpa] master 64ec0a2 14/49: Allow newline in globals declaration, Dmitry Gutov, 2017/01/16
- [elpa] master 2801681 26/49: Fix "pos" argument in template node constructors, Dmitry Gutov, 2017/01/16