[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master f3697c0 35/79: Strings are sexps.
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master f3697c0 35/79: Strings are sexps. |
Date: |
Sun, 14 Jun 2015 00:05:30 +0000 |
branch: master
commit f3697c06f3ee90e2381fb519ec94f0fa47982046
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Strings are sexps.
---
context-coloring.el | 11 ++++++-----
test/context-coloring-test.el | 1 +
test/fixtures/let.el | 1 +
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/context-coloring.el b/context-coloring.el
index 9a5f022..1cc93e5 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -652,6 +652,8 @@ provide visually \"instant\" updates at 60 frames per
second.")
(context-coloring-elisp-colorize-symbol))
((= syntax-code context-coloring-EXPRESSION-PREFIX-CODE)
(context-coloring-elisp-colorize-expression-prefix))
+ ((= syntax-code context-coloring-STRING-QUOTE-CODE)
+ (context-coloring-elisp-colorize-string))
(t
(forward-char)))))
@@ -678,10 +680,10 @@ provide visually \"instant\" updates at 60 frames per
second.")
(point)))
(setq syntax-code (context-coloring-get-syntax-code))
(cond
- ((= syntax-code context-coloring-COMMENT-START-CODE)
- (context-coloring-elisp-colorize-comment))
((= syntax-code context-coloring-STRING-QUOTE-CODE)
(context-coloring-elisp-colorize-string))
+ ((= syntax-code context-coloring-COMMENT-START-CODE)
+ (context-coloring-elisp-colorize-comment))
((= syntax-code context-coloring-ESCAPE-CODE)
(forward-char 2))
(t
@@ -697,12 +699,11 @@ provide visually \"instant\" updates at 60 frames per
second.")
((or (= syntax-code context-coloring-OPEN-PARENTHESIS-CODE)
(= syntax-code context-coloring-WORD-CODE)
(= syntax-code context-coloring-SYMBOL-CODE)
- (= syntax-code context-coloring-EXPRESSION-PREFIX-CODE))
+ (= syntax-code context-coloring-EXPRESSION-PREFIX-CODE)
+ (= syntax-code context-coloring-STRING-QUOTE-CODE))
(context-coloring-elisp-colorize-sexp))
((= syntax-code context-coloring-COMMENT-START-CODE)
(context-coloring-elisp-colorize-comment))
- ((= syntax-code context-coloring-STRING-QUOTE-CODE)
- (context-coloring-elisp-colorize-string))
((= syntax-code context-coloring-ESCAPE-CODE)
(forward-char 2))
(t
diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index 85b700e..5726421 100644
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -1140,6 +1140,7 @@ ssssssssssss0"))
(context-coloring-test-assert-coloring "
1111 11
cccccccccc
+ 11 sss1
11 01
11 00001
11 2222 22
diff --git a/test/fixtures/let.el b/test/fixtures/let.el
index 5507b47..ac3de2d 100644
--- a/test/fixtures/let.el
+++ b/test/fixtures/let.el
@@ -1,5 +1,6 @@
(let (a
;; comment
+ (s "s")
(b a)
(c free)
(d (let (a
- [elpa] master 49265ab 25/79: Simplify comment and string parsing., (continued)
- [elpa] master 49265ab 25/79: Simplify comment and string parsing., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 52383b5 26/79: Handle octothorpes., Jackson Ray Hamilton, 2015/06/13
- [elpa] master a283883 24/79: Always colorize the remaining region., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 3d3c693 22/79: Pass interrupt test with recursive colorizer., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 966bd20 31/79: Add test for escape characters., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 7ab01e3 30/79: Fix ignored test., Jackson Ray Hamilton, 2015/06/13
- [elpa] master f88e21c 29/79: Ignore escaped characters., Jackson Ray Hamilton, 2015/06/13
- [elpa] master e06f1a6 27/79: Color comments and strings inside quotes., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 5a8186b 34/79: Color comments and strings inside defuns., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 4b25191 28/79: Refactor benchmarks. Improve benchmark reliability., Jackson Ray Hamilton, 2015/06/13
- [elpa] master f3697c0 35/79: Strings are sexps.,
Jackson Ray Hamilton <=
- [elpa] master 87893df 32/79: Support comma splicing., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 7167e93 19/79: Pass let and let* tests with recursive colorizer., Jackson Ray Hamilton, 2015/06/13
- [elpa] master af4f773 33/79: Colorize comments and strings inside backquotes., Jackson Ray Hamilton, 2015/06/13
- [elpa] master acaaf39 38/79: Add file statistics to benchmarks., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 8836df9 37/79: Add colorization times to logs., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 5661ed0 44/79: Document `:host' and `:port' properties., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 16fa835 40/79: Optimize JSON parser., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 3dfd515 42/79: Messy server implementation., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 872bf5f 46/79: Bump required scopifier version., Jackson Ray Hamilton, 2015/06/13
- [elpa] master 2258572 39/79: Optimize. Refactor., Jackson Ray Hamilton, 2015/06/13