Filter out the text key from AST nodes when comparing them.

Author: Danny Weinberg

tests/python_expressions/__snapshots__/jsfmt.spec.js.snap

@@ -392,12 +392,10 @@ a ** 2 ** 2
 a.b[0] ** 2
 a.b[0].read()[1][2].foo().spam()[0].bar ** 2
 l[start:end] = l2
-
 # l[::] = l2
 # a = \`s\`
 # a = \`1 + 2 + f(3, 4)\`
 [a, b] = c
-
 # (a, b) = c
 [a, (b, c), d] = e
 a, (b, c), d = e
@@ -407,7 +405,6 @@ a, (b, c), d = e
 
 l = func()
 l = func(10)
-
 # l = func(10, 12, a, b=c, *args)
 # l = func(10, 12, a, b=c, **kwargs)
 # l = func(10, 12, a, b=c, *args, **kwargs)
@@ -461,9 +458,9 @@ a is not b
 a in b
 a is b
 not a
+# We don't wrap this because it doesn't make sense with a 4-space indent.
 not my_long_variable_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 3 < x < 5
-
 # (3 < x) < 5
 a < b < c < d
 
@@ -477,30 +474,23 @@ c = d
 
 a.b = 2
 x = a.b
-
 # l[:]
 # l[::]
 l[1:2]
-
 # l[1:]
 l[:2]
-
 # l[1::]
 # l[:1:]
 l[::1]
-
 # l[1:2:]
 l[:1:2]
 l[1::2]
 l[0:1:2]
-
 # a.b.l[:]
 a.b.l[1:2]
-
 # a.b.l[1:]
 # a.b.l[:2]
 a.b.l[0:1:2]
-
 # a[1:2:3, 100]
 # a[:2:3, 100]
 # a[1::3, 100,]
@@ -532,7 +522,6 @@ from os import path, system
 
 from os import path, system
 from os import path as P, system as S
-
 # from os import (path as P, system as S,)
 from os import *
 
@@ -590,6 +579,7 @@ try:
 except NameError:
     pass
 
+
 # try:
 #     a
 #     b
@@ -674,6 +664,7 @@ def f(*args):
 def f(**kwargs):
     return 1
 
+
 # def f(t=()): pass
 # def f(a, b, (c, d), e): pass
 # def f(a, b, (c, (d, e), f, (g, h))): pass
@@ -711,6 +702,7 @@ def foo():
     """bar"""
     return a
 
+
 # def foo():
 #     """doc"""; print 1
 #     a=1

tests/python_strings/__snapshots__/jsfmt.spec.js.snap

@@ -81,12 +81,22 @@ a = "both 'single' and \\"double\\""
 a = u"unicode snowman: \\u26C4"
 a = r"this does not have a tab: \\t"
 
+# Bytes crash the astexport.py script
+# a = b"here's some bytes"
+
 a = """escaped triple quote \\''' in middle"""
 a = '''escaped triple quote """ in middle'''
 
 a = """other triple quote ''' in the middle"""
 a = '''other triple quote """ in the middle'''
 
+# The interior triple quotes don't get escaped properly
+# a = '''both triple quotes """ and \\''' in the middle'''
+# a = """both triple quotes ''' and \\""" in the middle"""
+
+# In the future these might be re-flowed, if that's a feature we want to
+# implement.
+
 foo('this should NOT be '
     'a multi-line string')
 
@@ -96,6 +106,10 @@ foo("this should NOT be "
 foo(r"this should NOT be \\t "
     r'a multi-line string \\n')
 
+# Bytes crash the astexport.py script
+#foo(bR"this should NOT be \\t "
+#    Br'a multi-line string \\n')
+
 foo("""this should remain as is """
     '''because it is really weird''')
 

tests_config/run_spec.js

@@ -81,32 +81,29 @@ function run_spec(dirname, parsers, options) {
 }
 global.run_spec = run_spec;
 
-function stripLocation(ast) {
+/**
+ * This gets rid of extra keys not removed by the massageAST function which are not suitable or relevant when
+ * comparing two different ASTs.
+ */
+function stripExtraNonComparableKeys(ast) {
   if (Array.isArray(ast)) {
-    return ast.map(e => stripLocation(e));
+    return ast.map(e => stripExtraNonComparableKeys(e));
   }
   if (typeof ast === "object") {
     const newObj = {};
     for (const key in ast) {
-      if (
-        key === "loc" ||
-        key === "range" ||
-        key === "raw" ||
-        key === "comments" ||
-        key === "parent" ||
-        key === "prev"
-      ) {
+      if (key === "text") {
         continue;
       }
-      newObj[key] = stripLocation(ast[key]);
+      newObj[key] = stripExtraNonComparableKeys(ast[key]);
     }
     return newObj;
   }
   return ast;
 }
 
 function parse(string, opts) {
-  return stripLocation(prettier.__debug.parse(string, opts));
+  return stripExtraNonComparableKeys(prettier.__debug.parse(string, opts));
 }
 
 function prettyprint(src, filename, options) {