[GH-138] - code cleanup

nsubstitute · Mar 22, 2020 · ebec1fc · ebec1fc
1 parent 36acc01
commit ebec1fc
Show file tree

Hide file tree

Showing 5 changed files with 160 additions and 151 deletions.
diff --git a/...e.Analyzers.CSharp/CodeRefactoringProviders/IntroduceSubstituteCodeRefactoringProvider.cs b/...e.Analyzers.CSharp/CodeRefactoringProviders/IntroduceSubstituteCodeRefactoringProvider.cs
@@ -13,10 +13,6 @@ namespace NSubstitute.Analyzers.CSharp.CodeRefactoringProviders
     [ExportCodeRefactoringProvider(LanguageNames.CSharp)]
     internal sealed class IntroduceSubstituteCodeRefactoringProvider : AbstractIntroduceSubstituteCodeRefactoringProvider<ObjectCreationExpressionSyntax, ArgumentListSyntax, ArgumentSyntax>
     {
-        protected override int ReadonlySubstituteDeclarationContainerRawKind { get; } = (int)SyntaxKind.ClassDeclaration;
-
-        protected override int LocalSubstituteDeclarationContainerRawKind { get; } = (int)SyntaxKind.Block;
-
         protected override IReadOnlyList<ArgumentSyntax> GetArgumentSyntaxNodes(ArgumentListSyntax argumentListSyntax, TextSpan span)
         {
             return argumentListSyntax.Arguments;
@@ -37,6 +33,23 @@ protected override ObjectCreationExpressionSyntax UpdateObjectCreationExpression
             return objectCreationExpressionSyntax.WithArgumentList(updatedArgumentList);
         }
 
+        protected override SyntaxNode FindSiblingNodeForLocalSubstitute(ObjectCreationExpressionSyntax creationExpression)
+        {
+            var container = creationExpression.Ancestors()
+                .FirstOrDefault(ancestor => ancestor.Kind() == SyntaxKind.Block);
+
+            return container?.ChildNodes().FirstOrDefault();
+        }
+
+        protected override SyntaxNode FindSiblingNodeForReadonlySubstitute(SyntaxNode creationExpression)
+        {
+            var typeDeclarationSyntax = creationExpression.Ancestors()
+                .OfType<TypeDeclarationSyntax>()
+                .FirstOrDefault();
+
+            return typeDeclarationSyntax?.Members.FirstOrDefault();
+        }
+
         private static ArgumentListSyntax UpdateArgumentListTrivia(
             ArgumentListSyntax originalArgumentList,
             ArgumentListSyntax updatedArgumentList)