Skip to content

Commit 390c3ba

Browse files
committed
Added detection for get only, auto implemented properties.
Improved formatting and detection of the auto implemented properties. Small fixes.
1 parent 0062390 commit 390c3ba

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

CSharpToJavaScript/CSTOJS.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ public CSTOJS()
3939
Trace.AutoFlush = true;
4040
}
4141

42-
Trace.Listeners.Add(new ConsoleTraceListener());
42+
ConsoleTraceListener consoleTraceListener = new();
43+
if(Trace.Listeners.Contains(consoleTraceListener) == false)
44+
Trace.Listeners.Add(consoleTraceListener);
4345

4446
Assembly assembly = Assembly.GetExecutingAssembly();
4547
//https://stackoverflow.com/a/73474279
@@ -63,7 +65,9 @@ public CSTOJS(CSTOJSOptions options)
6365
Trace.AutoFlush = true;
6466
}
6567

66-
Trace.Listeners.Add(new ConsoleTraceListener());
68+
ConsoleTraceListener consoleTraceListener = new();
69+
if (Trace.Listeners.Contains(consoleTraceListener) == false)
70+
Trace.Listeners.Add(consoleTraceListener);
6771

6872
Assembly assembly = Assembly.GetExecutingAssembly();
6973
//https://stackoverflow.com/a/73474279

CSharpToJavaScript/CSharpToJavaScript.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<GenerateDocumentationFile>True</GenerateDocumentationFile>
1010
<Authors>TiLied</Authors>
1111
<Description>Brute forcing conversion(translation) from C# to Javascript.</Description>
12-
<PackageProjectUrl>https://tilied.github.io/CSharpToJavaScript/</PackageProjectUrl>
12+
<PackageProjectUrl>https://tilied.github.io/CSTOJS_Pages/</PackageProjectUrl>
1313
<PackageReadmeFile>README.md</PackageReadmeFile>
1414
<RepositoryUrl>https://github.com/TiLied/CSharpToJavaScript/</RepositoryUrl>
1515
<PackageTags>csharp, c#, conversion, javascript, js, generating</PackageTags>
@@ -22,10 +22,6 @@
2222
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
2323
</ItemGroup>
2424

25-
<ItemGroup>
26-
<Folder Include="APIs\JS\Generated\" />
27-
</ItemGroup>
28-
2925
<ItemGroup>
3026
<None Include="..\LICENSE">
3127
<Pack>True</Pack>

CSharpToJavaScript/Walker.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,9 @@ public override void VisitPropertyDeclaration(PropertyDeclarationSyntax node)
743743

744744
if (kind == SyntaxKind.AccessorList)
745745
{
746-
if (asNode.ToString() == "{ get; set; }")
746+
string _getSetStr = asNode.ToString().Trim().Replace(" ","");
747+
748+
if (_getSetStr == "{get;set;}" || _getSetStr == "{get;}")
747749
{
748750
IEnumerable<SyntaxNodeOrToken> key = from n in nodesAndTokens
749751
where n.IsNode
@@ -778,8 +780,8 @@ where n.AsNode().IsKind(SyntaxKind.GenericName)
778780
{
779781
SyntaxFactory.Token(SyntaxKind.PrivateKeyword)
780782
}))
781-
.WithLeadingTrivia(SyntaxFactory.ParseLeadingTrivia("\t\t"))
782-
.WithTrailingTrivia(SyntaxFactory.ParseLeadingTrivia("\r\n"));
783+
.WithLeadingTrivia(node.GetLeadingTrivia())
784+
.WithTrailingTrivia(node.GetTrailingTrivia());
783785
}
784786
else
785787
{
@@ -796,8 +798,8 @@ where n.AsNode().IsKind(SyntaxKind.GenericName)
796798
{
797799
SyntaxFactory.Token(SyntaxKind.PrivateKeyword)
798800
}))
799-
.WithLeadingTrivia(SyntaxFactory.ParseLeadingTrivia("\t\t"))
800-
.WithTrailingTrivia(SyntaxFactory.ParseLeadingTrivia("\r\n"));
801+
.WithLeadingTrivia(node.GetLeadingTrivia())
802+
.WithTrailingTrivia(node.GetTrailingTrivia());
801803
}
802804

803805
VisitFieldDeclaration(field);

0 commit comments

Comments
 (0)