Small bug fixes plus ignoring TypeArgument.

Author: TiLied

CSharpToJavaScript/Utils/StaticMethods.cs

@@ -12,7 +12,7 @@ internal static void Log(string message, [CallerFilePath] string? file = null, [
 			if (message.StartsWith("---"))
 				Console.ForegroundColor = ConsoleColor.Green;
 
-			if (message.StartsWith("ERROR"))
+			if (message.StartsWith("ERROR") || message.StartsWith("as"))
 				Console.ForegroundColor = ConsoleColor.Red;
 
 			if (message.StartsWith("WARNING"))

CSharpToJavaScript/Walker.cs

@@ -194,6 +194,15 @@ public override void VisitClassDeclaration(ClassDeclarationSyntax node)
 
 					switch (kind)
 					{
+						case SyntaxKind.TypeParameterList:
+							{
+								SyntaxTriviaList _syntaxTrivias = asNode.GetTrailingTrivia();
+								for (int _i = 0; _i < _syntaxTrivias.Count; _i++)
+								{
+									VisitTrivia(_syntaxTrivias[_i]);
+								}
+								break;
+							}
 						case SyntaxKind.BaseList:
 						case SyntaxKind.FieldDeclaration:
 						case SyntaxKind.ConstructorDeclaration:
@@ -1715,7 +1724,11 @@ where e.IsKind(SyntaxKind.IdentifierToken)
 
 									if (iSymbol.ContainingNamespace.ToString().Contains(_NameSpaceStr))
 									{
-										JSSB.Append($" {syntaxNode.ToString()}");
+										if (syntaxNode.IsKind(SyntaxKind.GenericName)) 
+										{
+											JSSB.Append($" {(syntaxNode as GenericNameSyntax).Identifier.ToString()}");
+										}else
+											JSSB.Append($" {syntaxNode.ToString()}");
 										break;
 									}
 
@@ -1778,6 +1791,46 @@ public override void VisitBaseExpression(BaseExpressionSyntax node)
 			}
 		}
 
+		public override void VisitTypeArgumentList(TypeArgumentListSyntax node)
+		{
+			ChildSyntaxList nodesAndTokens = node.ChildNodesAndTokens();
+
+			for (int i = 0; i < nodesAndTokens.Count; i++)
+			{
+				SyntaxNode? asNode = nodesAndTokens[i].AsNode();
+
+				if (asNode != null)
+				{
+					SyntaxKind kind = asNode.Kind();
+
+					switch (kind)
+					{
+						case SyntaxKind.PredefinedType:
+						case SyntaxKind.IdentifierName:
+							break;
+						default:
+							SM.Log($"asNode : {kind}");
+							break;
+					}
+				}
+				else
+				{
+					SyntaxToken asToken = nodesAndTokens[i].AsToken();
+					SyntaxKind kind = asToken.Kind();
+
+					switch (kind)
+					{
+						case SyntaxKind.GreaterThanToken:
+						case SyntaxKind.LessThanToken:
+							break;
+						default:
+							SM.Log($"asToken : {kind}");
+							break;
+					}
+				}
+			}
+		}
+
 		public override void VisitGenericName(GenericNameSyntax node)
 		{
 			ChildSyntaxList nodesAndTokens = node.ChildNodesAndTokens();
@@ -1794,6 +1847,7 @@ public override void VisitGenericName(GenericNameSyntax node)
 					{
 						case SyntaxKind.TypeArgumentList: 
 							{
+								VisitTypeArgumentList(asNode as TypeArgumentListSyntax);
 								break;
 							}
 						default:
@@ -1976,6 +2030,13 @@ public bool IdentifierToken(SyntaxNode node)
 													where e.IsKind(SyntaxKind.IdentifierName)
 													select e;
 
+					if (!_all.Any()) 
+					{
+						_all = from e in node.Parent.ChildNodes()
+							   where e.IsKind(SyntaxKind.GenericName)
+							   select e;
+					}
+
 					SymbolInfo _symbolInfo = CSTOJS.Model.GetSymbolInfo(_all.First());
 					ISymbol? _iSymbol = null;
 
@@ -2163,7 +2224,7 @@ where e.IsKind(SyntaxKind.IdentifierToken)
 						}
 						SM.Log("WARNING! Diagnostics ends ---");
 					}
-					SM.Log($"ERROR! !-{node}-! By reaching this means, a name did not convert to JS. CHECK FOR UPPERCASE CHARACTERS IN NAMES IN THE JS FILE!");
+					SM.Log($"WARNING! !-{node}-! By reaching this means, a name did not convert to JS. CHECK FOR UPPERCASE CHARACTERS IN NAMES IN THE JS FILE!");
 
 					//base.VisitIdentifierName(node);
 					return false;