[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 5c8855f 212/271: Merge branch 'feature/key-values' into de
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master 5c8855f 212/271: Merge branch 'feature/key-values' into develop |
Date: |
Thu, 05 Feb 2015 18:31:18 +0000 |
branch: master
commit 5c8855f3f27027d7f765d310fd71d61f658e1a03
Merge: 196a6ed 6e5e95a
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Merge branch 'feature/key-values' into develop
---
context-coloring.el | 3 ++-
test/context-coloring-test.el | 17 +++++++++++++++++
test/fixtures/key-values.js | 8 ++++++++
3 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/context-coloring.el b/context-coloring.el
index bb3cb1e..ff3eae0 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -255,7 +255,8 @@ END (exclusive) with the face corresponding to LEVEL."
variable."
(and (js2-name-node-p node)
(let ((parent (js2-node-parent node)))
- (not (or (js2-object-prop-node-p parent)
+ (not (or (and (js2-object-prop-node-p parent)
+ (eq node (js2-object-prop-node-left parent)))
(and (js2-prop-get-node-p parent)
;; For nested property lookup, the node on the left is a
;; `js2-prop-get-node', so this always works.
diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index 3fa7953..52a93fb 100644
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -235,4 +235,21 @@ invoke when it is done."
"./fixtures/property-lookup.js"
(context-coloring-test-js-property-lookup)))
+(defun context-coloring-test-js-key-values ()
+ (context-coloring-test-assert-region-level 78 79 1))
+
+(ert-deftest-async context-coloring-test-js-mode-key-values (done)
+ (context-coloring-test-js-mode
+ "./fixtures/key-values.js"
+ (lambda (teardown)
+ (unwind-protect
+ (context-coloring-test-js-key-values)
+ (funcall teardown))
+ (funcall done))))
+
+(ert-deftest context-coloring-test-js2-mode-key-values ()
+ (context-coloring-test-js2-mode
+ "./fixtures/key-values.js"
+ (context-coloring-test-js-key-values)))
+
(provide 'context-coloring-test)
diff --git a/test/fixtures/key-values.js b/test/fixtures/key-values.js
new file mode 100644
index 0000000..41bdedd
--- /dev/null
+++ b/test/fixtures/key-values.js
@@ -0,0 +1,8 @@
+(function () {
+ var a;
+ (function () {
+ return {
+ b: a
+ };
+ }());
+}());
- [elpa] master f2b5d79 264/271: Remove unnecessary .elpaignore., (continued)
- [elpa] master f2b5d79 264/271: Remove unnecessary .elpaignore., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 75f6705 251/271: Fix on Windows., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 8665ff3 233/271: Simplify `context-coloring-set-colors'., Jackson Ray Hamilton, 2015/02/05
- [elpa] master eaece82 263/271: Version 4.0.0., Jackson Ray Hamilton, 2015/02/05
- [elpa] master d885920 231/271: Merge branch 'feature/comments-and-strings' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master 96da8de 219/271: Merge branch 'master' into develop, Jackson Ray Hamilton, 2015/02/05
- [elpa] master c947690 238/271: Documentation. Cleanup. Copyright notices., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 68824f6 193/271: Add failing test for key names., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 784910c 266/271: externals-list: Add context-coloring, Jackson Ray Hamilton, 2015/02/05
- [elpa] master 079a5a8 237/271: Document tests., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 5c8855f 212/271: Merge branch 'feature/key-values' into develop,
Jackson Ray Hamilton <=
- [elpa] master 3944181 223/271: Renames. Cleanup., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 1f06301 198/271: Pass property lookup test., Jackson Ray Hamilton, 2015/02/05
- [elpa] master f836bd2 141/271: Add js2-mode test., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 32aacc9 216/271: Add customization interface., Jackson Ray Hamilton, 2015/02/05
- [elpa] master 0830f53 104/271: Merge branch 'develop', Jackson Ray Hamilton, 2015/02/05
- [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