Skip to content

Commit ca7ccd2

Browse files
authored
Merge pull request #3378 from pavel-mikula-sonarsource/patch-1
Fix ignored Namespace attribute in OperationLightupGenerator
2 parents 0b40032 + 6b7b40d commit ca7ccd2

File tree

7 files changed

+10
-7
lines changed

7 files changed

+10
-7
lines changed

StyleCop.Analyzers/StyleCop.Analyzers.CodeGeneration/OperationLightupGenerator.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private void GenerateOperationInterface(in SourceProductionContext context, Inte
7070
variables: SyntaxFactory.SingletonSeparatedList(SyntaxFactory.VariableDeclarator(
7171
identifier: SyntaxFactory.Identifier("WrappedTypeName"),
7272
argumentList: null,
73-
initializer: SyntaxFactory.EqualsValueClause(SyntaxFactory.LiteralExpression(SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal("Microsoft.CodeAnalysis.Operations." + node.InterfaceName))))))));
73+
initializer: SyntaxFactory.EqualsValueClause(SyntaxFactory.LiteralExpression(SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal($"Microsoft.CodeAnalysis.{node.Namespace}.{node.InterfaceName}"))))))));
7474

7575
// private static readonly Type WrappedType;
7676
members = members.Add(SyntaxFactory.FieldDeclaration(
@@ -989,6 +989,7 @@ public InterfaceData(DocumentData documentData, XElement node, ImmutableArray<(s
989989

990990
this.OperationKinds = operationKinds;
991991
this.InterfaceName = node.Attribute("Name").Value;
992+
this.Namespace = node.Attribute("Namespace")?.Value ?? "Operations";
992993
this.Name = this.InterfaceName.Substring("I".Length, this.InterfaceName.Length - "I".Length - "Operation".Length);
993994
this.WrapperName = this.InterfaceName + "Wrapper";
994995
this.BaseInterfaceName = node.Attribute("Base").Value;
@@ -1000,6 +1001,8 @@ public InterfaceData(DocumentData documentData, XElement node, ImmutableArray<(s
10001001

10011002
public string InterfaceName { get; }
10021003

1004+
public string Namespace { get; }
1005+
10031006
public string Name { get; }
10041007

10051008
public string WrapperName { get; }

StyleCop.Analyzers/StyleCop.Analyzers/Lightup/.generated/StyleCop.Analyzers.CodeGeneration/StyleCop.Analyzers.CodeGeneration.OperationLightupGenerator/ICaughtExceptionOperationWrapper.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
99

1010
internal readonly struct ICaughtExceptionOperationWrapper : IOperationWrapper
1111
{
12-
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.ICaughtExceptionOperation";
12+
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.ICaughtExceptionOperation";
1313
private static readonly Type WrappedType;
1414
private readonly IOperation operation;
1515
static ICaughtExceptionOperationWrapper()

StyleCop.Analyzers/StyleCop.Analyzers/Lightup/.generated/StyleCop.Analyzers.CodeGeneration/StyleCop.Analyzers.CodeGeneration.OperationLightupGenerator/IFlowAnonymousFunctionOperationWrapper.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
99

1010
internal readonly struct IFlowAnonymousFunctionOperationWrapper : IOperationWrapper
1111
{
12-
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.IFlowAnonymousFunctionOperation";
12+
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.IFlowAnonymousFunctionOperation";
1313
private static readonly Type WrappedType;
1414
private static readonly Func<IOperation, IMethodSymbol> SymbolAccessor;
1515
private readonly IOperation operation;

StyleCop.Analyzers/StyleCop.Analyzers/Lightup/.generated/StyleCop.Analyzers.CodeGeneration/StyleCop.Analyzers.CodeGeneration.OperationLightupGenerator/IFlowCaptureOperationWrapper.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
99

1010
internal readonly struct IFlowCaptureOperationWrapper : IOperationWrapper
1111
{
12-
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.IFlowCaptureOperation";
12+
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureOperation";
1313
private static readonly Type WrappedType;
1414
private static readonly Func<IOperation, IOperation> ValueAccessor;
1515
private readonly IOperation operation;

StyleCop.Analyzers/StyleCop.Analyzers/Lightup/.generated/StyleCop.Analyzers.CodeGeneration/StyleCop.Analyzers.CodeGeneration.OperationLightupGenerator/IFlowCaptureReferenceOperationWrapper.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
99

1010
internal readonly struct IFlowCaptureReferenceOperationWrapper : IOperationWrapper
1111
{
12-
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.IFlowCaptureReferenceOperation";
12+
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.IFlowCaptureReferenceOperation";
1313
private static readonly Type WrappedType;
1414
private readonly IOperation operation;
1515
static IFlowCaptureReferenceOperationWrapper()

StyleCop.Analyzers/StyleCop.Analyzers/Lightup/.generated/StyleCop.Analyzers.CodeGeneration/StyleCop.Analyzers.CodeGeneration.OperationLightupGenerator/IIsNullOperationWrapper.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
99

1010
internal readonly struct IIsNullOperationWrapper : IOperationWrapper
1111
{
12-
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.IIsNullOperation";
12+
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.IIsNullOperation";
1313
private static readonly Type WrappedType;
1414
private static readonly Func<IOperation, IOperation> OperandAccessor;
1515
private readonly IOperation operation;

StyleCop.Analyzers/StyleCop.Analyzers/Lightup/.generated/StyleCop.Analyzers.CodeGeneration/StyleCop.Analyzers.CodeGeneration.OperationLightupGenerator/IStaticLocalInitializationSemaphoreOperationWrapper.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace StyleCop.Analyzers.Lightup
99

1010
internal readonly struct IStaticLocalInitializationSemaphoreOperationWrapper : IOperationWrapper
1111
{
12-
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.Operations.IStaticLocalInitializationSemaphoreOperation";
12+
internal const string WrappedTypeName = "Microsoft.CodeAnalysis.FlowAnalysis.IStaticLocalInitializationSemaphoreOperation";
1313
private static readonly Type WrappedType;
1414
private static readonly Func<IOperation, ILocalSymbol> LocalAccessor;
1515
private readonly IOperation operation;

0 commit comments

Comments
 (0)