fix ValueType PropertyField not __clone__

Author: yanghuan

CSharp.lua/LuaSyntaxNodeTransform.Helper.cs

@@ -1116,81 +1116,91 @@ private static IParameterSymbol GetParameterSymbol(IMethodSymbol symbol, Argumen
       return parameter;
     }
 
-    private void CheckValueTypeClone(ITypeSymbol typeSymbol, IdentifierNameSyntax node, ref LuaExpressionSyntax expression) {
-      if (typeSymbol.IsCustomValueType() /*&& !typeSymbol.IsNullableType()*/ && !generator_.IsReadOnlyStruct(typeSymbol)) {
+    private void CheckValueTypeClone(ITypeSymbol typeSymbol, IdentifierNameSyntax node, ref LuaExpressionSyntax expression, bool isPropertyField = false) {
+      if (typeSymbol.IsCustomValueType() && !generator_.IsReadOnlyStruct(typeSymbol)) {
         bool need = false;
-        switch (node.Parent.Kind()) {
-          case SyntaxKind.Argument: {
-            var argument = (ArgumentSyntax)node.Parent;
-            switch (argument.RefKindKeyword.Kind()) {
-              case SyntaxKind.RefKeyword:
-              case SyntaxKind.OutKeyword:
-              case SyntaxKind.InKeyword: {
-                return;
-              }
-            }
-
-            var symbol = (IMethodSymbol)semanticModel_.GetSymbolInfo(argument.Parent.Parent).Symbol;
-            if (symbol != null) {
-              if (symbol.IsFromAssembly() && !symbol.ContainingType.IsCollectionType()) {
-                break;
-              }
-
-              var parameter = GetParameterSymbol(symbol, argument);
-              if (parameter.RefKind == RefKind.In) {
-                break;
-              }
+        if (isPropertyField) {
+          need = true;
+          if (node.Parent.IsKind(SyntaxKind.SimpleAssignmentExpression)) {
+            var assignment = (AssignmentExpressionSyntax)node.Parent;
+            if (assignment.Left == node) {
+              need = false;
             }
-
-            need = true;
-            break;
-          }
-          case SyntaxKind.ReturnStatement: {
-            need = true;
-            break;
           }
-          case SyntaxKind.SimpleAssignmentExpression: {
-            var assignment = (AssignmentExpressionSyntax)node.Parent;
-            if (assignment.Right == node) {
-              var symbol = semanticModel_.GetSymbolInfo(assignment.Left).Symbol;
-              if (symbol != null && symbol.IsFromAssembly()) {
-                break;
+        } else {
+          switch (node.Parent.Kind()) {
+            case SyntaxKind.Argument: {
+              var argument = (ArgumentSyntax)node.Parent;
+              switch (argument.RefKindKeyword.Kind()) {
+                case SyntaxKind.RefKeyword:
+                case SyntaxKind.OutKeyword:
+                case SyntaxKind.InKeyword: {
+                  return;
+                }
               }
 
-              if (assignment.Left.Kind().IsTupleDeclaration()) {
-                break;
+              var symbol = (IMethodSymbol)semanticModel_.GetSymbolInfo(argument.Parent.Parent).Symbol;
+              if (symbol != null) {
+                if (symbol.IsFromAssembly() && !symbol.ContainingType.IsCollectionType()) {
+                  break;
+                }
+
+                var parameter = GetParameterSymbol(symbol, argument);
+                if (parameter.RefKind == RefKind.In) {
+                  break;
+                }
               }
 
               need = true;
+              break;
             }
-            break;
-          }
-          case SyntaxKind.EqualsValueClause: {
-            var equalsValueClause = (EqualsValueClauseSyntax)node.Parent;
-            if (equalsValueClause.Value == node) {
+            case SyntaxKind.ReturnStatement: {
               need = true;
+              break;
             }
-            break;
-          }
-          case SyntaxKind.SimpleMemberAccessExpression: {
-            var memberAccess = (MemberAccessExpressionSyntax)node.Parent;
-            if (memberAccess.Name == node) {
-              switch (memberAccess.Parent.Kind()) {
-                case SyntaxKind.EqualsValueClause: {
-                  need = true;
+            case SyntaxKind.SimpleAssignmentExpression: {
+              var assignment = (AssignmentExpressionSyntax)node.Parent;
+              if (assignment.Right == node) {
+                var symbol = semanticModel_.GetSymbolInfo(assignment.Left).Symbol;
+                if (symbol != null && symbol.IsFromAssembly()) {
                   break;
                 }
 
-                case SyntaxKind.SimpleAssignmentExpression: {
-                  var assignment = (AssignmentExpressionSyntax)memberAccess.Parent;
-                  if (assignment.Right == memberAccess) {
+                if (assignment.Left.Kind().IsTupleDeclaration()) {
+                  break;
+                }
+
+                need = true;
+              }
+              break;
+            }
+            case SyntaxKind.EqualsValueClause: {
+              var equalsValueClause = (EqualsValueClauseSyntax)node.Parent;
+              if (equalsValueClause.Value == node) {
+                need = true;
+              }
+              break;
+            }
+            case SyntaxKind.SimpleMemberAccessExpression: {
+              var memberAccess = (MemberAccessExpressionSyntax)node.Parent;
+              if (memberAccess.Name == node) {
+                switch (memberAccess.Parent.Kind()) {
+                  case SyntaxKind.EqualsValueClause: {
                     need = true;
+                    break;
+                  }
+
+                  case SyntaxKind.SimpleAssignmentExpression: {
+                    var assignment = (AssignmentExpressionSyntax)memberAccess.Parent;
+                    if (assignment.Right == memberAccess) {
+                      need = true;
+                    }
+                    break;
                   }
-                  break;
                 }
               }
+              break;
             }
-            break;
           }
         }
 

CSharp.lua/LuaSyntaxNodeTransform.cs

@@ -2393,8 +2393,8 @@ private bool IsEventAddOrRemoveIdentifierName(IdentifierNameSyntax node) {
       return false;
     }
 
-    private LuaExpressionSyntax VisitPropertyOrEventIdentifierName(IdentifierNameSyntax node, ISymbol symbol, bool isProperty) {
-      bool isField, isReadOnly;
+    private LuaExpressionSyntax VisitPropertyOrEventIdentifierName(IdentifierNameSyntax node, ISymbol symbol, bool isProperty, out bool isField) {
+      bool isReadOnly;
       if (isProperty) {
         var propertySymbol = (IPropertySymbol)symbol;
         isField = IsPropertyField(propertySymbol);
@@ -2793,11 +2793,15 @@ LuaIdentifierNameSyntax GetSampleName(ISymbol nodeSymbol) {
           break;
         }
         case SymbolKind.Property: {
-          identifier = VisitPropertyOrEventIdentifierName(node, symbol, true);
+          var propertyField = (IPropertySymbol)symbol;
+          identifier = VisitPropertyOrEventIdentifierName(node, propertyField, true, out bool isField);
+          if (isField) {
+            CheckValueTypeClone(propertyField.Type, node, ref identifier, true);
+          }
           break;
         }
         case SymbolKind.Event: {
-          identifier = VisitPropertyOrEventIdentifierName(node, symbol, false);
+          identifier = VisitPropertyOrEventIdentifierName(node, symbol, false, out _);
           break;
         }
         case SymbolKind.Discard: {