Fix replacing Python constants in arrays

sbliven · Feb 16, 2020 · 582645d · 582645d
1 parent 30fcdf5
commit 582645d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/js/util.js b/src/js/util.js
@@ -179,7 +179,9 @@ export function repair (jsString) {
       c = curr()
     }
 
-    if (specialValues.indexOf(key) === -1) {
+    if (key in pythonConstants) {
+      return pythonConstants[key]
+    } else if (specialValues.indexOf(key) === -1) {
       return '"' + key + '"'
     } else {
       return key
@@ -268,6 +270,7 @@ export function repair (jsString) {
       i++
     } else if (/[a-zA-Z_$]/.test(c) && ['{', ','].indexOf(lastNonWhitespace()) !== -1) {
       // an unquoted object key (like a in '{a:2}')
+      // FIXME: array values are also parsed via parseKey, work this out properly
       chars.push(parseKey())
     } else if (/\w/.test(c)) {
       chars.push(parseValue())

diff --git a/test/util.test.js b/test/util.test.js
@@ -141,12 +141,14 @@ describe('util', () => {
         '  "null": None,\n' +
         '  "true": True,\n' +
         '  "false": False\n' +
+        '  "array": [1, foo, None, True, False]\n' +
         '}'
 
       const expectedJson = '{\n' +
         '  "null": null,\n' +
         '  "true": true,\n' +
         '  "false": false\n' +
+        '  "array": [1, "foo", null, true, false]\n' +
         '}'
 
       assert.strictEqual(repair(pythonDocument), expectedJson)