Skip to content

Fix ignored Namespace attribute in OperationLightupGenerator #3378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2021
Merged

Fix ignored Namespace attribute in OperationLightupGenerator #3378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1788ede
Fix ignored Namespace attribute in OperationLightupGenerator
pavel-mikula-sonarsource Aug 24, 2021
6b7b40d
Update generated files
pavel-mikula-sonarsource Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion StyleCop.Analyzers/StyleCop.Analyzers.CodeGeneration/OperationLightupGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private void GenerateOperationInterface(in GeneratorExecutionContext context, In
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(
Expand Down Expand Up @@ -988,6 +988,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;
Expand All @@ -999,6 +1000,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; }
Expand Down
2 changes: 1 addition & 1 deletion ....Analyzers.CodeGeneration.OperationLightupGenerator/ICaughtExceptionOperationWrapper.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion ...zers.CodeGeneration.OperationLightupGenerator/IFlowAnonymousFunctionOperationWrapper.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...eCop.Analyzers.CodeGeneration.OperationLightupGenerator/IFlowCaptureOperationWrapper.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...yzers.CodeGeneration.OperationLightupGenerator/IFlowCaptureReferenceOperationWrapper.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion .../StyleCop.Analyzers.CodeGeneration.OperationLightupGenerator/IIsNullOperationWrapper.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ration.OperationLightupGenerator/IStaticLocalInitializationSemaphoreOperationWrapper.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down