Skip to content

Commit 915923d

Browse files
GeertvanHorrikGeertvanHorrik
committed
Rename
1 parent 617d237 commit 915923d

7 files changed

+32
-32
lines changed

src/Catel.SourceGenerators.Tests/XamlConstructors/UserControlConstructorSourceGeneratorTests.Generates_Constructors_When_No_Constructors#MyUserControl_UserControlConstructors.g.verified.cs renamed to src/Catel.SourceGenerators.Tests/XamlConstructors/ViewConstructorSourceGeneratorTests.Generates_Constructors_When_No_Constructors#MyUserControl_ViewConstructors.g.verified.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//HintName: MyUserControl_UserControlConstructors.g.cs
1+
//HintName: MyUserControl_ViewConstructors.g.cs
22
using System;
33
using System.Runtime.CompilerServices;
44
using Microsoft.Extensions.DependencyInjection;
@@ -12,7 +12,7 @@ namespace MyNamespace
1212
{
1313
partial class MyUserControl
1414
{
15-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.UserControlConstructors", "1.0.0.0")]
15+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.ViewConstructors", "1.0.0.0")]
1616
private static T GetService<T>()
1717
where T : class
1818
{
@@ -24,7 +24,7 @@ private static T GetService<T>()
2424
return Catel.IoC.IoCContainer.ServiceProvider.GetRequiredService<T>();
2525
}
2626

27-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.UserControlConstructors", "1.0.0.0")]
27+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.ViewConstructors", "1.0.0.0")]
2828
private static void InitializeViewPropertyMappings()
2929
{
3030
if (CatelEnvironment.IsInDesignMode)
@@ -35,7 +35,7 @@ private static void InitializeViewPropertyMappings()
3535
typeof(MyUserControl).AutoDetectViewPropertiesToSubscribe(IoCContainer.ServiceProvider.GetRequiredService<IViewPropertySelector>());
3636
}
3737

38-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.UserControlConstructors", "1.0.0.0")]
38+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.ViewConstructors", "1.0.0.0")]
3939
static MyUserControl()
4040
{
4141
InitializeViewPropertyMappings();
@@ -45,7 +45,7 @@ static MyUserControl()
4545

4646
partial void OnInitializedComponent();
4747

48-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.UserControlConstructors", "1.0.0.0")]
48+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.ViewConstructors", "1.0.0.0")]
4949
public MyUserControl(MyNamespace.ILogger<MyNamespace.MyUserControl> logger, MyNamespace.IUserControlWrapperService userControlWrapperService)
5050
: base(logger, userControlWrapperService)
5151
{
@@ -54,13 +54,13 @@ public MyUserControl(MyNamespace.ILogger<MyNamespace.MyUserControl> logger, MyNa
5454
OnInitializedComponent();
5555
}
5656

57-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.UserControlConstructors", "1.0.0.0")]
57+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.ViewConstructors", "1.0.0.0")]
5858
public MyUserControl()
5959
: this(GetService<MyNamespace.ILogger<MyNamespace.MyUserControl>>(), GetService<MyNamespace.IUserControlWrapperService>())
6060
{
6161
}
6262

63-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.UserControlConstructors", "1.0.0.0")]
63+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.ViewConstructors", "1.0.0.0")]
6464
public MyUserControl(Catel.MVVM.IViewModel? viewModel, MyNamespace.ILogger<MyNamespace.MyUserControl> logger, MyNamespace.IUserControlWrapperService userControlWrapperService)
6565
: base(viewModel, logger, userControlWrapperService)
6666
{

src/Catel.SourceGenerators.Tests/XamlConstructors/UserControlConstructorSourceGeneratorTests.Generates_Empty_Constructor_And_Attributes_For_UserControl#MyUserControl_UserControlConstructors.g.verified.cs renamed to src/Catel.SourceGenerators.Tests/XamlConstructors/ViewConstructorSourceGeneratorTests.Generates_Empty_Constructor_And_Attributes_For_UserControl#MyUserControl_ViewConstructors.g.verified.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//HintName: MyUserControl_UserControlConstructors.g.cs
1+
//HintName: MyUserControl_ViewConstructors.g.cs
22
using System;
33
using System.Runtime.CompilerServices;
44
using Microsoft.Extensions.DependencyInjection;
@@ -12,7 +12,7 @@ namespace MyNamespace
1212
{
1313
partial class MyUserControl
1414
{
15-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.UserControlConstructors", "1.0.0.0")]
15+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.ViewConstructors", "1.0.0.0")]
1616
private static T GetService<T>()
1717
where T : class
1818
{
@@ -24,7 +24,7 @@ private static T GetService<T>()
2424
return Catel.IoC.IoCContainer.ServiceProvider.GetRequiredService<T>();
2525
}
2626

27-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.UserControlConstructors", "1.0.0.0")]
27+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.ViewConstructors", "1.0.0.0")]
2828
private static void InitializeViewPropertyMappings()
2929
{
3030
if (CatelEnvironment.IsInDesignMode)
@@ -35,13 +35,13 @@ private static void InitializeViewPropertyMappings()
3535
typeof(MyUserControl).AutoDetectViewPropertiesToSubscribe(IoCContainer.ServiceProvider.GetRequiredService<IViewPropertySelector>());
3636
}
3737

38-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.UserControlConstructors", "1.0.0.0")]
38+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.ViewConstructors", "1.0.0.0")]
3939
static MyUserControl()
4040
{
4141
InitializeViewPropertyMappings();
4242
}
4343

44-
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.UserControlConstructors", "1.0.0.0")]
44+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Catel.ViewConstructors", "1.0.0.0")]
4545
public MyUserControl()
4646
: this(GetService<MyNamespace.ILogger<MyNamespace.MyUserControl>>(), GetService<MyNamespace.IUserControlWrapperService>())
4747
{

src/Catel.SourceGenerators.Tests/XamlConstructors/UserControlConstructorSourceGeneratorTests.already_has_ctor.cs renamed to src/Catel.SourceGenerators.Tests/XamlConstructors/ViewConstructorSourceGeneratorTests.already_has_ctor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using VerifyNUnit;
1010

1111
[TestFixture]
12-
public partial class UserControlConstructorSourceGeneratorTests
12+
public partial class ViewConstructorSourceGeneratorTests
1313
{
1414
[Test]
1515
public async Task Generates_Nothing_When_Already_Has_Empty_Constructor_Parameters()
@@ -68,7 +68,7 @@ public class UserControl : System.Windows.Controls.UserControl
6868
iocContainerSource
6969
}.Select(x => CSharpSyntaxTree.ParseText(x)));
7070

71-
var generator = new UserControlConstructorsSourceGenerator();
71+
var generator = new ViewConstructorsSourceGenerator();
7272

7373
var driver = CSharpGeneratorDriver.Create(generator);
7474
return driver.RunGenerators(compilation);

src/Catel.SourceGenerators.Tests/XamlConstructors/UserControlConstructorSourceGeneratorTests.no_ctors.cs renamed to src/Catel.SourceGenerators.Tests/XamlConstructors/ViewConstructorSourceGeneratorTests.no_ctors.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using VerifyNUnit;
1010

1111
[TestFixture]
12-
public partial class UserControlConstructorSourceGeneratorTests
12+
public partial class ViewConstructorSourceGeneratorTests
1313
{
1414
[Test]
1515
public async Task Generates_Constructors_When_No_Constructors()
@@ -94,7 +94,7 @@ public class ProviderType
9494
iocContainerSource
9595
}.Select(x => CSharpSyntaxTree.ParseText(x)));
9696

97-
var generator = new UserControlConstructorsSourceGenerator();
97+
var generator = new ViewConstructorsSourceGenerator();
9898

9999
var driver = CSharpGeneratorDriver.Create(generator);
100100
return driver.RunGenerators(compilation);

src/Catel.SourceGenerators.Tests/XamlConstructors/UserControlConstructorSourceGeneratorTests.valid.cs renamed to src/Catel.SourceGenerators.Tests/XamlConstructors/ViewConstructorSourceGeneratorTests.valid.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using VerifyNUnit;
1010

1111
[TestFixture]
12-
public partial class UserControlConstructorSourceGeneratorTests
12+
public partial class ViewConstructorSourceGeneratorTests
1313
{
1414
[Test]
1515
public async Task Generates_Empty_Constructor_And_Attributes_For_UserControl()
@@ -76,7 +76,7 @@ public class ProviderType
7676
iocContainerSource
7777
}.Select(x => CSharpSyntaxTree.ParseText(x)));
7878

79-
var generator = new UserControlConstructorsSourceGenerator();
79+
var generator = new ViewConstructorsSourceGenerator();
8080

8181
var driver = CSharpGeneratorDriver.Create(generator);
8282
return driver.RunGenerators(compilation);

src/Catel.SourceGenerators/XamlConstructors/UserControlConstructorsInfo.cs renamed to src/Catel.SourceGenerators/XamlConstructors/ViewConstructorsInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
using System;
44
using System.Collections.Generic;
55

6-
public readonly record struct UserControlConstructorsInfo : IEquatable<UserControlConstructorsInfo>
6+
public readonly record struct ViewConstructorsInfo : IEquatable<ViewConstructorsInfo>
77
{
88
public readonly string FileName;
99
public readonly string NamespaceName;
1010
public readonly string ClassName;
1111
public readonly bool CreateStaticConstructor;
1212
public readonly EquatableArray<ConstructorInfo> Constructors;
1313

14-
public UserControlConstructorsInfo(string fileName, string namespaceName, string className,
14+
public ViewConstructorsInfo(string fileName, string namespaceName, string className,
1515
bool createStaticConstructor, IReadOnlyList<ConstructorInfo> constructors)
1616
{
1717
FileName = fileName;
@@ -21,7 +21,7 @@ public UserControlConstructorsInfo(string fileName, string namespaceName, string
2121
Constructors = new(constructors);
2222
}
2323

24-
public bool Equals(UserControlConstructorsInfo other)
24+
public bool Equals(ViewConstructorsInfo other)
2525
{
2626
return NamespaceName == other.NamespaceName &&
2727
ClassName == other.ClassName &&

src/Catel.SourceGenerators/XamlConstructors/UserControlConstructorsSourceGenerator.cs renamed to src/Catel.SourceGenerators/XamlConstructors/ViewConstructorsSourceGenerator.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Microsoft.CodeAnalysis.Text;
1111

1212
[Generator]
13-
public class UserControlConstructorsSourceGenerator : IIncrementalGenerator
13+
public class ViewConstructorsSourceGenerator : IIncrementalGenerator
1414
{
1515
//private bool _isIoCContainerAvailable = false;
1616

@@ -63,7 +63,7 @@ private static bool IsSyntaxTargetForGeneration(SyntaxNode node)
6363
return true;
6464
}
6565

66-
private static UserControlConstructorsInfo? Transform(GeneratorSyntaxContext context)
66+
private static ViewConstructorsInfo? Transform(GeneratorSyntaxContext context)
6767
{
6868
var semanticModel = context.SemanticModel;
6969
if (semanticModel.IsCatelAssembly())
@@ -164,7 +164,7 @@ private static bool IsSyntaxTargetForGeneration(SyntaxNode node)
164164
}
165165
}
166166

167-
return new UserControlConstructorsInfo(
167+
return new ViewConstructorsInfo(
168168
classDeclarationSyntax.SyntaxTree.FilePath,
169169
classSymbol.ContainingNamespace.ToDisplayString(),
170170
classSymbol.Name,
@@ -185,7 +185,7 @@ private static bool IsSyntaxTargetForGeneration(SyntaxNode node)
185185
false, false))
186186
.ToArray();
187187

188-
var info = new UserControlConstructorsInfo(
188+
var info = new ViewConstructorsInfo(
189189
classDeclarationSyntax.SyntaxTree.FilePath,
190190
classSymbol.ContainingNamespace.ToDisplayString(),
191191
classSymbol.Name,
@@ -194,7 +194,7 @@ private static bool IsSyntaxTargetForGeneration(SyntaxNode node)
194194
return info;
195195
}
196196

197-
private static void Execute(SourceProductionContext sourceProductionContext, UserControlConstructorsInfo? constructorInfo)
197+
private static void Execute(SourceProductionContext sourceProductionContext, ViewConstructorsInfo? constructorInfo)
198198
{
199199
if (constructorInfo is null)
200200
{
@@ -220,9 +220,9 @@ private static void Execute(SourceProductionContext sourceProductionContext, Use
220220
sourceBuilder.AppendLine($"partial class {ctorsInfo.ClassName}");
221221
sourceBuilder.StartBlock();
222222

223-
sourceBuilder.AppendResolveServiceMethod("UserControlConstructors");
223+
sourceBuilder.AppendResolveServiceMethod("ViewConstructors");
224224

225-
sourceBuilder.AppendGeneratedCodeAttribute("UserControlConstructors");
225+
sourceBuilder.AppendGeneratedCodeAttribute("ViewConstructors");
226226
sourceBuilder.AppendLine("private static void InitializeViewPropertyMappings()");
227227
sourceBuilder.StartBlock();
228228
sourceBuilder.AppendLine("if (CatelEnvironment.IsInDesignMode)");
@@ -237,7 +237,7 @@ private static void Execute(SourceProductionContext sourceProductionContext, Use
237237

238238
if (ctorsInfo.CreateStaticConstructor)
239239
{
240-
sourceBuilder.AppendGeneratedCodeAttribute("UserControlConstructors");
240+
sourceBuilder.AppendGeneratedCodeAttribute("ViewConstructors");
241241
sourceBuilder.AppendLine($"static {ctorsInfo.ClassName}()");
242242
sourceBuilder.StartBlock();
243243
sourceBuilder.AppendLine("InitializeViewPropertyMappings();");
@@ -260,7 +260,7 @@ private static void Execute(SourceProductionContext sourceProductionContext, Use
260260
sourceBuilder.AppendLine();
261261
}
262262

263-
sourceBuilder.AppendGeneratedCodeAttribute("UserControlConstructors");
263+
sourceBuilder.AppendGeneratedCodeAttribute("ViewConstructors");
264264

265265
if (ctorInfo.IsActivatorUtilitiesConstructor)
266266
{
@@ -281,7 +281,7 @@ private static void Execute(SourceProductionContext sourceProductionContext, Use
281281
else
282282
{
283283
// Generate empty constructor
284-
sourceBuilder.AppendGeneratedCodeAttribute("UserControlConstructors");
284+
sourceBuilder.AppendGeneratedCodeAttribute("ViewConstructors");
285285
sourceBuilder.AppendLine($"public {ctorsInfo.ClassName}()");
286286
sourceBuilder.Append(" : this(");
287287
sourceBuilder.Append(string.Join(", ", ctorInfo.Parameters.Select(p =>
@@ -315,7 +315,7 @@ private static void Execute(SourceProductionContext sourceProductionContext, Use
315315
fileName = ctorsInfo.ClassName;
316316
}
317317

318-
sourceProductionContext.AddSource($"{fileName}_UserControlConstructors.g.cs", SourceText.From(sourceBuilder.ToString(), Encoding.UTF8));
318+
sourceProductionContext.AddSource($"{fileName}_ViewConstructors.g.cs", SourceText.From(sourceBuilder.ToString(), Encoding.UTF8));
319319
}
320320
}
321321
}

0 commit comments

Comments
 (0)