From e399794562179c9c3b256ec1f085e0e16058921c Mon Sep 17 00:00:00 2001
From: JohnnyMorganz <johnnymorganz@outlook.com>
Date: Fri, 14 Apr 2023 18:03:48 +0100
Subject: [PATCH] Fix + json encoder

---
 Analysis/src/AstJsonEncoder.cpp |  3 +++
 Analysis/src/TypeAttach.cpp     | 40 +++++++++++++++++----------------
 Ast/include/Luau/Ast.h          |  4 ++--
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/Analysis/src/AstJsonEncoder.cpp b/Analysis/src/AstJsonEncoder.cpp
index 57c8c90b..a964c785 100644
--- a/Analysis/src/AstJsonEncoder.cpp
+++ b/Analysis/src/AstJsonEncoder.cpp
@@ -776,7 +776,10 @@ struct AstJsonEncoder : public AstVisitor
         writeNode(node, "AstTypeReference", [&]() {
             if (node->prefix)
                 PROP(prefix);
+            if (node->prefixLocation)
+                write("prefixLocation", *node->prefixLocation);
             PROP(name);
+            PROP(nameLocation);
             PROP(parameters);
         });
     }
diff --git a/Analysis/src/TypeAttach.cpp b/Analysis/src/TypeAttach.cpp
index d6494edf..715a8322 100644
--- a/Analysis/src/TypeAttach.cpp
+++ b/Analysis/src/TypeAttach.cpp
@@ -94,15 +94,15 @@ public:
         switch (ptv.type)
         {
         case PrimitiveType::NilType:
-            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("nil"));
+            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("nil"), std::nullopt, Location());
         case PrimitiveType::Boolean:
-            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("boolean"));
+            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("boolean"), std::nullopt, Location());
         case PrimitiveType::Number:
-            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("number"));
+            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("number"), std::nullopt, Location());
         case PrimitiveType::String:
-            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("string"));
+            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("string"), std::nullopt, Location());
         case PrimitiveType::Thread:
-            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("thread"));
+            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("thread"), std::nullopt, Location());
         default:
             return nullptr;
         }
@@ -110,12 +110,12 @@ public:
 
     AstType* operator()(const BlockedType& btv)
     {
-        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("*blocked*"));
+        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("*blocked*"), std::nullopt, Location());
     }
 
     AstType* operator()(const PendingExpansionType& petv)
     {
-        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("*pending-expansion*"));
+        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("*pending-expansion*"), std::nullopt, Location());
     }
 
     AstType* operator()(const SingletonType& stv)
@@ -135,7 +135,7 @@ public:
 
     AstType* operator()(const AnyType&)
     {
-        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("any"));
+        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("any"), std::nullopt, Location());
     }
     AstType* operator()(const TableType& ttv)
     {
@@ -157,15 +157,16 @@ public:
                 parameters.data[i] = {{}, rehydrate(ttv.instantiatedTypePackParams[i])};
             }
 
-            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName(ttv.name->c_str()), parameters.size != 0, parameters);
+            return allocator->alloc<AstTypeReference>(
+                Location(), std::nullopt, AstName(ttv.name->c_str()), std::nullopt, Location(), parameters.size != 0, parameters);
         }
 
         if (hasSeen(&ttv))
         {
             if (ttv.name)
-                return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName(ttv.name->c_str()));
+                return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName(ttv.name->c_str()), std::nullopt, Location());
             else
-                return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("<Cycle>"));
+                return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("<Cycle>"), std::nullopt, Location());
         }
 
         AstArray<AstTableProp> props;
@@ -208,7 +209,7 @@ public:
         char* name = allocateString(*allocator, ctv.name);
 
         if (!options.expandClassProps || hasSeen(&ctv) || count > 1)
-            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName{name});
+            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName{name}, std::nullopt, Location());
 
         AstArray<AstTableProp> props;
         props.size = ctv.props.size();
@@ -233,7 +234,7 @@ public:
         RecursionCounter counter(&count);
 
         if (hasSeen(&ftv))
-            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("<Cycle>"));
+            return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("<Cycle>"), std::nullopt, Location());
 
         AstArray<AstGenericType> generics;
         generics.size = ftv.generics.size();
@@ -304,11 +305,12 @@ public:
     }
     AstType* operator()(const Unifiable::Error&)
     {
-        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("Unifiable<Error>"));
+        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("Unifiable<Error>"), std::nullopt, Location());
     }
     AstType* operator()(const GenericType& gtv)
     {
-        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName(getName(allocator, syntheticNames, gtv)));
+        return allocator->alloc<AstTypeReference>(
+            Location(), std::nullopt, AstName(getName(allocator, syntheticNames, gtv)), std::nullopt, Location());
     }
     AstType* operator()(const Unifiable::Bound<TypeId>& bound)
     {
@@ -316,7 +318,7 @@ public:
     }
     AstType* operator()(const FreeType& ftv)
     {
-        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("free"));
+        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("free"), std::nullopt, Location());
     }
     AstType* operator()(const UnionType& uv)
     {
@@ -342,15 +344,15 @@ public:
     }
     AstType* operator()(const LazyType& ltv)
     {
-        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("<Lazy?>"));
+        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName("<Lazy?>"), std::nullopt, Location());
     }
     AstType* operator()(const UnknownType& ttv)
     {
-        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName{"unknown"});
+        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName{"unknown"}, std::nullopt, Location());
     }
     AstType* operator()(const NeverType& ttv)
     {
-        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName{"never"});
+        return allocator->alloc<AstTypeReference>(Location(), std::nullopt, AstName{"never"}, std::nullopt, Location());
     }
     AstType* operator()(const NegationType& ntv)
     {
diff --git a/Ast/include/Luau/Ast.h b/Ast/include/Luau/Ast.h
index 7f80ef37..20158e8e 100644
--- a/Ast/include/Luau/Ast.h
+++ b/Ast/include/Luau/Ast.h
@@ -848,10 +848,10 @@ public:
 
     bool hasParameterList;
     std::optional<AstName> prefix;
-    AstName name;
-    AstArray<AstTypeOrPack> parameters;
     std::optional<Location> prefixLocation;
+    AstName name;
     Location nameLocation;
+    AstArray<AstTypeOrPack> parameters;
 };
 
 struct AstTableProp