[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 85ff3ef 13/28: Trailing whitespace, empty arrays, empty st
From: |
Jackson Ray Hamilton |
Subject: |
[elpa] master 85ff3ef 13/28: Trailing whitespace, empty arrays, empty strings. |
Date: |
Tue, 05 May 2015 11:10:20 +0000 |
branch: master
commit 85ff3ef8a80b11810ba4382fd386209d8ec5a714
Author: Jackson Ray Hamilton <address@hidden>
Commit: Jackson Ray Hamilton <address@hidden>
Trailing whitespace, empty arrays, empty strings.
Fix bug in the JSON parser. Arrays only parsed before because
`string-to-number' ignored the trailing "]".
---
context-coloring.el | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/context-coloring.el b/context-coloring.el
index 2b65666..691a475 100644
--- a/context-coloring.el
+++ b/context-coloring.el
@@ -54,6 +54,7 @@
;;; Code:
(require 'js2-mode)
+(require 'subr-x)
;;; Local variables
@@ -300,8 +301,13 @@ element."
(defun context-coloring-parse-array (array)
"Parse ARRAY as a flat JSON array of numbers."
- (vconcat
- (mapcar 'string-to-number (split-string (substring array 1 -1) ","))))
+ (let ((braceless (substring (string-trim array) 1 -1)))
+ (cond
+ ((> (length braceless) 0)
+ (vconcat
+ (mapcar 'string-to-number (split-string braceless ","))))
+ (t
+ (vector)))))
(defvar-local context-coloring-scopifier-process nil
"The single scopifier process that can be running.")
- [elpa] master updated (510f0ff -> 8a083d5), Jackson Ray Hamilton, 2015/05/05
- [elpa] master f9a6dce 03/28: Coveralls, Jackson Ray Hamilton, 2015/05/05
- [elpa] master 7a9bd8d 07/28: Add async mode startup test., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 2efebc8 10/28: Don't colorize if there are parse errors., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 30f9b0a 02/28: Update Cask file., Jackson Ray Hamilton, 2015/05/05
- [elpa] master fd5b9e1 05/28: Add tests for versions and disabling., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 85ff3ef 13/28: Trailing whitespace, empty arrays, empty strings.,
Jackson Ray Hamilton <=
- [elpa] master f11f97f 09/28: Make default colors more like font-lock's., Jackson Ray Hamilton, 2015/05/05
- [elpa] master a7f5970 04/28: Remove unused function., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 9873030 08/28: Use real keywords., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 0888e06 01/28: Use Cask and Coveralls., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 202ca74 15/28: Drop `subr-x' dependency., Jackson Ray Hamilton, 2015/05/05
- [elpa] master dd3fe3c 06/28: Fix badges., Jackson Ray Hamilton, 2015/05/05
- [elpa] master fb53884 17/28: Update README., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 52da59c 18/28: Bust cache., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 3f63fab 11/28: Add local coverage configuration., Jackson Ray Hamilton, 2015/05/05
- [elpa] master 158fd83 16/28: Test the trimming function., Jackson Ray Hamilton, 2015/05/05