Skip to content

Commit 7dd1f8e

Browse files
committed
Merge pull request #4 from sharwell/pr-1813
Update AccessLevelHelper for AccessorDeclarationSyntax to match existing patterns
2 parents f7696f8 + 89a8707 commit 7dd1f8e

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

StyleCop.Analyzers/StyleCop.Analyzers/Helpers/AccessLevelHelper.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ internal static Accessibility GetDeclaredAccessibility(this AccessorDeclarationS
245245
return accessLevel.ToAccessibility();
246246
}
247247

248-
BasePropertyDeclarationSyntax propertyDefinition = syntax.FirstAncestorOrSelf<BasePropertyDeclarationSyntax>();
249-
return propertyDefinition.GetDeclaredAccessibility(semanticModel, cancellationToken);
248+
ISymbol declaredSymbol = semanticModel.GetDeclaredSymbol(syntax, cancellationToken);
249+
return declaredSymbol?.DeclaredAccessibility ?? Accessibility.NotApplicable;
250250
}
251251

252252
internal static Accessibility GetDeclaredAccessibility(this BaseFieldDeclarationSyntax syntax, SemanticModel semanticModel, CancellationToken cancellationToken)
@@ -369,13 +369,13 @@ internal static Accessibility GetEffectiveAccessibility(this AccessorDeclaration
369369
return declaredAccessibility;
370370
}
371371

372-
BaseTypeDeclarationSyntax enclosingType = syntax.FirstAncestorOrSelf<BaseTypeDeclarationSyntax>();
373-
if (enclosingType == null)
372+
BasePropertyDeclarationSyntax enclosingProperty = syntax.Parent.Parent as BasePropertyDeclarationSyntax;
373+
if (enclosingProperty == null)
374374
{
375375
return declaredAccessibility;
376376
}
377377

378-
Accessibility enclosingAccessibility = enclosingType.GetEffectiveAccessibility(semanticModel, cancellationToken);
378+
Accessibility enclosingAccessibility = enclosingProperty.GetEffectiveAccessibility(semanticModel, cancellationToken);
379379
return CombineEffectiveAccessibility(declaredAccessibility, enclosingAccessibility);
380380
}
381381

0 commit comments

Comments
 (0)