collapse one more level of indirection for string interpolation nodes

Signed-off-by: Denys Smirnov <[email protected]>
bblfsh · Feb 5, 2019 · 7fb8508 · 7fb8508
1 parent 4b674c5
commit 7fb8508
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 360 deletions.
diff --git a/driver/normalizer/normalizer.go b/driver/normalizer/normalizer.go
@@ -507,6 +507,23 @@ var Normalizers = []Mapping{
 		},
 	)),
 
+	// Collapse one more AST level if the string token is inside InterpolatedStringText.
+	MapSemantic("InterpolatedStringText", uast.String{}, MapObj(
+		Obj{
+			"TextToken": Obj{
+				uast.KeyType: String(uast.TypeOf(uast.String{})),
+				uast.KeyPos:  Any(),
+				"Format":     String(""),
+				"Value":      Var("val"),
+			},
+			"IsMissing":          Bool(false),
+			"IsStructuredTrivia": Bool(false),
+		},
+		Obj{
+			"Value": Var("val"),
+		},
+	)),
+
 	MapSemantic("TrueLiteralExpression", uast.Bool{}, MapObj(
 		Obj{
 			"Token": Obj{

diff --git a/fixtures/issue_18.cs.sem.uast b/fixtures/issue_18.cs.sem.uast
@@ -2112,8 +2112,7 @@
                                                                      },
                                                                   },
                                                                   Contents: [
-                                                                     { '@type': "csharp:InterpolatedStringText",
-                                                                        '@role': [Incomplete, Literal, String],
+                                                                     { '@type': "uast:String",
                                                                         '@pos': { '@type': "uast:Positions",
                                                                            start: { '@type': "uast:Position",
                                                                               offset: 2124,
@@ -2126,24 +2125,8 @@
                                                                               col: 28,
                                                                            },
                                                                         },
-                                                                        IsMissing: false,
-                                                                        IsStructuredTrivia: false,
-                                                                        TextToken: { '@type': "uast:String",
-                                                                           '@pos': { '@type': "uast:Positions",
-                                                                              start: { '@type': "uast:Position",
-                                                                                 offset: 2124,
-                                                                                 line: 52,
-                                                                                 col: 25,
-                                                                              },
-                                                                              end: { '@type': "uast:Position",
-                                                                                 offset: 2127,
-                                                                                 line: 52,
-                                                                                 col: 28,
-                                                                              },
-                                                                           },
-                                                                           Format: "",
-                                                                           Value: "\"[",
-                                                                        },
+                                                                        Format: "",
+                                                                        Value: "\"[",
                                                                      },
                                                                      { '@type': "csharp:Interpolation",
                                                                         '@role': [Expression, Incomplete, Value],
@@ -2221,8 +2204,7 @@
                                                                            ValueText: "{",
                                                                         },
                                                                      },
-                                                                     { '@type': "csharp:InterpolatedStringText",
-                                                                        '@role': [Incomplete, Literal, String],
+                                                                     { '@type': "uast:String",
                                                                         '@pos': { '@type': "uast:Positions",
                                                                            start: { '@type': "uast:Position",
                                                                               offset: 2133,
@@ -2235,24 +2217,8 @@
                                                                               col: 37,
                                                                            },
                                                                         },
-                                                                        IsMissing: false,
-                                                                        IsStructuredTrivia: false,
-                                                                        TextToken: { '@type': "uast:String",
-                                                                           '@pos': { '@type': "uast:Positions",
-                                                                              start: { '@type': "uast:Position",
-                                                                                 offset: 2133,
-                                                                                 line: 52,
-                                                                                 col: 34,
-                                                                              },
-                                                                              end: { '@type': "uast:Position",
-                                                                                 offset: 2136,
-                                                                                 line: 52,
-                                                                                 col: 37,
-                                                                              },
-                                                                           },
-                                                                           Format: "",
-                                                                           Value: "]\"",
-                                                                        },
+                                                                        Format: "",
+                                                                        Value: "]\"",
                                                                      },
                                                                   ],
                                                                   IsMissing: false,