From 8496af790795b5ab054b44f2d2991037ef5eadcf Mon Sep 17 00:00:00 2001
From: Kampfkarren <boynedmaster@gmail.com>
Date: Tue, 26 Jul 2022 21:23:19 -0700
Subject: [PATCH] JsonEncoder

---
 Analysis/src/JsonEncoder.cpp | 18 ++++++++++++++++--
 tests/JsonEncoder.test.cpp   |  9 +++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/Analysis/src/JsonEncoder.cpp b/Analysis/src/JsonEncoder.cpp
index 550c9b59..7239a074 100644
--- a/Analysis/src/JsonEncoder.cpp
+++ b/Analysis/src/JsonEncoder.cpp
@@ -445,6 +445,14 @@ struct AstJsonEncoder : public AstVisitor
         });
     }
 
+    void write(class AstExprInterpString* node)
+    {
+        writeNode(node, "AstExprInterpString", [&]() {
+            PROP(strings);
+            PROP(expressions);
+        });
+    }
+
     void write(class AstExprTable* node)
     {
         writeNode(node, "AstExprTable", [&]() {
@@ -773,7 +781,7 @@ struct AstJsonEncoder : public AstVisitor
             PROP(indexer);
         });
     }
-    
+
     void write(struct AstTableIndexer* indexer)
     {
         if (indexer)
@@ -888,6 +896,12 @@ struct AstJsonEncoder : public AstVisitor
         return false;
     }
 
+    bool visit(class AstExprInterpString* node) override
+    {
+        write(node);
+        return false;
+    }
+
     bool visit(class AstExprLocal* node) override
     {
         write(node);
@@ -1178,7 +1192,7 @@ struct AstJsonEncoder : public AstVisitor
             write("location", comment.location);
             popComma(c);
             writeRaw("}");
-            
+
         }
     }
 };
diff --git a/tests/JsonEncoder.test.cpp b/tests/JsonEncoder.test.cpp
index b16ad3e2..f5595f27 100644
--- a/tests/JsonEncoder.test.cpp
+++ b/tests/JsonEncoder.test.cpp
@@ -175,6 +175,15 @@ TEST_CASE_FIXTURE(JsonEncoderFixture, "encode_AstExprIfThen")
     CHECK(toJson(statement) == expected);
 }
 
+TEST_CASE_FIXTURE(JsonEncoderFixture, "encode_AstExprInterpString")
+{
+    AstStat* statement = expectParseStatement("local a = `var = {x}`");
+
+    std::string_view expected =
+        R"({"type":"AstStatLocal","location":"0,0 - 0,21","vars":[{"luauType":null,"name":"a","type":"AstLocal","location":"0,6 - 0,7"}],"values":[{"type":"AstExprInterpString","location":"0,20 - 0,21","strings":["var = ",""],"expressions":[{"type":"AstExprGlobal","location":"0,18 - 0,19","global":"x"}]}]})";
+
+    CHECK(toJson(statement) == expected);
+}
 
 TEST_CASE("encode_AstExprLocal")
 {