Skip to content

Commit 13cf989

Browse files
committed
Back to trace.
Ignore readonly/required keywords.
1 parent d638bd8 commit 13cf989

File tree

3 files changed

+26
-28
lines changed

3 files changed

+26
-28
lines changed

CSharpToJavaScript/CSTOJS.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class CSTOJS : ILog
3030
/// </summary>
3131
public CSTOJS()
3232
{
33-
_Log = this;
33+
_Log = ILog.GetILog(this, _Options);
3434

3535
Assembly assembly = Assembly.GetExecutingAssembly();
3636
//https://stackoverflow.com/a/73474279

CSharpToJavaScript/Utils/ILog.cs

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Diagnostics;
23
using System.IO;
34
using System.Runtime.CompilerServices;
45

@@ -7,6 +8,10 @@ namespace CSharpToJavaScript.Utils
78
internal interface ILog
89
{
910
private static CSTOJSOptions _Options = new();
11+
static ILog()
12+
{
13+
Trace.Listeners.Add(new ConsoleTraceListener());
14+
}
1015
public static ILog GetILog(CSTOJS cstojs, CSTOJSOptions options)
1116
{
1217
_Options = options;
@@ -17,78 +22,68 @@ public void WriteLine(string message)
1722
if (_Options.DisableConsoleOutput == true)
1823
return;
1924

20-
Console.Write($"{DateTime.Now.ToLongTimeString()}: ");
21-
Console.Write($"{message}");
22-
23-
Console.WriteLine();
25+
Trace.Write($"{DateTime.Now.ToLongTimeString()}: ");
26+
Trace.WriteLine($"{message}");
2427
}
2528

26-
public virtual void SuccessLine(string message)
29+
public void SuccessLine(string message)
2730
{
2831
if (_Options.DisableConsoleOutput == true)
2932
return;
3033

31-
Console.Write($"{DateTime.Now.ToLongTimeString()}: ");
34+
Trace.Write($"{DateTime.Now.ToLongTimeString()}: ");
3235

3336
if (_Options.DisableConsoleColors == false)
3437
Console.ForegroundColor = ConsoleColor.Green;
3538

36-
Console.Write($"\t{message}");
39+
Trace.WriteLine($"\t{message}");
3740

3841
if (_Options.DisableConsoleColors == false)
3942
Console.ResetColor();
40-
41-
Console.WriteLine();
4243
}
4344

4445
public void WarningLine(string message, [CallerFilePath] string? file = null, [CallerMemberName] string? member = null, [CallerLineNumber] int line = 0)
4546
{
4647
if (_Options.DisableConsoleOutput == true)
4748
return;
4849

49-
Console.Write($"{DateTime.Now.ToLongTimeString()}: ");
50+
Trace.Write($"{DateTime.Now.ToLongTimeString()}: ");
5051

5152
if (_Options.DisableConsoleColors == false)
5253
Console.ForegroundColor = ConsoleColor.Cyan;
5354

54-
Console.Write($"({line}){Path.GetFileName(file?.Replace("\\", "/"))}.{member}:");
55-
Console.WriteLine();
56-
Console.Write("\tMessage: ");
55+
Trace.WriteLine($"({line}){Path.GetFileName(file?.Replace("\\", "/"))}.{member}:");
56+
Trace.Write("\tMessage: ");
5757

5858
if (_Options.DisableConsoleColors == false)
5959
Console.ForegroundColor = ConsoleColor.Yellow;
6060

61-
Console.Write($"{message}");
61+
Trace.WriteLine($"{message}");
6262

6363
if (_Options.DisableConsoleColors == false)
6464
Console.ResetColor();
65-
66-
Console.WriteLine();
6765
}
6866

6967
public void ErrorLine(string message, [CallerFilePath] string? file = null, [CallerMemberName] string? member = null, [CallerLineNumber] int line = 0)
7068
{
7169
if (_Options.DisableConsoleOutput == true)
7270
return;
7371

74-
Console.Write($"{DateTime.Now.ToLongTimeString()}: ");
72+
Trace.Write($"{DateTime.Now.ToLongTimeString()}: ");
7573

7674
if (_Options.DisableConsoleColors == false)
7775
Console.ForegroundColor = ConsoleColor.Cyan;
7876

79-
Console.Write($"({line}){Path.GetFileName(file?.Replace("\\", "/"))}.{member}:");
80-
Console.WriteLine();
81-
Console.Write("\tMessage: ");
77+
Trace.WriteLine($"({line}){Path.GetFileName(file?.Replace("\\", "/"))}.{member}:");
78+
Trace.Write("\tMessage: ");
8279

8380
if (_Options.DisableConsoleColors == false)
8481
Console.ForegroundColor = ConsoleColor.Red;
8582

86-
Console.Write($"{message}");
83+
Trace.WriteLine($"{message}");
8784

8885
if (_Options.DisableConsoleColors == false)
8986
Console.ResetColor();
90-
91-
Console.WriteLine();
9287
}
9388
}
9489
}

CSharpToJavaScript/Walker.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
namespace CSharpToJavaScript
1313
{
14-
//TODO maybe...
15-
//https://learn.microsoft.com/en-us/dotnet/csharp/roslyn-sdk/get-started/syntax-transformation
16-
//
14+
//TODO maybe...
15+
//https://learn.microsoft.com/en-us/dotnet/csharp/roslyn-sdk/get-started/syntax-transformation
16+
//
1717

18-
internal class Walker : CSharpSyntaxWalker, ILog
18+
internal class Walker : CSharpSyntaxWalker, ILog
1919
{
2020
public StringBuilder JSSB { get; set; } = new();
2121

@@ -795,6 +795,8 @@ public override void VisitFieldDeclaration(FieldDeclarationSyntax node)
795795

796796
switch (kind)
797797
{
798+
case SyntaxKind.ReadOnlyKeyword:
799+
break;
798800
case SyntaxKind.SemicolonToken:
799801
VisitToken(asToken);
800802
break;
@@ -936,6 +938,7 @@ where n.AsNode().IsKind(SyntaxKind.GenericName)
936938

937939
switch (kind)
938940
{
941+
case SyntaxKind.RequiredKeyword:
939942
case SyntaxKind.IdentifierToken:
940943
break;
941944
case SyntaxKind.SemicolonToken:

0 commit comments

Comments
 (0)