Set constructors as internal

aalmada · aalmada · commit d6bb02c71d06 · 2021-07-18T15:17:38.000+01:00
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/GenerateSourceTests.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/GenerateSourceTests.cs
@@ -53,6 +53,10 @@ public static TheoryData<string[], string> GeneratorSources
                     new[] { "TestData/Source/AsValueEnumerable.TestList.cs" },
                     "TestData/Results/AsValueEnumerable.TestList.cs"
                 },
+                {
+                    new[] { "TestData/Source/AsValueEnumerable.TestListWithExplicitInterfaces.cs" },
+                    "TestData/Results/AsValueEnumerable.TestListWithExplicitInterfaces.cs"
+                },
                 {
                     new[] { "TestData/Source/AsValueEnumerable.TestReadOnlyList.cs" },
                     "TestData/Results/AsValueEnumerable.TestReadOnlyList.cs"
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestCollection.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestCollection.cs
@@ -17,7 +17,7 @@ static partial class GeneratedExtensionMethods
         {
             readonly TestCollection<TestValueType> source;
 
-            public AsValueEnumerable_TestCollection_TestValueType_(TestCollection<TestValueType> source) => this.source = source;
+            internal AsValueEnumerable_TestCollection_TestValueType_(TestCollection<TestValueType> source) => this.source = source;
 
             // Implement IValueEnumerable<TestValueType, TestCollection<TestValueType>.Enumerator>
 
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestEnumerableWithInterfacelessPublicEnumerator.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestEnumerableWithInterfacelessPublicEnumerator.cs
@@ -17,7 +17,7 @@ static partial class GeneratedExtensionMethods
         {
             readonly TestEnumerableWithInterfacelessPublicEnumerator<TestValueType> source;
 
-            public AsValueEnumerable_TestEnumerableWithInterfacelessPublicEnumerator_TestValueType_(TestEnumerableWithInterfacelessPublicEnumerator<TestValueType> source) => this.source = source;
+            internal AsValueEnumerable_TestEnumerableWithInterfacelessPublicEnumerator_TestValueType_(TestEnumerableWithInterfacelessPublicEnumerator<TestValueType> source) => this.source = source;
 
             // Implement IValueEnumerable<TestValueType, ValueEnumerator<TestValueType>>
 
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestEnumerableWithNoInterfaces.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestEnumerableWithNoInterfaces.cs
@@ -17,7 +17,7 @@ static partial class GeneratedExtensionMethods
         {
             readonly TestEnumerableWithNoInterfaces<TestValueType> source;
 
-            public AsValueEnumerable_TestEnumerableWithNoInterfaces_TestValueType_(TestEnumerableWithNoInterfaces<TestValueType> source) => this.source = source;
+            internal AsValueEnumerable_TestEnumerableWithNoInterfaces_TestValueType_(TestEnumerableWithNoInterfaces<TestValueType> source) => this.source = source;
 
             // Implement IValueEnumerable<TestValueType, AsValueEnumerable_TestEnumerableWithNoInterfaces_TestValueType_.Enumerator>
 
@@ -35,7 +35,7 @@ public struct Enumerator: IEnumerator<TestValueType>
             {
                 readonly TestEnumerableWithNoInterfaces<TestValueType>.Enumerator source;
 
-                public Enumerator(TestEnumerableWithNoInterfaces<TestValueType>.Enumerator source) => this.source = source;
+                internal Enumerator(TestEnumerableWithNoInterfaces<TestValueType>.Enumerator source) => this.source = source;
 
                 public TestValueType Current => source.Current;
 
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose.cs
@@ -17,7 +17,7 @@ static partial class GeneratedExtensionMethods
         {
             readonly TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose<TestValueType> source;
 
-            public TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose_TestValueType__AsValueEnumerable(TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose<TestValueType> source) => this.source = source;
+            internal TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose_TestValueType__AsValueEnumerable(TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose<TestValueType> source) => this.source = source;
 
             // Implement IValueEnumerable<TestValueType, TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose_TestValueType__AsValueEnumerable.Enumerator>
 
@@ -35,7 +35,7 @@ public struct Enumerator: IEnumerator<TestValueType>
             {
                 readonly TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose<TestValueType>.Enumerator source;
 
-                public Enumerator(TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose<TestValueType>.Enumerator source) => this.source = source;
+                internal Enumerator(TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose<TestValueType>.Enumerator source) => this.source = source;
 
                 public TestValueType Current => source.Current;
 
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestEnumerableWithReferenceTypeEnumerator.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestEnumerableWithReferenceTypeEnumerator.cs
@@ -17,7 +17,7 @@ static partial class GeneratedExtensionMethods
         {
             readonly TestEnumerableWithReferenceTypeEnumerator<TestValueType> source;
 
-            public AsValueEnumerable_TestEnumerableWithReferenceTypeEnumerator_TestValueType_(TestEnumerableWithReferenceTypeEnumerator<TestValueType> source) => this.source = source;
+            internal AsValueEnumerable_TestEnumerableWithReferenceTypeEnumerator_TestValueType_(TestEnumerableWithReferenceTypeEnumerator<TestValueType> source) => this.source = source;
 
             // Implement IValueEnumerable<TestValueType, ValueEnumerator<TestValueType>>
 
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestEnumerableWithValueTypeEnumerator.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestEnumerableWithValueTypeEnumerator.cs
@@ -17,7 +17,7 @@ static partial class GeneratedExtensionMethods
         {
             readonly TestEnumerableWithValueTypeEnumerator<TestValueType> source;
 
-            public AsValueEnumerable_TestEnumerableWithValueTypeEnumerator_TestValueType_(TestEnumerableWithValueTypeEnumerator<TestValueType> source) => this.source = source;
+            internal AsValueEnumerable_TestEnumerableWithValueTypeEnumerator_TestValueType_(TestEnumerableWithValueTypeEnumerator<TestValueType> source) => this.source = source;
 
             // Implement IValueEnumerable<TestValueType, TestEnumerableWithValueTypeEnumerator<TestValueType>.Enumerator>
 
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestList.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestList.cs
@@ -17,7 +17,7 @@ static partial class GeneratedExtensionMethods
         {
             readonly TestList<TestValueType> source;
 
-            public AsValueEnumerable_TestList_TestValueType_(TestList<TestValueType> source) => this.source = source;
+            internal AsValueEnumerable_TestList_TestValueType_(TestList<TestValueType> source) => this.source = source;
 
             // Implement IValueEnumerable<TestValueType, TestList<TestValueType>.Enumerator>
 
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestListWithExplicitInterfaces.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestListWithExplicitInterfaces.cs
@@ -0,0 +1,80 @@
+#nullable enable
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace NetFabric.Hyperlinq
+{
+    static partial class GeneratedExtensionMethods
+    {
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static AsValueEnumerable_TestListWithExplicitInterfaces_TestValueType_<TestListWithExplicitInterfaces<TestValueType>> AsValueEnumerable(this TestListWithExplicitInterfaces<TestValueType> source) => new(source);
+
+        public readonly struct AsValueEnumerable_TestListWithExplicitInterfaces_TestValueType_<T>: IValueReadOnlyList<TestValueType, ValueEnumerator<TestValueType>>, IList<TestValueType> where T: IList<TestValueType>
+        {
+            readonly T source;
+
+            internal AsValueEnumerable_TestListWithExplicitInterfaces_TestValueType_(T source) => this.source = source;
+
+            // Implement IValueEnumerable<TestValueType, ValueEnumerator<TestValueType>>
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public ValueEnumerator<TestValueType> GetEnumerator() => new(source.GetEnumerator());
+
+            IEnumerator<TestValueType> IEnumerable<TestValueType>.GetEnumerator() => source.GetEnumerator();
+
+            IEnumerator IEnumerable.GetEnumerator() => source.GetEnumerator();
+
+            // Implement ICollection<TestValueType>
+
+            public int Count => source.Count;
+
+            public bool IsReadOnly => true;
+
+            void ICollection<TestValueType>.Add(TestValueType item) => throw new NotSupportedException();
+
+            bool ICollection<TestValueType>.Remove(TestValueType item) => throw new NotSupportedException();
+
+            void ICollection<TestValueType>.Clear() => throw new NotSupportedException();
+
+            public void CopyTo(Span<TestValueType> span)
+            {
+                if (Count is 0) return;
+                if (span.Length < Count) throw new ArgumentException("Destination span was not long enough.", nameof(span));
+
+                var index = 0;
+                foreach (var current in this)
+                {
+                    span[index] = current;
+                    checked { index++; }
+                }
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool Contains(TestValueType item) => source.Contains(item);
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void CopyTo(TestValueType[] array, int arrayIndex) => source.CopyTo(array, arrayIndex);
+
+            // Implement IList<TestValueType>
+
+            public TestValueType this[int index] => source[index];
+
+            TestValueType IList<TestValueType>.this[int index]
+            {
+                get => source[index];
+                set => throw new NotSupportedException();
+            }
+
+            void IList<TestValueType>.Insert(int index, TestValueType item) => throw new NotSupportedException();
+
+            void IList<TestValueType>.RemoveAt(int index) => throw new NotSupportedException();
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public int IndexOf(TestValueType item) => source.IndexOf(item);
+        }
+    }
+}
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestReadOnlyCollection.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestReadOnlyCollection.cs
@@ -17,7 +17,7 @@ static partial class GeneratedExtensionMethods
         {
             readonly TestReadOnlyCollection<TestValueType> source;
 
-            public AsValueEnumerable_TestReadOnlyCollection_TestValueType_(TestReadOnlyCollection<TestValueType> source) => this.source = source;
+            internal AsValueEnumerable_TestReadOnlyCollection_TestValueType_(TestReadOnlyCollection<TestValueType> source) => this.source = source;
 
             // Implement IValueEnumerable<TestValueType, TestReadOnlyCollection<TestValueType>.Enumerator>
 
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestReadOnlyList.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestReadOnlyList.cs
@@ -17,7 +17,7 @@ static partial class GeneratedExtensionMethods
         {
             readonly TestReadOnlyList<TestValueType> source;
 
-            public AsValueEnumerable_TestReadOnlyList_TestValueType_(TestReadOnlyList<TestValueType> source) => this.source = source;
+            internal AsValueEnumerable_TestReadOnlyList_TestValueType_(TestReadOnlyList<TestValueType> source) => this.source = source;
 
             // Implement IValueEnumerable<TestValueType, TestReadOnlyList<TestValueType>.Enumerator>
 
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestValueEnumerable.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Results/AsValueEnumerable.TestValueEnumerable.cs
@@ -7,7 +7,7 @@
 
 namespace NetFabric.Hyperlinq
 {
-    static partial class GeneratedExtensionMethods
+    public static partial class GeneratedExtensionMethods
     {
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Source/AsValueEnumerable.TestListWithExplicitInterfaces.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Source/AsValueEnumerable.TestListWithExplicitInterfaces.cs
@@ -0,0 +1,15 @@
+using NetFabric.Hyperlinq;
+
+partial class TestsSource
+{
+    static void AsValueEnumerable_ReadOnlyListWithExplicitInterfaces()
+    {
+        // test calling AsValueEnumerable() on an IValueEnumerable
+        _ = new TestListWithExplicitInterfaces<TestValueType>().AsValueEnumerable();
+    }
+}
+
+
+
+
+
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Source/Common/Enumerables.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Source/Common/Enumerables.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-class TestEnumerableWithNoInterfaces<T>
+public class TestEnumerableWithNoInterfaces<T>
 {
     public Enumerator GetEnumerator()
         => new();
@@ -17,7 +17,7 @@ public bool MoveNext()
     }
 }
 
-class TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose<T>
+public class TestEnumerableWithNoInterfacesButEnumeratorWithResetAndDispose<T>
 {
     public Enumerator GetEnumerator()
         => new();
@@ -39,7 +39,7 @@ public void Dispose()
     }
 }
 
-class TestEnumerableWithInterfacelessPublicEnumerator<T>
+public class TestEnumerableWithInterfacelessPublicEnumerator<T>
     : IEnumerable<T>
 {
     public Enumerator GetEnumerator()
@@ -105,7 +105,7 @@ public void Dispose()
 }
 
 
-class TestEnumerableWithReferenceTypeEnumerator<T>
+public class TestEnumerableWithReferenceTypeEnumerator<T>
     : IEnumerable<T>
 {
     public IEnumerator<T> GetEnumerator()
@@ -278,3 +278,50 @@ public void Dispose()
     }
 }
 
+
+public class TestListWithExplicitInterfaces<T>
+    : IList<T>
+{
+    int ICollection<T>.Count => default;
+
+    bool ICollection<T>.IsReadOnly => true;
+
+    T IList<T>.this[int index]
+    {
+        get => default!;
+        set => throw new NotSupportedException();
+    }
+
+    bool ICollection<T>.Contains(T item) => default;
+    void ICollection<T>.CopyTo(T[] array, int arrayIndex) { }
+    void ICollection<T>.Add(T item) => throw new NotSupportedException();
+    bool ICollection<T>.Remove(T item) => throw new NotSupportedException();
+    void ICollection<T>.Clear() => throw new NotSupportedException();
+
+    int IList<T>.IndexOf(T item) => -1;
+    void IList<T>.Insert(int index, T item) => throw new NotSupportedException();
+    void IList<T>.RemoveAt(int index) => throw new NotSupportedException();
+
+    IEnumerator<T> IEnumerable<T>.GetEnumerator()
+        => new Enumerator();
+    IEnumerator IEnumerable.GetEnumerator()
+        => new Enumerator();
+
+    class Enumerator
+        : IEnumerator<T>
+    {
+        T IEnumerator<T>.Current
+            => default!;
+        object? IEnumerator.Current
+            => default;
+
+        bool IEnumerator.MoveNext()
+            => false;
+
+        void IEnumerator.Reset()
+        { }
+        void IDisposable.Dispose()
+        { }
+    }
+}
+
diff --git a/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Source/Common/ValueEnumerables.cs b/NetFabric.Hyperlinq.SourceGenerator.UnitTests/TestData/Source/Common/ValueEnumerables.cs
@@ -2,7 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-class TestValueEnumerable<T>
+public class TestValueEnumerable<T>
     : IValueEnumerable<T, TestValueEnumerable<T>.DisposableEnumerator>
 {
     public Enumerator GetEnumerator()
diff --git a/NetFabric.Hyperlinq.SourceGenerator/Generator.AsValueEnumerable.cs b/NetFabric.Hyperlinq.SourceGenerator/Generator.AsValueEnumerable.cs
@@ -123,7 +123,7 @@ static bool HandleAsValueEnumerable(Compilation compilation, TypeSymbolsCache ty
                     _ = builder
                         .AppendLine($"readonly {receiverTypeString} source;") // source field
                         .AppendLine()
-                        .AppendLine($"public {enumerableTypeString}({receiverTypeString} source) => this.source = source;") // constructor
+                        .AppendLine($"internal {enumerableTypeString}({receiverTypeString} source) => this.source = source;") // constructor
                         .AppendLine()
                         .AppendLine($"// Implement IValueEnumerable<{itemTypeString}, {enumeratorTypeString}>")
                         .AppendLine();
@@ -185,7 +185,7 @@ static bool HandleAsValueEnumerable(Compilation compilation, TypeSymbolsCache ty
                             _ = builder
                                 .AppendLine($"readonly {getEnumeratorReturnTypeString} source;")
                                 .AppendLine()
-                                .AppendLine($"public Enumerator({getEnumeratorReturnTypeString} source) => this.source = source;")
+                                .AppendLine($"internal Enumerator({getEnumeratorReturnTypeString} source) => this.source = source;")
                                 .AppendLine()
                                 .AppendLine($"public {itemTypeString} Current => source.Current;")
                                 .AppendLine()

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ static partial class GeneratedExtensionMethods`
`17`	`17`	`{`
`18`	`18`	`readonly TestCollection<TestValueType> source;`
`19`	`19`
`20`		`- public AsValueEnumerable_TestCollection_TestValueType_(TestCollection<TestValueType> source) => this.source = source;`
	`20`	`+ internal AsValueEnumerable_TestCollection_TestValueType_(TestCollection<TestValueType> source) => this.source = source;`
`21`	`21`
`22`	`22`	`// Implement IValueEnumerable<TestValueType, TestCollection<TestValueType>.Enumerator>`
`23`	`23`