bug fix for file namespaces .net 6 (#8)

Co-authored-by: DanTurco <[email protected]>
d1820 · Jan 15, 2022 · f18df25 · f18df25
1 parent d46223b
commit f18df25
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 4 deletions.
diff --git a/Manifests/vs2022/source.extension.vsixmanifest b/Manifests/vs2022/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ProtoAttributor.2022.fc16f3d2-4cc4-42ca-a6ca-2e7fb9cb3e5f" Version="1.0" Language="en-US" Publisher="Dan Turco" />
+        <Identity Id="ProtoAttributor.2022.fc16f3d2-4cc4-42ca-a6ca-2e7fb9cb3e5f" Version="1.1" Language="en-US" Publisher="Dan Turco" />
         <DisplayName>ProtoAttributor 2022</DisplayName>
         <Description xml:space="preserve">ProtoAttributor is an open source Visual Studio extension that can manage the appropriate attributes on a class to support ProtoBuf. It currently supports ProtoContract, ProtoMember, ProtoIgnore, DataContract, DataMember, IgnoreDataMemeber attributes.</Description>
         <MoreInfo>https://github.com/d1820/proto-attributor</MoreInfo>

diff --git a/ProtoAttributor.Tests/Mocks/TestClassNoUsings.cs b/ProtoAttributor.Tests/Mocks/TestClassNoUsings.cs
@@ -12,3 +12,4 @@ public class TestClassWithNoUsings
         public int MyProperty11 { get; set; }
     }
 }
+
diff --git a/ProtoAttributor.Tests/Mocks/TestClassWithNoBracketNamespace.cs b/ProtoAttributor.Tests/Mocks/TestClassWithNoBracketNamespace.cs
@@ -0,0 +1,13 @@
+namespace ProtoAttributor.Tests.Mocks;
+/// <summary> TestClass </summary>
+public class TestClassWithNoBracketNamespace
+{
+    /// <summary> Gets or sets my property. </summary>
+    /// <value> My property. </value>
+    public int MyProperty { get; set; }
+
+    /// <summary> Gets or sets my property11. </summary>
+    /// <value> My property11. </value>
+    public int MyProperty11 { get; set; }
+}
+
diff --git a/ProtoAttributor.Tests/ProtoAttributor.Tests.csproj b/ProtoAttributor.Tests/ProtoAttributor.Tests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="FluentAssertions" Version="6.3.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="protobuf-net" Version="3.0.73" />
@@ -27,6 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Update="Mocks\TestClassWithNoBracketNamespace.cs">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Compile>
     <Compile Update="Mocks\TestCodeWithDataMemberAttributes.cs">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Compile>

diff --git a/ProtoAttributor.Tests/ProtoContracts/ProtoAttributeAdderTests.cs b/ProtoAttributor.Tests/ProtoContracts/ProtoAttributeAdderTests.cs
@@ -15,6 +15,47 @@ public ProtoAttributeAdderTests(TestFixure fixture)
             _fixture = fixture;
         }
 
+        [Fact]
+        public void AddsAttributesForProtBuf_WhenClassWithNoBracketNamespace()
+        {
+            var tree = CSharpSyntaxTree.ParseText(_fixture.LoadTestFile(@"./Mocks/TestClassWithNoBracketNamespace.cs"));
+            var rewriter = new ProtoAttributeAdder();
+
+            var rewrittenRoot = rewriter.Visit(tree.GetRoot());
+
+            var output = rewrittenRoot.GetText().ToString();
+
+            var source = output.Split(new string[] { " ", "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
+
+            output.Should().Contain("using ProtoBuf;");
+            output.Should().Contain("[ProtoContract]");
+            output.Should().Contain("[ProtoMember(1)]");
+            output.Should().Contain("[ProtoMember(2)]");
+
+            _fixture.AssertOutputContainsCount(source, "ProtoMember", 2);
+        }
+
+
+        [Fact]
+        public void AddsAttributesForProtBuf_WhenClassWithNoUsings()
+        {
+            var tree = CSharpSyntaxTree.ParseText(_fixture.LoadTestFile(@"./Mocks/TestClassNoUsings.cs"));
+            var rewriter = new ProtoAttributeAdder();
+
+            var rewrittenRoot = rewriter.Visit(tree.GetRoot());
+
+            var output = rewrittenRoot.GetText().ToString();
+
+            var source = output.Split(new string[] { " ", "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
+
+            output.Should().Contain("using ProtoBuf;");
+            output.Should().Contain("[ProtoContract]");
+            output.Should().Contain("[ProtoMember(1)]");
+            output.Should().Contain("[ProtoMember(2)]");
+
+            _fixture.AssertOutputContainsCount(source, "ProtoMember", 2);
+        }
+
         [Fact]
         public void AddsAttributesForProtBuf()
         {

diff --git a/ProtoAttributor/Parsers/TriviaMaintainer.cs b/ProtoAttributor/Parsers/TriviaMaintainer.cs
@@ -36,6 +36,10 @@ public static ClassDeclarationSyntax Apply(ClassDeclarationSyntax node, Func<Cla
             node = node.WithoutTrailingTrivia();
 
             var wp = leadingTrivia.FirstOrDefault(w => w.Kind() == SyntaxKind.WhitespaceTrivia);
+            if (wp == default)
+            {
+                wp = SyntaxFactory.Whitespace(String.Empty);
+            }
 
             node = builder?.Invoke(node, wp);
 

diff --git a/ProtoAttributor/ProtoAttributor.csproj b/ProtoAttributor/ProtoAttributor.csproj
@@ -51,7 +51,7 @@
         <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.31902.203" ExcludeAssets="runtime">
           <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5232">
+        <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.5234">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>
         </PackageReference>