Refactor model namespaces and update imports (#362)

ChrisPulman · web-flow · commit 6222fa494d31 · 2026-01-12T21:42:25.000+11:00
Moved several model classes from 'ReactiveUI.SourceGenerators.Input.Models', 'ReactiveUI.SourceGenerators.Reactive.Models', and 'ReactiveUI.SourceGenerators.ObservableAsProperty.Models' to 'ReactiveUI.SourceGenerators.Models'. Updated all related using statements and namespace declarations to reflect this change. Also updated references to RxSchedulers in ReactiveCommandGenerator for clarity and global namespace usage. This improves code organization and consistency across source generators.
diff --git a/src/ReactiveUI.SourceGenerators.Execute/TestViewModel.cs b/src/ReactiveUI.SourceGenerators.Execute/TestViewModel.cs
@@ -7,7 +7,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Reactive;
 using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
 using System.Reactive.Disposables.Fluent;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
@@ -16,7 +15,6 @@
 using DynamicData;
 using ReactiveUI;
 using ReactiveUI.SourceGenerators;
-using SGReactiveUI.SourceGenerators.Execute.Nested3;
 
 namespace SGReactiveUI.SourceGenerators.Test;
 
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/IViewFor/IViewForGenerator.Execute.cs b/src/ReactiveUI.SourceGenerators.Roslyn/IViewFor/IViewForGenerator.Execute.cs
@@ -12,7 +12,6 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using ReactiveUI.SourceGenerators.Extensions;
 using ReactiveUI.SourceGenerators.Helpers;
-using ReactiveUI.SourceGenerators.Input.Models;
 using ReactiveUI.SourceGenerators.Models;
 
 namespace ReactiveUI.SourceGenerators;
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/IViewFor/IViewForGenerator.cs b/src/ReactiveUI.SourceGenerators.Roslyn/IViewFor/IViewForGenerator.cs
@@ -49,7 +49,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             if (groupedPropertyInfo.Length == 0)
             {
                 // Even if there are no views, emit an empty extension to keep API stable.
-                var empty = GenerateRegistrationExtensions(ImmutableArray.Create<Input.Models.IViewForInfo>());
+                var empty = GenerateRegistrationExtensions(ImmutableArray.Create<Models.IViewForInfo>());
                 context.AddSource(fileName, SourceText.From(empty, Encoding.UTF8));
                 return;
             }
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/IViewFor/Models/IViewForBaseType.cs b/src/ReactiveUI.SourceGenerators.Roslyn/IViewFor/Models/IViewForBaseType.cs
@@ -3,7 +3,7 @@
 // The ReactiveUI and contributors licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-namespace ReactiveUI.SourceGenerators.Input.Models;
+namespace ReactiveUI.SourceGenerators.Models;
 
 internal enum IViewForBaseType
 {
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/IViewFor/Models/IViewForInfo.cs b/src/ReactiveUI.SourceGenerators.Roslyn/IViewFor/Models/IViewForInfo.cs
@@ -3,9 +3,7 @@
 // The ReactiveUI and contributors licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using ReactiveUI.SourceGenerators.Models;
-
-namespace ReactiveUI.SourceGenerators.Input.Models;
+namespace ReactiveUI.SourceGenerators.Models;
 
 /// <summary>
 /// A model with gathered info on a given command method.
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ObservableAsProperty/Models/ObservableFieldInfo.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ObservableAsProperty/Models/ObservableFieldInfo.cs
@@ -4,9 +4,8 @@
 // See the LICENSE file in the project root for full license information.
 
 using ReactiveUI.SourceGenerators.Helpers;
-using ReactiveUI.SourceGenerators.Models;
 
-namespace ReactiveUI.SourceGenerators.Reactive.Models;
+namespace ReactiveUI.SourceGenerators.Models;
 
 /// <summary>
 /// A model with gathered info on a given field.
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ObservableAsProperty/Models/ObservableMethodInfo.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ObservableAsProperty/Models/ObservableMethodInfo.cs
@@ -5,9 +5,8 @@
 
 using System.Globalization;
 using ReactiveUI.SourceGenerators.Helpers;
-using ReactiveUI.SourceGenerators.Models;
 
-namespace ReactiveUI.SourceGenerators.ObservableAsProperty.Models
+namespace ReactiveUI.SourceGenerators.Models
 {
     internal record ObservableMethodInfo(
         TargetInfo TargetInfo,
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ObservableAsProperty/ObservableAsPropertyGenerator{FromField}.Execute.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ObservableAsProperty/ObservableAsPropertyGenerator{FromField}.Execute.cs
@@ -4,16 +4,13 @@
 // See the LICENSE file in the project root for full license information.
 
 using System;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using ReactiveUI.SourceGenerators.Extensions;
 using ReactiveUI.SourceGenerators.Helpers;
 using ReactiveUI.SourceGenerators.Models;
-using ReactiveUI.SourceGenerators.Reactive.Models;
 using static ReactiveUI.SourceGenerators.Diagnostics.DiagnosticDescriptors;
 
 namespace ReactiveUI.SourceGenerators;
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ObservableAsProperty/ObservableAsPropertyGenerator{FromObservable}.Execute.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ObservableAsProperty/ObservableAsPropertyGenerator{FromObservable}.Execute.cs
@@ -3,15 +3,13 @@
 // The ReactiveUI and contributors licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using ReactiveUI.SourceGenerators.Extensions;
 using ReactiveUI.SourceGenerators.Helpers;
 using ReactiveUI.SourceGenerators.Models;
-using ReactiveUI.SourceGenerators.ObservableAsProperty.Models;
 using static ReactiveUI.SourceGenerators.Diagnostics.DiagnosticDescriptors;
 
 namespace ReactiveUI.SourceGenerators;
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/Reactive/Models/PropertyInfo.cs b/src/ReactiveUI.SourceGenerators.Roslyn/Reactive/Models/PropertyInfo.cs
@@ -4,9 +4,8 @@
 // See the LICENSE file in the project root for full license information.
 
 using ReactiveUI.SourceGenerators.Helpers;
-using ReactiveUI.SourceGenerators.Models;
 
-namespace ReactiveUI.SourceGenerators.Reactive.Models;
+namespace ReactiveUI.SourceGenerators.Models;
 
 /// <summary>
 /// A model with gathered info on a given field.
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/Reactive/ReactiveGenerator.Execute.cs b/src/ReactiveUI.SourceGenerators.Roslyn/Reactive/ReactiveGenerator.Execute.cs
@@ -12,7 +12,6 @@
 using ReactiveUI.SourceGenerators.Extensions;
 using ReactiveUI.SourceGenerators.Helpers;
 using ReactiveUI.SourceGenerators.Models;
-using ReactiveUI.SourceGenerators.Reactive.Models;
 using static ReactiveUI.SourceGenerators.Diagnostics.DiagnosticDescriptors;
 
 namespace ReactiveUI.SourceGenerators;
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCollection/Models/ReactiveCollectionFieldInfo.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCollection/Models/ReactiveCollectionFieldInfo.cs
@@ -4,9 +4,8 @@
 // See the LICENSE file in the project root for full license information.
 
 using ReactiveUI.SourceGenerators.Helpers;
-using ReactiveUI.SourceGenerators.Models;
 
-namespace ReactiveUI.SourceGenerators.Reactive.Models;
+namespace ReactiveUI.SourceGenerators.Models;
 
 /// <summary>
 /// A model with gathered info on a given field.
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCollection/ReactiveCollectionGenerator.Execute.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCollection/ReactiveCollectionGenerator.Execute.cs
@@ -13,7 +13,6 @@
 using ReactiveUI.SourceGenerators.Extensions;
 using ReactiveUI.SourceGenerators.Helpers;
 using ReactiveUI.SourceGenerators.Models;
-using ReactiveUI.SourceGenerators.Reactive.Models;
 using static ReactiveUI.SourceGenerators.Diagnostics.DiagnosticDescriptors;
 
 namespace ReactiveUI.SourceGenerators;
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCommand/Models/CanExecuteTypeInfo.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCommand/Models/CanExecuteTypeInfo.cs
@@ -3,7 +3,7 @@
 // The ReactiveUI and contributors licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
-namespace ReactiveUI.SourceGenerators.Input.Models;
+namespace ReactiveUI.SourceGenerators.Models;
 
 internal enum CanExecuteTypeInfo
 {
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCommand/Models/CommandInfo.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCommand/Models/CommandInfo.cs
@@ -4,9 +4,8 @@
 // See the LICENSE file in the project root for full license information.
 
 using ReactiveUI.SourceGenerators.Helpers;
-using ReactiveUI.SourceGenerators.Models;
 
-namespace ReactiveUI.SourceGenerators.Input.Models;
+namespace ReactiveUI.SourceGenerators.Models;
 
 internal record CommandInfo(
     TargetInfo TargetInfo,
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCommand/ReactiveCommandGenerator.Execute.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ReactiveCommand/ReactiveCommandGenerator.Execute.cs
@@ -13,7 +13,6 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using ReactiveUI.SourceGenerators.Extensions;
 using ReactiveUI.SourceGenerators.Helpers;
-using ReactiveUI.SourceGenerators.Input.Models;
 using ReactiveUI.SourceGenerators.Models;
 
 namespace ReactiveUI.SourceGenerators;
@@ -27,16 +26,16 @@ public partial class ReactiveCommandGenerator
     internal static readonly string GeneratorName = typeof(ReactiveCommandGenerator).FullName!;
     internal static readonly string GeneratorVersion = typeof(ReactiveCommandGenerator).Assembly.GetName().Version.ToString();
 
-    private const string ReactiveUI = "ReactiveUI";
+    private const string ReactiveUI = "global::ReactiveUI";
     private const string ReactiveCommand = "ReactiveCommand";
     private const string RxCmd = ReactiveUI + "." + ReactiveCommand;
     private const string Create = ".Create";
     private const string CreateO = ".CreateFromObservable";
     private const string CreateT = ".CreateFromTask";
     private const string CanExecute = "CanExecute";
     private const string OutputScheduler = "OutputScheduler";
-    private const string MainThreadScheduler = "RxSchedulers.MainThreadScheduler";
-    private const string TaskpoolScheduler = "RxSchedulers.TaskpoolScheduler";
+    private const string MainThreadScheduler = ReactiveUI + ".RxSchedulers.MainThreadScheduler";
+    private const string TaskpoolScheduler = ReactiveUI + ".RxSchedulers.TaskpoolScheduler";
 
     private static CommandInfo? GetMethodInfo(in GeneratorAttributeSyntaxContext context, CancellationToken token)
     {
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/RoutedControlHost/Models/RoutedControlHostInfo.cs b/src/ReactiveUI.SourceGenerators.Roslyn/RoutedControlHost/Models/RoutedControlHostInfo.cs
@@ -5,7 +5,7 @@
 
 using ReactiveUI.SourceGenerators.Helpers;
 
-namespace ReactiveUI.SourceGenerators.Input.Models;
+namespace ReactiveUI.SourceGenerators.Models;
 
 /// <summary>
 /// A model with gathered info on a given command method.
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/RoutedControlHost/RoutedControlHostGenerator.Execute.cs b/src/ReactiveUI.SourceGenerators.Roslyn/RoutedControlHost/RoutedControlHostGenerator.Execute.cs
@@ -12,7 +12,6 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using ReactiveUI.SourceGenerators.Extensions;
 using ReactiveUI.SourceGenerators.Helpers;
-using ReactiveUI.SourceGenerators.Input.Models;
 using ReactiveUI.SourceGenerators.Models;
 
 namespace ReactiveUI.SourceGenerators.WinForms;
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/RoutedControlHost/RoutedControlHostGenerator.cs b/src/ReactiveUI.SourceGenerators.Roslyn/RoutedControlHost/RoutedControlHostGenerator.cs
@@ -9,7 +9,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Text;
-using ReactiveUI.SourceGenerators.Extensions;
 using ReactiveUI.SourceGenerators.Helpers;
 
 namespace ReactiveUI.SourceGenerators.WinForms;
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ViewModelControlHost/Models/ViewModelControlHostInfo.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ViewModelControlHost/Models/ViewModelControlHostInfo.cs
@@ -5,7 +5,7 @@
 
 using ReactiveUI.SourceGenerators.Helpers;
 
-namespace ReactiveUI.SourceGenerators.Input.Models;
+namespace ReactiveUI.SourceGenerators.Models;
 
 /// <summary>
 /// A model with gathered info on a given command method.
diff --git a/src/ReactiveUI.SourceGenerators.Roslyn/ViewModelControlHost/ViewModelControlHostGenerator.Execute.cs b/src/ReactiveUI.SourceGenerators.Roslyn/ViewModelControlHost/ViewModelControlHostGenerator.Execute.cs
@@ -12,7 +12,6 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using ReactiveUI.SourceGenerators.Extensions;
 using ReactiveUI.SourceGenerators.Helpers;
-using ReactiveUI.SourceGenerators.Input.Models;
 using ReactiveUI.SourceGenerators.Models;
 
 namespace ReactiveUI.SourceGenerators.WinForms;

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)`
`49`	`49`	`if (groupedPropertyInfo.Length == 0)`
`50`	`50`	`{`
`51`	`51`	`// Even if there are no views, emit an empty extension to keep API stable.`
`52`		`- var empty = GenerateRegistrationExtensions(ImmutableArray.Create<Input.Models.IViewForInfo>());`
	`52`	`+ var empty = GenerateRegistrationExtensions(ImmutableArray.Create<Models.IViewForInfo>());`
`53`	`53`	`context.AddSource(fileName, SourceText.From(empty, Encoding.UTF8));`
`54`	`54`	`return;`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`// The ReactiveUI and contributors licenses this file to you under the MIT license.`
`4`	`4`	`// See the LICENSE file in the project root for full license information.`
`5`	`5`
`6`		`-namespace ReactiveUI.SourceGenerators.Input.Models;`
	`6`	`+namespace ReactiveUI.SourceGenerators.Models;`
`7`	`7`
`8`	`8`	`internal enum IViewForBaseType`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,8 @@`
`5`	`5`
`6`	`6`	`using System.Globalization;`
`7`	`7`	`using ReactiveUI.SourceGenerators.Helpers;`
`8`		`-using ReactiveUI.SourceGenerators.Models;`
`9`	`8`
`10`		`-namespace ReactiveUI.SourceGenerators.ObservableAsProperty.Models`
	`9`	`+namespace ReactiveUI.SourceGenerators.Models`
`11`	`10`	`{`
`12`	`11`	`internal record ObservableMethodInfo(`
`13`	`12`	`TargetInfo TargetInfo,`