21.1.3 seald class modifires (#9)

* SealdClassModifires

* FixTest

* AddAppendIf

* AppendRefactoring

* Revert "AppendRefactoring"

This reverts commit 5c32436.

* Refactoring

Author: BelousovSer

DevExpress.Mvvm.CodeGenerators.Tests/TestSource/GenerationTests.cs

@@ -313,7 +313,8 @@ public object? ParentViewModel {
         IServiceContainer? serviceContainer;
         protected IServiceContainer ServiceContainer { get => serviceContainer ??= new ServiceContainer(this); }
         IServiceContainer ISupportServices.ServiceContainer { get => ServiceContainer; }
-        T? GetService<T>() where T : class => ServiceContainer.GetService<T>();
+        protected T? GetService<T>() where T : class => ServiceContainer.GetService<T>();
+        protected T? GetRequiredService<T>() where T : class => ServiceContainer.GetRequiredService<T>();
 
         protected void RaisePropertyChanged(PropertyChangedEventArgs e) => PropertyChanged?.Invoke(this, e);
         protected void RaisePropertyChanging(PropertyChangingEventArgs e) => PropertyChanging?.Invoke(this, e);
@@ -406,6 +407,23 @@ public DelegateCommand<int> Command3Command {
 
         }
 #endif
+        [Test]
+        public void PrivateInSealedClass() {
+            const string source =
+@"using DevExpress.Mvvm.CodeGenerators; 
+
+namespace Test {
+    [GenerateViewModel(ImplementINotifyPropertyChanging = true, ImplementISupportParentViewModel = true, ImplementISupportServices = true, ImplementIDataErrorInfo = true)]
+    sealed partial class SealdClass {
+    [GenerateProperty]
+    string str;
+    [GenerateCommand]
+    public void Command1(int arg) { }
+    }
+}";
+            var generated = GenerateCode(source);
+            StringAssert.DoesNotContain("protected", generated);
+        }
 
         [Test, Category("TODO")]
         public void CommonLanguageVersionTest() {

DevExpress.Mvvm.CodeGenerators/DevExpress.Mvvm.CodeGenerators.csproj

@@ -70,7 +70,7 @@
   <PropertyGroup>
     <Title>DevExpress.Mvvm.CodeGenerators</Title>
     <Product>DevExpress.Mvvm.CodeGenerators</Product>
-    <Version>21.1.2</Version>
+    <Version>21.1.3</Version>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Company>Developer Express Inc.</Company>
   </PropertyGroup>

DevExpress.Mvvm.CodeGenerators/Generators/ClassGenerator.cs

@@ -43,7 +43,7 @@ public static void GenerateSourceCode(SourceBuilder source, ContextInfo contextI
             if(implISS) {
                 mvvmComponentsList.Add("ISupportServices");
                 if(contextInfo.IsMvvmAvailable && !ClassHelper.IsInterfaceImplementedInCurrentClass(classSymbol, contextInfo.ISSSymbol!))
-                    interfaces.Add(new ISupportServicesGenerator());
+                    interfaces.Add(new ISupportServicesGenerator(classSymbol.IsSealed));
             }
 
             List<ITypeSymbol> genericTypes = new();
@@ -107,10 +107,14 @@ static SourceBuilder GenerateHeader(SourceBuilder source, INamedTypeSymbol class
             } else
                 source.AppendLine(" {");
             source = source.Tab;
+            const string protectedModifier = "protected ";
+            bool isSealed = classSymbol.IsSealed;
             if(!string.IsNullOrEmpty(raiseChangedMethod))
-                source.AppendMultipleLines(raiseChangedMethod!);
+                source.AppendIf(!isSealed, protectedModifier)
+                      .AppendMultipleLines(raiseChangedMethod!);
             if(!string.IsNullOrEmpty(raiseChangingMethod))
-                source.AppendMultipleLines(raiseChangingMethod!);
+                source.AppendIf(!isSealed, protectedModifier)
+                      .AppendMultipleLines(raiseChangingMethod!);
             if(!string.IsNullOrEmpty(raiseChangedMethod) || !string.IsNullOrEmpty(raiseChangingMethod))
                 source.AppendLine();
             return source;

DevExpress.Mvvm.CodeGenerators/Generators/InterfaceGenerator.cs

@@ -44,12 +44,19 @@ public object? ParentViewModel {
         }
     }
     class ISupportServicesGenerator : IInterfaceGenerator {
-        const string Implementation = @"IServiceContainer? serviceContainer;
-protected IServiceContainer ServiceContainer { get => serviceContainer ??= new ServiceContainer(this); }
-IServiceContainer ISupportServices.ServiceContainer { get => ServiceContainer; }
-T? GetService<T>() where T : class => ServiceContainer.GetService<T>();";
+        const string protectedModifier = "protected ";
+        readonly bool isSealed;
+        public ISupportServicesGenerator(bool isSealed) => this.isSealed = isSealed;
         public string GetName() => "ISupportServices";
-        public void AppendImplementation(SourceBuilder source) => source.AppendMultipleLines(Implementation);
-
+        public void AppendImplementation(SourceBuilder source) {
+            source.AppendLine("IServiceContainer? serviceContainer;")
+                  .AppendIf(!isSealed, protectedModifier)
+                  .AppendMultipleLines(@"IServiceContainer ServiceContainer { get => serviceContainer ??= new ServiceContainer(this); }
+IServiceContainer ISupportServices.ServiceContainer { get => ServiceContainer; }");
+            source.AppendIf(!isSealed, protectedModifier)
+                  .AppendLine("T? GetService<T>() where T : class => ServiceContainer.GetService<T>();")
+                  .AppendIf(!isSealed, protectedModifier)
+                  .AppendLine("T? GetRequiredService<T>() where T : class => ServiceContainer.GetRequiredService<T>();");
+        }
     }
 }

DevExpress.Mvvm.CodeGenerators/Helpers/SourceBuilder.cs

@@ -65,6 +65,8 @@ void BeforeAppend() {
     }
 
     public static class SourceBuilderExtensions {
+        public static SourceBuilder AppendIf(this SourceBuilder builder, bool condition, string str) => condition ? builder.Append(str) : builder;
+
         public static SourceBuilder AppendLine(this SourceBuilder builder, string str) => builder.Append(str).AppendLine();
 
         public static void AppendMultipleLines(this SourceBuilder builder, string lines, bool trimLeadingWhiteSpace = false) {

DevExpress.Mvvm.CodeGenerators/Info/INPCInfo.cs

@@ -18,15 +18,15 @@ public static INPCInfo GetINPCedInfo(ContextInfo info, INamedTypeSymbol classSym
                          symbol => AttributeHelper.HasAttribute(symbol, info.ViewModelAttributeSymbol),
                          "RaisePropertyChanged",
                          "System.ComponentModel.PropertyChangedEventArgs",
-                         "protected void RaisePropertyChanged(PropertyChangedEventArgs e) => PropertyChanged?.Invoke(this, e);");
+                         "void RaisePropertyChanged(PropertyChangedEventArgs e) => PropertyChanged?.Invoke(this, e);");
         public static INPCInfo GetINPCingInfo(ContextInfo info, INamedTypeSymbol classSymbol) =>
             new INPCInfo(classSymbol,
                          info.INPCingSymbol,
                          symbol => AttributeHelper.HasAttribute(symbol, info.ViewModelAttributeSymbol) &&
                                    AttributeHelper.GetPropertyActualValue(symbol, info.ViewModelAttributeSymbol, AttributesGenerator.ImplementINPCing, false),
                          "RaisePropertyChanging",
                          "System.ComponentModel.PropertyChangingEventArgs",
-                         "protected void RaisePropertyChanging(PropertyChangingEventArgs e) => PropertyChanging?.Invoke(this, e);");
+                         "void RaisePropertyChanging(PropertyChangingEventArgs e) => PropertyChanging?.Invoke(this, e);");
 
         public bool HasNoImplementation() =>
             HasAttribute && !hasImplementation;