Tweak quote finder regex to fix #138.

bhollis · Jan 8, 2017 · de15259 · de15259
1 parent a92f048
commit de15259
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+JSONView 1.2.1
+---
+* Fixed a case where JSON would fail to parse if a string contains a number and the JSON isn't indented.
+
 JSONView 1.2.0
 ---
 * Add a preference to use the built-in Firefox JSON viewer.

diff --git a/lib/jsonview.js b/lib/jsonview.js
@@ -97,7 +97,7 @@ var JSONView = Class({
 
     // Find unescaped quotes by searching for a non-backslash followed by 0 or even
     // pairs of backslashes, then a quote
-    var quoteFinder = /([^\\]|^)(\\\\)*(?=")/gm;
+    var quoteFinder = /[^\\\n\r]*?(\\\\)*"/gm;
 
     // This has some memory of what its last state was
     var wasInQuotes = false;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "id": "[email protected]",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "name": "jsonview",
   "title": "JSONView",
   "description": "View JSON documents in the browser.",

diff --git a/tests/issue138.json b/tests/issue138.json
@@ -0,0 +1,3 @@
+{
+"i18n":"label"
+}
diff --git a/tests/issue21b.json b/tests/issue21b.json
@@ -0,0 +1,6 @@
+{
+    "tags": [
+      ""
+    ],
+    "id-shouldEndWith664": 336541846568177664
+  }
diff --git a/tests/issue21c.json b/tests/issue21c.json
@@ -0,0 +1,3 @@
+{
+"":"18"
+}
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    {
+    "":"18"
+    }