Use global using and add implicit global usings

hedge-dev · Nov 25, 2023 · 5b960f2 · 5b960f2
1 parent f433153
commit 5b960f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/Source/Libraries/HedgeModManager.CodeCompiler/CSharpCode.cs b/Source/Libraries/HedgeModManager.CodeCompiler/CSharpCode.cs
@@ -258,7 +258,7 @@ public CompilationUnitSyntax CreateCompilationUnit(IIncludeResolver? includeReso
         // No processing for naked codes
         if (Naked)
         {
-            unit = AddImports(unit.AddUsings(CodeProvider.PredefinedUsingDirectives));
+            unit = AddImports(unit);
 
             return unit;
         }
@@ -400,8 +400,7 @@ public CompilationUnitSyntax CreateCompilationUnit(IIncludeResolver? includeReso
 
         var compileUnit = SyntaxFactory.CompilationUnit()
             .AddMembers(MakeRootMember())
-            .WithUsings(unit.Usings)
-            .AddUsings(CodeProvider.PredefinedUsingDirectives);
+            .WithUsings(unit.Usings);
 
         compileUnit = AddImports(compileUnit);
         return compileUnit;

diff --git a/Source/Libraries/HedgeModManager.CodeCompiler/CodeProvider.cs b/Source/Libraries/HedgeModManager.CodeCompiler/CodeProvider.cs
@@ -17,16 +17,6 @@ public class CodeProvider
         SyntaxFactory.MethodDeclaration(SyntaxFactory.PredefinedType(SyntaxFactory.Token(SyntaxKind.BoolKeyword)), "IsLoaderExecutable")
             .WithExpressionBody(SyntaxFactory.ArrowExpressionClause(SyntaxFactory.LiteralExpression(SyntaxKind.TrueLiteralExpression)))
             .WithModifiers(SyntaxFactory.TokenList(SyntaxFactory.Token(SyntaxKind.PublicKeyword), SyntaxFactory.Token(SyntaxKind.StaticKeyword)));
-
-    public static UsingDirectiveSyntax[] PredefinedUsingDirectives =
-    {
-        SyntaxFactory.UsingDirective(SyntaxFactory.IdentifierName("System")),
-        SyntaxFactory.UsingDirective(SyntaxFactory.IdentifierName("HMMCodes")),
-        SyntaxFactory.UsingDirective(
-            SyntaxFactory.Token(SyntaxKind.UsingKeyword),
-            SyntaxFactory.Token(SyntaxKind.StaticKeyword), null,
-            SyntaxFactory.QualifiedName(SyntaxFactory.IdentifierName("HMMCodes"), SyntaxFactory.IdentifierName("MemoryService")), SyntaxFactory.Token(SyntaxKind.SemicolonToken)),
-    };
 
     public static SyntaxTree[] PredefinedClasses =
     {

diff --git a/Source/Libraries/HedgeModManager.CodeCompiler/Resources/MemoryService.cs b/Source/Libraries/HedgeModManager.CodeCompiler/Resources/MemoryService.cs
@@ -1,5 +1,14 @@
 #pragma warning disable
 
+global using global::System;
+global using global::System.Collections.Generic;
+global using global::System.IO;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;
+global using global::HMMCodes;
+global using static global::HMMCodes.MemoryService;
+
 using System;
 using System.Collections.Generic;
 using System.Linq;