[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 6755fdb 194/271: Pass test for key names.
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master 6755fdb 194/271: Pass test for key names. |
Date: |
Thu, 05 Feb 2015 18:31:08 +0000 |
branch: master
commit 6755fdb2c353f3c3b5102ad14da1fcb6e19b556f
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Pass test for key names.
---
context-coloring.el | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/context-coloring.el b/context-coloring.el
index ea62a28..b6531bf 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -243,23 +243,13 @@ END (exclusive) with the face corresponding to LEVEL."
(setq scope enclosing-scope))
level))
-;; Adapted from js2-refactor.el/js2r-vars.el.
-;; FIXME: This fails if there is whitespace between the name and the colon.
(defsubst context-coloring-js2-local-name-node-p (node)
"Determines if NODE is a js2-name-node representing a local
variable."
(and (js2-name-node-p node)
- (let ((start (js2-node-abs-pos node)))
- (and
- (let ((end (+ start (js2-node-len node))))
- (not (string-match "[\n\t ]*:" (buffer-substring-no-properties
- end
- (+ end 1)))))
- (not (string-match "\\.[\n\t ]*" (buffer-substring-no-properties
- (max 1 (- start 1)) ; 0 throws an
- ; error. ""
will
- ; fail the
test.
- start)))))))
+ (let ((parent (js2-node-parent node)))
+ (not (or (js2-object-prop-node-p parent)
+ (js2-prop-get-node-p parent))))))
(defsubst context-coloring-js2-colorize-node (node level)
"Colors NODE with the color for LEVEL."
@@ -277,6 +267,7 @@ generated by js2-mode."
js2-mode-ast
(lambda (node end-p)
(when (null end-p)
+ ;; (message "%s" (js2-node-short-name node))
(cond
((js2-comment-node-p node)
(context-coloring-js2-colorize-node
- [elpa] master 1df629d 222/271: Enable rainbow-mode., (continued)
- [elpa] master 1df629d 222/271: Enable rainbow-mode., Jackson Ray Hamilton, 2015/02/05
- [elpa] master dc9644e 271/271: Merge branch 'master' of git://git.sv.gnu.org/emacs/elpa, Jackson Ray Hamilton, 2015/02/05
- [elpa] master 97150a1 256/271: Update .elpaignore., Jackson Ray Hamilton, 2015/02/05
- [elpa] master ae2adc4 259/271: Merge themes into main file., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 5908ce8 232/271: Fix readme., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 27db37a 202/271: Use a hash table as a scope level fast track., Jackson Ray Hamilton, 2015/02/05
- [elpa] master f3ab262 246/271: Merge branch 'develop', Jackson Ray Hamilton, 2015/02/05
- [elpa] master 73c82f9 234/271: Merge branch 'feature/set-colors' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master 1c0155f 203/271: Don't color name nodes in their own scope., Jackson Ray Hamilton, 2015/02/05
- [elpa] master b325b91 250/271: Add current directory to load path for compilation., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 6755fdb 194/271: Pass test for key names.,
Jackson Ray Hamilton <=
- [elpa] master 941070c 257/271: Add `make deps`., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 6ce2b63 184/271: Bump required js2-mode version., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d1cb93b 241/271: Merge branch 'feature/dispatch' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master e05f044 191/271: Update js2-mode., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 04f6f73 185/271: Documentation., Jackson Ray Hamilton, 2015/02/05
- [elpa] master ed2c33d 121/271: Merge branch 'feature/color-schemer' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master 196a6ed 209/271: Whoops., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 887f4c7 215/271: Merge branch 'master' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master 6706bc2 218/271: Merge branch 'develop', Jackson Ray Hamilton, 2015/02/05
- [elpa] master d813892 115/271: Add color-schemer utility., Jackson Ray Hamilton, 2015/02/05