fix #492

yanghuan · Jan 23, 2024 · d20d217 · d20d217
1 parent f621a92
commit d20d217
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/CSharp.lua/LuaAst/LuaIdentifierNameSyntax.cs b/CSharp.lua/LuaAst/LuaIdentifierNameSyntax.cs
@@ -196,4 +196,12 @@ internal override void Render(LuaRenderer renderer) {
       NameExpression.Render(renderer);
     }
   }
+
+  public sealed class LuaImportNameSyntax : LuaIdentifierNameSyntax {
+    public string TypeName { get; }
+
+    public LuaImportNameSyntax(string shorName, string name) : base(shorName) {
+      TypeName = name;
+    }
+  }
 }
diff --git a/CSharp.lua/LuaSyntaxGenerator.cs b/CSharp.lua/LuaSyntaxGenerator.cs
@@ -2131,7 +2131,10 @@ internal LuaIdentifierNameSyntax GetTypeShortName(ISymbol symbol, LuaSyntaxNodeT
             name = LuaIdentifierNameSyntax.Global.ValueText + '.' + name;
           }
         } else {
-          transform.ImportTypeName(ref name, (INamedTypeSymbol)symbol);
+          var newImportName = transform.ImportTypeName(name, (INamedTypeSymbol)symbol);
+          if (newImportName != null) {
+            return newImportName;
+          }
         }
       }
       return name;

diff --git a/CSharp.lua/LuaSyntaxNodeTransform.Helper.cs b/CSharp.lua/LuaSyntaxNodeTransform.Helper.cs
@@ -994,7 +994,7 @@ private bool AddImport(string prefix, string newPrefix, bool isFromCode) {
       return true;
     }
 
-    internal void ImportTypeName(ref string name, INamedTypeSymbol symbol) {
+    internal LuaIdentifierNameSyntax ImportTypeName(string name, INamedTypeSymbol symbol) {
       if (IsImportTypeNameEnable(symbol)) {
         int pos = name.LastIndexOf('.');
         if (pos != -1) {
@@ -1005,12 +1005,14 @@ internal void ImportTypeName(ref string name, INamedTypeSymbol symbol) {
             if (!IsLocalVarExistsInCurMethod(newPrefix)) {
               bool success = AddImport(prefix, newPrefix, symbol.IsFromCode());
               if (success) {
-                name = newPrefix + name[pos..];
+                string newName = newPrefix + name[pos..];
+                return new LuaImportNameSyntax(newName, name);
               }
             }
           }
         }
       }
+      return null;
     }
 
     internal bool AddGenericImport(LuaInvocationExpressionSyntax invocationExpression, string name, List<string> argumentTypeNames, bool isFromCode) {
@@ -1078,14 +1080,14 @@ private void CheckGenericDeclareTypeArgument(GenericUsingDeclare declare, LuaInv
           foreach (var typeArgument in nameTypeSymbol.TypeArguments) {
             if (typeArgument.Kind != SymbolKind.TypeParameter && typeArgument.IsFromCode()) {
               var argumentExpression = invocation.ArgumentList.Arguments[i];
-              if (argumentExpression is LuaIdentifierNameSyntax identifier) {
+              if (argumentExpression is LuaImportNameSyntax identifier) {
                 string name = identifier.ValueText;
                 int j = name.IndexOf('.');
                 if (j != -1) {
                   name = name.Substring(0, j);
                 }
                 if (!CurTypeDeclaration.TypeDeclaration.IsGenericImportExists(name)) {
-                  invocation.ArgumentList.Arguments[i] = LuaIdentifierNameSyntax.Global.MemberAccess(argumentExpression);
+                  invocation.ArgumentList.Arguments[i] = LuaIdentifierNameSyntax.Global.MemberAccess(identifier.TypeName);
                   declare.IsFromGlobal = true;
                 }
               }