Added support for property default values.

Updated Microsoft.CodeAnalysis.CSharp to 4.10.0.

Author: TiLied

CSharpToJavaScript/CSharpToJavaScript.csproj

@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
   </ItemGroup>
 
   <ItemGroup>

CSharpToJavaScript/Walker.cs

@@ -1014,7 +1014,11 @@ public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node)
 		{
 			ChildSyntaxList nodesAndTokens = node.ChildNodesAndTokens();
 
-			for (int i = 0; i < nodesAndTokens.Count; i++)
+			FieldDeclarationSyntax? field = null;
+			bool hasDefault = false;
+			EqualsValueClauseSyntax? defaultValue = null;
+
+			for (int i = nodesAndTokens.Count - 1; i >= 0; i--)
 			{
 				SyntaxNode? asNode = nodesAndTokens[i].AsNode();
 
@@ -1033,8 +1037,6 @@ where n.IsNode
 																 where n.AsNode().IsKind(SyntaxKind.PredefinedType)
 																 select n;
 
-							FieldDeclarationSyntax? field = null;
-
 							string _indentifier = "_" + nodesAndTokens[i - 1].AsToken().ToString() + "_";
 
 							if (!_PropertyStatic)
@@ -1063,8 +1065,52 @@ where n.AsNode().IsKind(SyntaxKind.NullableType)
 										  select n;
 								}
 
-								field = SyntaxFactory.FieldDeclaration(
-							   SyntaxFactory.VariableDeclaration(SyntaxFactory.IdentifierName(key.First().ToString()))
+
+								//
+								//
+								//TODO! change this mess!
+								if (hasDefault)
+								{
+									field = SyntaxFactory.FieldDeclaration(
+								   SyntaxFactory.VariableDeclaration(SyntaxFactory.IdentifierName(key.First().ToString()))
+								.WithVariables(
+									   SyntaxFactory.SingletonSeparatedList(
+										   SyntaxFactory.VariableDeclarator(
+											   SyntaxFactory.Identifier(_indentifier))
+											.WithInitializer(defaultValue))))
+							   .WithModifiers(
+								   SyntaxFactory.TokenList(new[]
+								   {
+									SyntaxFactory.Token(SyntaxKind.PrivateKeyword)
+								   }))
+							   .WithLeadingTrivia(node.GetLeadingTrivia())
+								.WithTrailingTrivia(node.GetTrailingTrivia());
+								}
+								else
+								{
+									field = SyntaxFactory.FieldDeclaration(
+								   SyntaxFactory.VariableDeclaration(SyntaxFactory.IdentifierName(key.First().ToString()))
+								.WithVariables(
+									   SyntaxFactory.SingletonSeparatedList(
+										   SyntaxFactory.VariableDeclarator(
+											   SyntaxFactory.Identifier(_indentifier)))))
+							   .WithModifiers(
+								   SyntaxFactory.TokenList(new[]
+								   {
+									SyntaxFactory.Token(SyntaxKind.PrivateKeyword)
+								   }))
+							   .WithLeadingTrivia(node.GetLeadingTrivia())
+								.WithTrailingTrivia(node.GetTrailingTrivia());
+								}
+							}
+							else
+							{
+								key = key.First().ChildNodesAndTokens();
+								if (hasDefault)
+								{
+									field = SyntaxFactory.FieldDeclaration(
+							   SyntaxFactory.VariableDeclaration(
+								   SyntaxFactory.PredefinedType(SyntaxFactory.Token(key.First().Kind())))
 							.WithVariables(
 								   SyntaxFactory.SingletonSeparatedList(
 									   SyntaxFactory.VariableDeclarator(
@@ -1076,32 +1122,36 @@ where n.AsNode().IsKind(SyntaxKind.NullableType)
 							   }))
 						   .WithLeadingTrivia(node.GetLeadingTrivia())
 							.WithTrailingTrivia(node.GetTrailingTrivia());
-							}
-							else
-							{
-								key = key.First().ChildNodesAndTokens();
-								field = SyntaxFactory.FieldDeclaration(
+								}
+								else
+								{
+									field = SyntaxFactory.FieldDeclaration(
 							   SyntaxFactory.VariableDeclaration(
 								   SyntaxFactory.PredefinedType(SyntaxFactory.Token(key.First().Kind())))
 							.WithVariables(
 								   SyntaxFactory.SingletonSeparatedList(
 									   SyntaxFactory.VariableDeclarator(
-										   SyntaxFactory.Identifier(_indentifier)))))
+										   SyntaxFactory.Identifier(_indentifier))
+									   .WithInitializer(defaultValue))))
 						   .WithModifiers(
 							   SyntaxFactory.TokenList(new[]
 							   {
 									SyntaxFactory.Token(SyntaxKind.PrivateKeyword)
 							   }))
 						   .WithLeadingTrivia(node.GetLeadingTrivia())
 							.WithTrailingTrivia(node.GetTrailingTrivia());
+								}
 							}
-
-							VisitFieldDeclaration(field);
-							break;
 						}
 					}
+
+					if (kind == SyntaxKind.EqualsValueClause) 
+					{
+						hasDefault = true;
+						defaultValue = asNode as EqualsValueClauseSyntax;
+					}
 				}
-				else 
+				else
 				{
 					SyntaxToken asToken = nodesAndTokens[i].AsToken();
 					SyntaxKind kind = asToken.Kind();
@@ -1112,6 +1162,12 @@ where n.AsNode().IsKind(SyntaxKind.NullableType)
 
 			}
 
+			if(field != null)
+				VisitFieldDeclaration(field);
+
+
+
+			//main for loop for property
 			for (int i = 0; i < nodesAndTokens.Count; i++)
 			{
 				SyntaxNode? asNode = nodesAndTokens[i].AsNode();
@@ -1122,7 +1178,6 @@ where n.AsNode().IsKind(SyntaxKind.NullableType)
 
 					switch (kind)
 					{
-						//TODO "EqualsValueClause" default value
 						case SyntaxKind.EqualsValueClause:
 						case SyntaxKind.AttributeList:
 						case SyntaxKind.PredefinedType: