test: FileScopedNamespaceDeclaration -> NamespaceDeclaration transfor…

…mation
roblox-csharp · Jan 9, 2025 · 18aa107 · 18aa107
1 parent 8eeb217
commit 18aa107
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/RobloxCS.Luau/AstUtility.cs b/RobloxCS.Luau/AstUtility.cs
@@ -427,7 +427,7 @@ public static string FixIdentifierNameText(SyntaxNode node, string name, bool re
             name += '_';
 
         name += useCount;
-        return name;
+        return name.Replace("@", "");
     }
 
     public static TypeRef? CreateTypeRef(string? typePath)

diff --git a/RobloxCS.Tests/GenerationTest.cs b/RobloxCS.Tests/GenerationTest.cs
@@ -1,4 +1,3 @@
-using Microsoft.CodeAnalysis.CSharp;
 using RobloxCS.Luau;
 
 namespace RobloxCS.Tests;

diff --git a/RobloxCS.Tests/TransformerTests/MainTransformerTest.cs b/RobloxCS.Tests/TransformerTests/MainTransformerTest.cs
@@ -1,15 +1,25 @@
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace RobloxCS.Tests.TransformerTests;
 
 public class MainTransformerTest
 {
+    [Fact]
+    public void Transforms_FileScopedNamespaces()
+    {
+        var compilationUnit = Transform("namespace Abc;");
+        Assert.Single(compilationUnit.Members);
+        Assert.IsType<NamespaceDeclarationSyntax>(compilationUnit.Members.First());
+
+        var @namespace = (NamespaceDeclarationSyntax)compilationUnit.Members.First();
+        Assert.Equal("Abc", @namespace.Name.ToString());
+    }
+
     [Fact]
     public void AddsRobloxImports()
     {
-        var transformedTree = Transform("");
-        var compilationUnit = transformedTree.GetCompilationUnitRoot();
+        var compilationUnit = Transform("");
         Assert.Equal(2, compilationUnit.Usings.Count);
 
         var usingRoblox = compilationUnit.Usings.First();
@@ -21,11 +31,11 @@ public void AddsRobloxImports()
         Assert.Equal("Roblox.Globals", usingRobloxGlobals.Name?.ToString());
     }
 
-    private static SyntaxTree Transform(string source)
+    private static CompilationUnitSyntax Transform(string source)
     {
         var cleanTree = SyntaxFactory.ParseSyntaxTree(source);
         var transform = BuiltInTransformers.Main();
         var transformedTree = transform(cleanTree, new ConfigData());
-        return transformedTree;
+        return transformedTree.GetCompilationUnitRoot();
     }
 }
diff --git a/RobloxCS/Transformers/BaseTransformer.cs b/RobloxCS/Transformers/BaseTransformer.cs
@@ -19,9 +19,14 @@ protected static string GetName(SyntaxNode node) =>
     protected static bool HasSyntax(SyntaxTokenList tokens, SyntaxKind syntax) =>
         tokens.Any(token => token.IsKind(syntax));
 
-    protected static SyntaxToken CreateIdentifierToken(string text, string? valueText = null, SyntaxTriviaList? trivia = null)
+    protected static SyntaxToken CreateIdentifierToken(string text, string? valueText = null,
+        SyntaxTriviaList? leadingTrivia = null, SyntaxTriviaList? trailingTrivia = null)
     {
-        var triviaList = trivia ?? SyntaxFactory.TriviaList();
-        return SyntaxFactory.VerbatimIdentifier(triviaList, text, valueText ?? text, triviaList);
+        return SyntaxFactory.VerbatimIdentifier(
+            leadingTrivia ?? SyntaxFactory.TriviaList(),
+            text,
+            valueText ?? text,
+            trailingTrivia ?? SyntaxFactory.TriviaList()
+        );
     }
 }
diff --git a/RobloxCS/Transformers/MainTransformer.cs b/RobloxCS/Transformers/MainTransformer.cs
@@ -37,18 +37,6 @@ public sealed class MainTransformer(SyntaxTree tree, ConfigData config) : BaseTr
         return SyntaxFactory.IsPatternExpression(node.Left, pattern);
     }
 
-    // Transform `@` out of identifier names
-    public override SyntaxNode? VisitIdentifierName(IdentifierNameSyntax node)
-    {
-        var identifierText = node.Identifier.Text;
-        if (!identifierText.Contains('@') || identifierText == "var")
-            return base.VisitIdentifierName(node);
-
-        var fixedIdentifierText = identifierText.Replace("@", "");
-        var newToken = CreateIdentifierToken(fixedIdentifierText);
-        return base.VisitIdentifierName(node.WithIdentifier(newToken));
-    }
-
     // Fix conditional accesses so that they return the AST you expect them to
     public override SyntaxNode? VisitConditionalAccessExpression(ConditionalAccessExpressionSyntax node)
     {