From 1734d5162a490b0d696ee6a1ca69a2c110459ecd Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Tue, 21 May 2024 16:33:33 +0100 Subject: [PATCH] namespace change --- .../Builders/MethodParameterBuilder.cs | 4 ++-- src/Speckle.ProxyGenerator/Enums/TypeEnum.cs | 2 +- .../Extensions/MethodSymbolExtensions.cs | 2 +- .../Extensions/NamedTypeSymbolExtensions.cs | 2 +- .../Extensions/ParameterSymbolExtensions.cs | 4 ++-- .../Extensions/PropertySymbolExtensions.cs | 6 +++--- .../Extensions/StringExtensions.cs | 2 +- .../Extensions/SymbolExtensions.cs | 8 ++++---- .../Extensions/SyntaxNodeExtensions.cs | 4 ++-- .../Extensions/TypeSymbolExtensions.cs | 4 ++-- .../FileGenerators/BaseGenerator.cs | 12 ++++++------ .../FileGenerators/ExtraFilesGenerator.cs | 4 ++-- .../FileGenerators/IFileGenerator.cs | 4 ++-- .../FileGenerators/IFilesGenerator.cs | 4 ++-- .../FileGenerators/PartialInterfacesGenerator.cs | 10 +++++----- .../ProxyClassesGenerator.AutoMapper.cs | 4 ++-- .../ProxyClassesGenerator.Mapster.cs | 4 ++-- .../FileGenerators/ProxyClassesGenerator.cs | 16 ++++++++-------- src/Speckle.ProxyGenerator/Models/ClassSymbol.cs | 2 +- .../Models/ConstraintInfo.cs | 2 +- src/Speckle.ProxyGenerator/Models/Context.cs | 2 +- src/Speckle.ProxyGenerator/Models/FileData.cs | 2 +- src/Speckle.ProxyGenerator/Models/ProxyData.cs | 4 ++-- .../ProxyInterfaceCodeGenerator.cs | 8 ++++---- .../AttributeArgumentListParser.cs | 13 ++++++------- .../SyntaxReceiver/ProxySyntaxReceiver.cs | 12 ++++++------ .../Types/FluentBuilderAttributeArguments.cs | 6 +++--- .../ProxyInterfaceGeneratorAccessibility.cs | 2 +- src/Speckle.ProxyGenerator/Utils/MemberHelper.cs | 6 +++--- .../Utils/NamespaceHelper.cs | 2 +- .../AkkaTests.cs | 2 +- .../InheritedInterfaceTests.cs | 2 +- .../PnPTests.cs | 2 +- .../ProxyInterfaceSourceGeneratorTest.cs | 2 +- 34 files changed, 82 insertions(+), 83 deletions(-) diff --git a/src/Speckle.ProxyGenerator/Builders/MethodParameterBuilder.cs b/src/Speckle.ProxyGenerator/Builders/MethodParameterBuilder.cs index 6b6feab..f3f48e6 100644 --- a/src/Speckle.ProxyGenerator/Builders/MethodParameterBuilder.cs +++ b/src/Speckle.ProxyGenerator/Builders/MethodParameterBuilder.cs @@ -1,8 +1,8 @@ using System.Text; using Microsoft.CodeAnalysis; -using ProxyInterfaceSourceGenerator.Extensions; +using Speckle.ProxyGenerator.Extensions; -namespace ProxyInterfaceSourceGenerator.Builders; +namespace Speckle.ProxyGenerator.Builders; internal static class MethodParameterBuilder { diff --git a/src/Speckle.ProxyGenerator/Enums/TypeEnum.cs b/src/Speckle.ProxyGenerator/Enums/TypeEnum.cs index 14ae99f..7875c68 100644 --- a/src/Speckle.ProxyGenerator/Enums/TypeEnum.cs +++ b/src/Speckle.ProxyGenerator/Enums/TypeEnum.cs @@ -1,4 +1,4 @@ -namespace ProxyInterfaceSourceGenerator.Enums; +namespace Speckle.ProxyGenerator.Enums; internal enum TypeEnum { diff --git a/src/Speckle.ProxyGenerator/Extensions/MethodSymbolExtensions.cs b/src/Speckle.ProxyGenerator/Extensions/MethodSymbolExtensions.cs index 2feb5b2..e8b7f61 100644 --- a/src/Speckle.ProxyGenerator/Extensions/MethodSymbolExtensions.cs +++ b/src/Speckle.ProxyGenerator/Extensions/MethodSymbolExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.CodeAnalysis; -namespace ProxyInterfaceSourceGenerator.Extensions; +namespace Speckle.ProxyGenerator.Extensions; internal static class MethodSymbolExtensions { diff --git a/src/Speckle.ProxyGenerator/Extensions/NamedTypeSymbolExtensions.cs b/src/Speckle.ProxyGenerator/Extensions/NamedTypeSymbolExtensions.cs index c74ef98..ac5a2cf 100644 --- a/src/Speckle.ProxyGenerator/Extensions/NamedTypeSymbolExtensions.cs +++ b/src/Speckle.ProxyGenerator/Extensions/NamedTypeSymbolExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.CodeAnalysis; -namespace ProxyInterfaceSourceGenerator.Extensions; +namespace Speckle.ProxyGenerator.Extensions; internal static class NamedTypeSymbolExtensions { diff --git a/src/Speckle.ProxyGenerator/Extensions/ParameterSymbolExtensions.cs b/src/Speckle.ProxyGenerator/Extensions/ParameterSymbolExtensions.cs index 7b88b22..279d45c 100644 --- a/src/Speckle.ProxyGenerator/Extensions/ParameterSymbolExtensions.cs +++ b/src/Speckle.ProxyGenerator/Extensions/ParameterSymbolExtensions.cs @@ -1,8 +1,8 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; -using ProxyInterfaceSourceGenerator.Enums; +using Speckle.ProxyGenerator.Enums; -namespace ProxyInterfaceSourceGenerator.Extensions; +namespace Speckle.ProxyGenerator.Extensions; internal static class ParameterSymbolExtensions { diff --git a/src/Speckle.ProxyGenerator/Extensions/PropertySymbolExtensions.cs b/src/Speckle.ProxyGenerator/Extensions/PropertySymbolExtensions.cs index d38ca83..de5e1cf 100644 --- a/src/Speckle.ProxyGenerator/Extensions/PropertySymbolExtensions.cs +++ b/src/Speckle.ProxyGenerator/Extensions/PropertySymbolExtensions.cs @@ -1,8 +1,8 @@ using Microsoft.CodeAnalysis; -using ProxyInterfaceSourceGenerator.Enums; -using ProxyInterfaceSourceGenerator.FileGenerators; +using Speckle.ProxyGenerator.Enums; +using Speckle.ProxyGenerator.FileGenerators; -namespace ProxyInterfaceSourceGenerator.Extensions; +namespace Speckle.ProxyGenerator.Extensions; internal static class PropertySymbolExtensions { diff --git a/src/Speckle.ProxyGenerator/Extensions/StringExtensions.cs b/src/Speckle.ProxyGenerator/Extensions/StringExtensions.cs index ea7dfc0..5967435 100644 --- a/src/Speckle.ProxyGenerator/Extensions/StringExtensions.cs +++ b/src/Speckle.ProxyGenerator/Extensions/StringExtensions.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace ProxyInterfaceSourceGenerator.Extensions; +namespace Speckle.ProxyGenerator.Extensions; internal static class StringExtensions { diff --git a/src/Speckle.ProxyGenerator/Extensions/SymbolExtensions.cs b/src/Speckle.ProxyGenerator/Extensions/SymbolExtensions.cs index 5c34313..a9ffbf2 100644 --- a/src/Speckle.ProxyGenerator/Extensions/SymbolExtensions.cs +++ b/src/Speckle.ProxyGenerator/Extensions/SymbolExtensions.cs @@ -1,17 +1,17 @@ +using System.Text; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; -using System.Text; -namespace ProxyInterfaceSourceGenerator.Extensions; +namespace Speckle.ProxyGenerator.Extensions; internal static class SymbolExtensions { private static readonly string[] ExcludedAttributes = - { + [ "System.Runtime.CompilerServices.NullableAttribute", "System.Runtime.CompilerServices.NullableContextAttribute", "System.Runtime.CompilerServices.AsyncStateMachineAttribute" - }; + ]; public static IReadOnlyList GetAttributesAsList(this ISymbol symbol) { diff --git a/src/Speckle.ProxyGenerator/Extensions/SyntaxNodeExtensions.cs b/src/Speckle.ProxyGenerator/Extensions/SyntaxNodeExtensions.cs index 50e3d57..39b1c20 100644 --- a/src/Speckle.ProxyGenerator/Extensions/SyntaxNodeExtensions.cs +++ b/src/Speckle.ProxyGenerator/Extensions/SyntaxNodeExtensions.cs @@ -1,8 +1,8 @@ +using System.Diagnostics.CodeAnalysis; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax; -using System.Diagnostics.CodeAnalysis; -namespace ProxyInterfaceSourceGenerator.Extensions; +namespace Speckle.ProxyGenerator.Extensions; internal static class SyntaxNodeExtensions { diff --git a/src/Speckle.ProxyGenerator/Extensions/TypeSymbolExtensions.cs b/src/Speckle.ProxyGenerator/Extensions/TypeSymbolExtensions.cs index 9aec671..95616ce 100644 --- a/src/Speckle.ProxyGenerator/Extensions/TypeSymbolExtensions.cs +++ b/src/Speckle.ProxyGenerator/Extensions/TypeSymbolExtensions.cs @@ -1,7 +1,7 @@ using Microsoft.CodeAnalysis; -using ProxyInterfaceSourceGenerator.Enums; +using Speckle.ProxyGenerator.Enums; -namespace ProxyInterfaceSourceGenerator.Extensions; +namespace Speckle.ProxyGenerator.Extensions; internal static class TypeSymbolExtensions { diff --git a/src/Speckle.ProxyGenerator/FileGenerators/BaseGenerator.cs b/src/Speckle.ProxyGenerator/FileGenerators/BaseGenerator.cs index 6ba0275..67e4664 100644 --- a/src/Speckle.ProxyGenerator/FileGenerators/BaseGenerator.cs +++ b/src/Speckle.ProxyGenerator/FileGenerators/BaseGenerator.cs @@ -2,12 +2,12 @@ using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; using System.Text; using Microsoft.CodeAnalysis; -using ProxyInterfaceSourceGenerator.Builders; -using ProxyInterfaceSourceGenerator.Enums; -using ProxyInterfaceSourceGenerator.Extensions; -using ProxyInterfaceSourceGenerator.Models; +using Speckle.ProxyGenerator.Builders; +using Speckle.ProxyGenerator.Enums; +using Speckle.ProxyGenerator.Extensions; +using Speckle.ProxyGenerator.Models; -namespace ProxyInterfaceSourceGenerator.FileGenerators; +namespace Speckle.ProxyGenerator.FileGenerators; internal abstract class BaseGenerator { @@ -153,7 +153,7 @@ internal abstract class BaseGenerator } else if (typeSymbol is IArrayTypeSymbol arrayTypeSymbol) { - typeArguments = new[] { arrayTypeSymbol.ElementType }; + typeArguments = [arrayTypeSymbol.ElementType]; } else { diff --git a/src/Speckle.ProxyGenerator/FileGenerators/ExtraFilesGenerator.cs b/src/Speckle.ProxyGenerator/FileGenerators/ExtraFilesGenerator.cs index eb8fb9b..b94f892 100644 --- a/src/Speckle.ProxyGenerator/FileGenerators/ExtraFilesGenerator.cs +++ b/src/Speckle.ProxyGenerator/FileGenerators/ExtraFilesGenerator.cs @@ -1,6 +1,6 @@ -using ProxyInterfaceSourceGenerator.Models; +using Speckle.ProxyGenerator.Models; -namespace ProxyInterfaceSourceGenerator.FileGenerators; +namespace Speckle.ProxyGenerator.FileGenerators; internal class ExtraFilesGenerator : IFileGenerator { diff --git a/src/Speckle.ProxyGenerator/FileGenerators/IFileGenerator.cs b/src/Speckle.ProxyGenerator/FileGenerators/IFileGenerator.cs index cb0457c..cf37fba 100644 --- a/src/Speckle.ProxyGenerator/FileGenerators/IFileGenerator.cs +++ b/src/Speckle.ProxyGenerator/FileGenerators/IFileGenerator.cs @@ -1,6 +1,6 @@ -using ProxyInterfaceSourceGenerator.Models; +using Speckle.ProxyGenerator.Models; -namespace ProxyInterfaceSourceGenerator.FileGenerators; +namespace Speckle.ProxyGenerator.FileGenerators; internal interface IFileGenerator { diff --git a/src/Speckle.ProxyGenerator/FileGenerators/IFilesGenerator.cs b/src/Speckle.ProxyGenerator/FileGenerators/IFilesGenerator.cs index 6a98c78..3c5988f 100644 --- a/src/Speckle.ProxyGenerator/FileGenerators/IFilesGenerator.cs +++ b/src/Speckle.ProxyGenerator/FileGenerators/IFilesGenerator.cs @@ -1,6 +1,6 @@ -using ProxyInterfaceSourceGenerator.Models; +using Speckle.ProxyGenerator.Models; -namespace ProxyInterfaceSourceGenerator.FileGenerators; +namespace Speckle.ProxyGenerator.FileGenerators; internal interface IFilesGenerator { diff --git a/src/Speckle.ProxyGenerator/FileGenerators/PartialInterfacesGenerator.cs b/src/Speckle.ProxyGenerator/FileGenerators/PartialInterfacesGenerator.cs index 505cb71..fa7907b 100644 --- a/src/Speckle.ProxyGenerator/FileGenerators/PartialInterfacesGenerator.cs +++ b/src/Speckle.ProxyGenerator/FileGenerators/PartialInterfacesGenerator.cs @@ -2,12 +2,12 @@ using System.Diagnostics.CodeAnalysis; using System.Text; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax; -using ProxyInterfaceSourceGenerator.Enums; -using ProxyInterfaceSourceGenerator.Extensions; -using ProxyInterfaceSourceGenerator.Models; -using ProxyInterfaceSourceGenerator.Utils; +using Speckle.ProxyGenerator.Enums; +using Speckle.ProxyGenerator.Extensions; +using Speckle.ProxyGenerator.Models; +using Speckle.ProxyGenerator.Utils; -namespace ProxyInterfaceSourceGenerator.FileGenerators; +namespace Speckle.ProxyGenerator.FileGenerators; internal class PartialInterfacesGenerator : BaseGenerator, IFilesGenerator { diff --git a/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.AutoMapper.cs b/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.AutoMapper.cs index 7251450..138215b 100644 --- a/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.AutoMapper.cs +++ b/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.AutoMapper.cs @@ -1,7 +1,7 @@ using System.Text; -using ProxyInterfaceSourceGenerator.Extensions; +using Speckle.ProxyGenerator.Extensions; -namespace ProxyInterfaceSourceGenerator.FileGenerators; +namespace Speckle.ProxyGenerator.FileGenerators; internal partial class ProxyClassesGenerator { diff --git a/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.Mapster.cs b/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.Mapster.cs index 154d66f..4a2a628 100644 --- a/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.Mapster.cs +++ b/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.Mapster.cs @@ -1,7 +1,7 @@ using System.Text; -using ProxyInterfaceSourceGenerator.Extensions; +using Speckle.ProxyGenerator.Extensions; -namespace ProxyInterfaceSourceGenerator.FileGenerators; +namespace Speckle.ProxyGenerator.FileGenerators; internal partial class ProxyClassesGenerator { diff --git a/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.cs b/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.cs index 4e9a0bc..e559580 100644 --- a/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.cs +++ b/src/Speckle.ProxyGenerator/FileGenerators/ProxyClassesGenerator.cs @@ -1,14 +1,14 @@ using System.Diagnostics.CodeAnalysis; using System.Text; using Microsoft.CodeAnalysis; -using ProxyInterfaceSourceGenerator.Builders; -using ProxyInterfaceSourceGenerator.Enums; -using ProxyInterfaceSourceGenerator.Extensions; -using ProxyInterfaceSourceGenerator.Models; -using ProxyInterfaceSourceGenerator.Types; -using ProxyInterfaceSourceGenerator.Utils; +using Speckle.ProxyGenerator.Builders; +using Speckle.ProxyGenerator.Enums; +using Speckle.ProxyGenerator.Extensions; +using Speckle.ProxyGenerator.Models; +using Speckle.ProxyGenerator.Types; +using Speckle.ProxyGenerator.Utils; -namespace ProxyInterfaceSourceGenerator.FileGenerators; +namespace Speckle.ProxyGenerator.FileGenerators; internal partial class ProxyClassesGenerator : BaseGenerator, IFilesGenerator { @@ -215,7 +215,7 @@ operators} if (method.IsOverride && method.OverriddenMethod != null) { var baseType = method.OverriddenMethod.ContainingType.GetFullType(); - if (TryGetNamedTypeSymbolByFullName(TypeKind.Class, baseType, Enumerable.Empty(), out _)) + if (TryGetNamedTypeSymbolByFullName(TypeKind.Class, baseType, [], out _)) { overrideOrVirtual = "override "; } diff --git a/src/Speckle.ProxyGenerator/Models/ClassSymbol.cs b/src/Speckle.ProxyGenerator/Models/ClassSymbol.cs index 74fd141..bc0cd99 100644 --- a/src/Speckle.ProxyGenerator/Models/ClassSymbol.cs +++ b/src/Speckle.ProxyGenerator/Models/ClassSymbol.cs @@ -1,6 +1,6 @@ using Microsoft.CodeAnalysis; -namespace ProxyInterfaceSourceGenerator.Models; +namespace Speckle.ProxyGenerator.Models; internal record ClassSymbol(INamedTypeSymbol Symbol, List BaseTypes, List Interfaces) { diff --git a/src/Speckle.ProxyGenerator/Models/ConstraintInfo.cs b/src/Speckle.ProxyGenerator/Models/ConstraintInfo.cs index 7a0506a..0863e0d 100644 --- a/src/Speckle.ProxyGenerator/Models/ConstraintInfo.cs +++ b/src/Speckle.ProxyGenerator/Models/ConstraintInfo.cs @@ -1,4 +1,4 @@ -namespace ProxyInterfaceSourceGenerator.Models; +namespace Speckle.ProxyGenerator.Models; internal record ConstraintInfo(string Type, List Items) { diff --git a/src/Speckle.ProxyGenerator/Models/Context.cs b/src/Speckle.ProxyGenerator/Models/Context.cs index f08797c..e0712c0 100644 --- a/src/Speckle.ProxyGenerator/Models/Context.cs +++ b/src/Speckle.ProxyGenerator/Models/Context.cs @@ -1,7 +1,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax; -namespace ProxyInterfaceSourceGenerator.Models; +namespace Speckle.ProxyGenerator.Models; internal record Context { diff --git a/src/Speckle.ProxyGenerator/Models/FileData.cs b/src/Speckle.ProxyGenerator/Models/FileData.cs index 78598ea..4b68ed8 100644 --- a/src/Speckle.ProxyGenerator/Models/FileData.cs +++ b/src/Speckle.ProxyGenerator/Models/FileData.cs @@ -1,3 +1,3 @@ -namespace ProxyInterfaceSourceGenerator.Models; +namespace Speckle.ProxyGenerator.Models; internal record FileData(string FileName, string Text); \ No newline at end of file diff --git a/src/Speckle.ProxyGenerator/Models/ProxyData.cs b/src/Speckle.ProxyGenerator/Models/ProxyData.cs index 5110cbe..5680312 100644 --- a/src/Speckle.ProxyGenerator/Models/ProxyData.cs +++ b/src/Speckle.ProxyGenerator/Models/ProxyData.cs @@ -1,6 +1,6 @@ -using ProxyInterfaceSourceGenerator.Types; +using Speckle.ProxyGenerator.Types; -namespace ProxyInterfaceSourceGenerator.Models; +namespace Speckle.ProxyGenerator.Models; internal class ProxyData { diff --git a/src/Speckle.ProxyGenerator/ProxyInterfaceCodeGenerator.cs b/src/Speckle.ProxyGenerator/ProxyInterfaceCodeGenerator.cs index e63dee5..1f2d9d9 100644 --- a/src/Speckle.ProxyGenerator/ProxyInterfaceCodeGenerator.cs +++ b/src/Speckle.ProxyGenerator/ProxyInterfaceCodeGenerator.cs @@ -2,11 +2,11 @@ using System.Text; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Text; -using ProxyInterfaceSourceGenerator.FileGenerators; -using ProxyInterfaceSourceGenerator.Models; -using ProxyInterfaceSourceGenerator.SyntaxReceiver; +using Speckle.ProxyGenerator.FileGenerators; +using Speckle.ProxyGenerator.Models; +using Speckle.ProxyGenerator.SyntaxReceiver; -namespace ProxyInterfaceSourceGenerator; +namespace Speckle.ProxyGenerator; [Generator] #if DEBUG diff --git a/src/Speckle.ProxyGenerator/SyntaxReceiver/AttributeArgumentListParser.cs b/src/Speckle.ProxyGenerator/SyntaxReceiver/AttributeArgumentListParser.cs index 52b5eae..7dee24a 100644 --- a/src/Speckle.ProxyGenerator/SyntaxReceiver/AttributeArgumentListParser.cs +++ b/src/Speckle.ProxyGenerator/SyntaxReceiver/AttributeArgumentListParser.cs @@ -1,12 +1,11 @@ +using System.Diagnostics.CodeAnalysis; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; -using ProxyInterfaceSourceGenerator.Extensions; -using ProxyInterfaceSourceGenerator.Types; -using System.Diagnostics.CodeAnalysis; -using System.Reflection; +using Speckle.ProxyGenerator.Extensions; +using Speckle.ProxyGenerator.Types; -namespace ProxyInterfaceSourceGenerator.SyntaxReceiver; +namespace Speckle.ProxyGenerator.SyntaxReceiver; internal static class AttributeArgumentListParser { @@ -108,7 +107,7 @@ internal static class AttributeArgumentListParser value = strings.ToArray(); return true; } - value = Array.Empty(); + value = []; return false; } -} \ No newline at end of file +} diff --git a/src/Speckle.ProxyGenerator/SyntaxReceiver/ProxySyntaxReceiver.cs b/src/Speckle.ProxyGenerator/SyntaxReceiver/ProxySyntaxReceiver.cs index 1294b5e..ae93caa 100644 --- a/src/Speckle.ProxyGenerator/SyntaxReceiver/ProxySyntaxReceiver.cs +++ b/src/Speckle.ProxyGenerator/SyntaxReceiver/ProxySyntaxReceiver.cs @@ -1,16 +1,16 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax; -using ProxyInterfaceSourceGenerator.Extensions; -using ProxyInterfaceSourceGenerator.Models; +using Speckle.ProxyGenerator.Extensions; +using Speckle.ProxyGenerator.Models; -namespace ProxyInterfaceSourceGenerator.SyntaxReceiver; +namespace Speckle.ProxyGenerator.SyntaxReceiver; internal class ProxySyntaxReceiver : ISyntaxContextReceiver { private const string GlobalPrefix = "global::"; - private static readonly string[] GenerateProxyAttributes = { "ProxyInterfaceGenerator.Proxy", "Proxy" }; - private static readonly string[] Modifiers = { "public", "partial" }; + private static readonly string[] GenerateProxyAttributes = ["ProxyInterfaceGenerator.Proxy", "Proxy"]; + private static readonly string[] Modifiers = ["public", "partial"]; public IDictionary CandidateInterfaces { get; } = new Dictionary(); public void OnVisitSyntaxNode(GeneratorSyntaxContext context) @@ -83,4 +83,4 @@ internal class ProxySyntaxReceiver : ISyntaxContextReceiver return true; } -} \ No newline at end of file +} diff --git a/src/Speckle.ProxyGenerator/Types/FluentBuilderAttributeArguments.cs b/src/Speckle.ProxyGenerator/Types/FluentBuilderAttributeArguments.cs index b1af428..a5d3e4d 100644 --- a/src/Speckle.ProxyGenerator/Types/FluentBuilderAttributeArguments.cs +++ b/src/Speckle.ProxyGenerator/Types/FluentBuilderAttributeArguments.cs @@ -1,9 +1,9 @@ -namespace ProxyInterfaceSourceGenerator.Types; +namespace Speckle.ProxyGenerator.Types; internal record ProxyInterfaceGeneratorAttributeArguments(string FullyQualifiedDisplayString, string MetadataName) { public bool ProxyBaseClasses { get; set; } public ProxyClassAccessibility Accessibility { get; set; } - public string[] MembersToIgnore { get; set; } = Array.Empty(); -} \ No newline at end of file + public string[] MembersToIgnore { get; set; } = []; +} diff --git a/src/Speckle.ProxyGenerator/Types/ProxyInterfaceGeneratorAccessibility.cs b/src/Speckle.ProxyGenerator/Types/ProxyInterfaceGeneratorAccessibility.cs index 3fb156e..7077b99 100644 --- a/src/Speckle.ProxyGenerator/Types/ProxyInterfaceGeneratorAccessibility.cs +++ b/src/Speckle.ProxyGenerator/Types/ProxyInterfaceGeneratorAccessibility.cs @@ -1,4 +1,4 @@ -namespace ProxyInterfaceSourceGenerator.Types; +namespace Speckle.ProxyGenerator.Types; [Flags] internal enum ProxyClassAccessibility diff --git a/src/Speckle.ProxyGenerator/Utils/MemberHelper.cs b/src/Speckle.ProxyGenerator/Utils/MemberHelper.cs index 2eb4a60..d235b2a 100644 --- a/src/Speckle.ProxyGenerator/Utils/MemberHelper.cs +++ b/src/Speckle.ProxyGenerator/Utils/MemberHelper.cs @@ -1,11 +1,11 @@ using Microsoft.CodeAnalysis; -using ProxyInterfaceSourceGenerator.Models; +using Speckle.ProxyGenerator.Models; -namespace ProxyInterfaceSourceGenerator.Utils; +namespace Speckle.ProxyGenerator.Utils; internal static class MemberHelper { - private static readonly string[] ExcludedMethods = { "ToString", "GetHashCode" }; + private static readonly string[] ExcludedMethods = ["ToString", "GetHashCode"]; public static IReadOnlyList GetPublicProperties( ClassSymbol classSymbol, diff --git a/src/Speckle.ProxyGenerator/Utils/NamespaceHelper.cs b/src/Speckle.ProxyGenerator/Utils/NamespaceHelper.cs index 3f48f5d..0491523 100644 --- a/src/Speckle.ProxyGenerator/Utils/NamespaceHelper.cs +++ b/src/Speckle.ProxyGenerator/Utils/NamespaceHelper.cs @@ -1,4 +1,4 @@ -namespace ProxyInterfaceSourceGenerator.Utils; +namespace Speckle.ProxyGenerator.Utils; internal static class NamespaceBuilder { diff --git a/tests/ProxyInterfaceSourceGeneratorTests/AkkaTests.cs b/tests/ProxyInterfaceSourceGeneratorTests/AkkaTests.cs index f2118ba..39b6c62 100644 --- a/tests/ProxyInterfaceSourceGeneratorTests/AkkaTests.cs +++ b/tests/ProxyInterfaceSourceGeneratorTests/AkkaTests.cs @@ -2,7 +2,7 @@ using CSharp.SourceGenerators.Extensions; using CSharp.SourceGenerators.Extensions.Models; using CultureAwareTesting.xUnit; using FluentAssertions; -using ProxyInterfaceSourceGenerator; +using Speckle.ProxyGenerator; namespace ProxyInterfaceSourceGeneratorTests; diff --git a/tests/ProxyInterfaceSourceGeneratorTests/InheritedInterfaceTests.cs b/tests/ProxyInterfaceSourceGeneratorTests/InheritedInterfaceTests.cs index 05bd250..9db5276 100644 --- a/tests/ProxyInterfaceSourceGeneratorTests/InheritedInterfaceTests.cs +++ b/tests/ProxyInterfaceSourceGeneratorTests/InheritedInterfaceTests.cs @@ -3,8 +3,8 @@ using CSharp.SourceGenerators.Extensions.Models; using FluentAssertions; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax; -using ProxyInterfaceSourceGenerator; using ProxyInterfaceSourceGeneratorTests.Source.Disposable; +using Speckle.ProxyGenerator; using Xunit.Abstractions; namespace ProxyInterfaceSourceGeneratorTests; diff --git a/tests/ProxyInterfaceSourceGeneratorTests/PnPTests.cs b/tests/ProxyInterfaceSourceGeneratorTests/PnPTests.cs index 2b0132c..5aeee73 100644 --- a/tests/ProxyInterfaceSourceGeneratorTests/PnPTests.cs +++ b/tests/ProxyInterfaceSourceGeneratorTests/PnPTests.cs @@ -3,7 +3,7 @@ using System.Linq; using CSharp.SourceGenerators.Extensions; using CSharp.SourceGenerators.Extensions.Models; using FluentAssertions; -using ProxyInterfaceSourceGenerator; +using Speckle.ProxyGenerator; using Xunit; namespace ProxyInterfaceSourceGeneratorTests; diff --git a/tests/ProxyInterfaceSourceGeneratorTests/ProxyInterfaceSourceGeneratorTest.cs b/tests/ProxyInterfaceSourceGeneratorTests/ProxyInterfaceSourceGeneratorTest.cs index 79d4467..c6be8ea 100644 --- a/tests/ProxyInterfaceSourceGeneratorTests/ProxyInterfaceSourceGeneratorTest.cs +++ b/tests/ProxyInterfaceSourceGeneratorTests/ProxyInterfaceSourceGeneratorTest.cs @@ -2,8 +2,8 @@ using System.Runtime.CompilerServices; using CSharp.SourceGenerators.Extensions; using CSharp.SourceGenerators.Extensions.Models; using FluentAssertions; -using ProxyInterfaceSourceGenerator; using ProxyInterfaceSourceGeneratorTests.Source; +using Speckle.ProxyGenerator; namespace ProxyInterfaceSourceGeneratorTests;