Supporting block-free namespace

Author: NikolayPianikov

Directory.Build.props

@@ -17,8 +17,8 @@
         <!--<AnalyzerRoslynVersion Condition="'$(AnalyzerRoslynVersion)'==''">3.8</AnalyzerRoslynVersion>
         <AnalyzerRoslynPackageVersion Condition="'$(AnalyzerRoslynPackageVersion)'==''">3.8.0</AnalyzerRoslynPackageVersion>-->
 
-        <DefineConstants Condition="'$(AnalyzerRoslynVersion)'=='4.0'">ROSLYN40</DefineConstants>
-        <DefineConstants Condition="'$(AnalyzerRoslynVersion)'=='3.8'">ROSLYN38</DefineConstants>
+        <DefineConstants Condition="'$(AnalyzerRoslynVersion)'=='4.0'">$(DefineConstants);ROSLYN40</DefineConstants>
+        <DefineConstants Condition="'$(AnalyzerRoslynVersion)'=='3.8'">$(DefineConstants);ROSLYN38</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>

Immutype.Tests/Integration/Tests.cs

@@ -62,13 +62,31 @@ namespace Sample
             {
                 using System;
                 
-                [Immutype.TargetAttribute()]
+                [Immutype.Target]
                 public record struct Rec(int val);
             }".Run(out var generatedCode, new RunOptions { Statements = statements });
 
             // Then
             output.ShouldBe(new [] { "Rec { val = 99 }" }, generatedCode);
         }
+        
+        [Fact]
+        public void ShouldSupportBlockFreeNamespace()
+        {
+            // Given
+            const string statements = "System.Console.WriteLine(new Rec(33).WithVal(99));";
+
+            // When
+            var output = @"
+            namespace Sample;
+            using System;
+            [Immutype.Target]
+            public record struct Rec(int val);
+            ".Run(out var generatedCode, new RunOptions { Statements = statements });
+
+            // Then
+            output.ShouldBe(new [] { "Rec { val = 99 }" }, generatedCode);
+        }
 #endif
 
         [Fact]

Immutype/Core/ExtensionsFactory.cs

@@ -20,7 +20,15 @@ public ExtensionsFactory(IMethodsFactory methodsFactory) =>
         public IEnumerable<Source> Create(GenerationContext<TypeDeclarationSyntax> context, IReadOnlyList<ParameterSyntax> parameters)
         {
             var typeDeclarationSyntax = context.Syntax;
-            var ns = typeDeclarationSyntax.Ancestors().OfType<NamespaceDeclarationSyntax>().Reverse().ToArray();
+            var ns = typeDeclarationSyntax.Ancestors()
+#if ROSLYN38
+                .OfType<NamespaceDeclarationSyntax>()
+#else
+                .OfType<BaseNamespaceDeclarationSyntax>()
+#endif
+                .Reverse()
+                .ToArray();
+
             var typeName = 
                 string.Join(".", ns.Select(i => i.Name.ToString())
                     .Concat(new []{typeDeclarationSyntax.Identifier.Text + typeDeclarationSyntax.TypeParameterList}));