Merge pull request #3378 from pavel-mikula-sonarsource/patch-1

Fix ignored Namespace attribute in OperationLightupGenerator
DotNetAnalyzers · Dec 9, 2021 · ca7ccd2 · ca7ccd2
2 parents 0b40032 + 6b7b40d
commit ca7ccd2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.CodeGeneration/OperationLightupGenerator.cs b/StyleCop.Analyzers/StyleCop.Analyzers.CodeGeneration/OperationLightupGenerator.cs
@@ -70,7 +70,7 @@ private void GenerateOperationInterface(in SourceProductionContext context, Inte
                     variables: SyntaxFactory.SingletonSeparatedList(SyntaxFactory.VariableDeclarator(
                         identifier: SyntaxFactory.Identifier("WrappedTypeName"),
                         argumentList: null,
-                        initializer: SyntaxFactory.EqualsValueClause(SyntaxFactory.LiteralExpression(SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal("Microsoft.CodeAnalysis.Operations." + node.InterfaceName))))))));
+                        initializer: SyntaxFactory.EqualsValueClause(SyntaxFactory.LiteralExpression(SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal($"Microsoft.CodeAnalysis.{node.Namespace}.{node.InterfaceName}"))))))));
 
             // private static readonly Type WrappedType;
             members = members.Add(SyntaxFactory.FieldDeclaration(
@@ -989,6 +989,7 @@ public InterfaceData(DocumentData documentData, XElement node, ImmutableArray<(s
 
                 this.OperationKinds = operationKinds;
                 this.InterfaceName = node.Attribute("Name").Value;
+                this.Namespace = node.Attribute("Namespace")?.Value ?? "Operations";
                 this.Name = this.InterfaceName.Substring("I".Length, this.InterfaceName.Length - "I".Length - "Operation".Length);
                 this.WrapperName = this.InterfaceName + "Wrapper";
                 this.BaseInterfaceName = node.Attribute("Base").Value;
@@ -1000,6 +1001,8 @@ public InterfaceData(DocumentData documentData, XElement node, ImmutableArray<(s
 
             public string InterfaceName { get; }
 
+            public string Namespace { get; }
+
             public string Name { get; }
 
             public string WrapperName { get; }

diff --git a/....Analyzers.CodeGeneration.OperationLightupGenerator/ICaughtExceptionOperationWrapper.g.cs b/....Analyzers.CodeGeneration.OperationLightupGenerator/ICaughtExceptionOperationWrapper.g.cs
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
 
     internal readonly struct ICaughtExceptionOperationWrapper : IOperationWrapper
     {
-        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.ICaughtExceptionOperation";
+        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.ICaughtExceptionOperation";
         private static readonly Type WrappedType;
         private readonly IOperation operation;
         static ICaughtExceptionOperationWrapper()

diff --git a/...zers.CodeGeneration.OperationLightupGenerator/IFlowAnonymousFunctionOperationWrapper.g.cs b/...zers.CodeGeneration.OperationLightupGenerator/IFlowAnonymousFunctionOperationWrapper.g.cs
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
 
     internal readonly struct IFlowAnonymousFunctionOperationWrapper : IOperationWrapper
     {
-        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.IFlowAnonymousFunctionOperation";
+        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.IFlowAnonymousFunctionOperation";
         private static readonly Type WrappedType;
         private static readonly Func<IOperation, IMethodSymbol> SymbolAccessor;
         private readonly IOperation operation;

diff --git a/...eCop.Analyzers.CodeGeneration.OperationLightupGenerator/IFlowCaptureOperationWrapper.g.cs b/...eCop.Analyzers.CodeGeneration.OperationLightupGenerator/IFlowCaptureOperationWrapper.g.cs
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
 
     internal readonly struct IFlowCaptureOperationWrapper : IOperationWrapper
     {
-        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.IFlowCaptureOperation";
+        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureOperation";
         private static readonly Type WrappedType;
         private static readonly Func<IOperation, IOperation> ValueAccessor;
         private readonly IOperation operation;

diff --git a/...yzers.CodeGeneration.OperationLightupGenerator/IFlowCaptureReferenceOperationWrapper.g.cs b/...yzers.CodeGeneration.OperationLightupGenerator/IFlowCaptureReferenceOperationWrapper.g.cs
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
 
     internal readonly struct IFlowCaptureReferenceOperationWrapper : IOperationWrapper
     {
-        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.IFlowCaptureReferenceOperation";
+        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureReferenceOperation";
         private static readonly Type WrappedType;
         private readonly IOperation operation;
         static IFlowCaptureReferenceOperationWrapper()

diff --git a/.../StyleCop.Analyzers.CodeGeneration.OperationLightupGenerator/IIsNullOperationWrapper.g.cs b/.../StyleCop.Analyzers.CodeGeneration.OperationLightupGenerator/IIsNullOperationWrapper.g.cs
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
 
     internal readonly struct IIsNullOperationWrapper : IOperationWrapper
     {
-        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.IIsNullOperation";
+        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.IIsNullOperation";
         private static readonly Type WrappedType;
         private static readonly Func<IOperation, IOperation> OperandAccessor;
         private readonly IOperation operation;

diff --git a/...ration.OperationLightupGenerator/IStaticLocalInitializationSemaphoreOperationWrapper.g.cs b/...ration.OperationLightupGenerator/IStaticLocalInitializationSemaphoreOperationWrapper.g.cs
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
 
     internal readonly struct IStaticLocalInitializationSemaphoreOperationWrapper : IOperationWrapper
     {
-        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.IStaticLocalInitializationSemaphoreOperation";
+        internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.IStaticLocalInitializationSemaphoreOperation";
         private static readonly Type WrappedType;
         private static readonly Func<IOperation, ILocalSymbol> LocalAccessor;
         private readonly IOperation operation;