Inline

dotnet · Dec 6, 2024 · d378f4a · d378f4a
1 parent dbfff7f
commit d378f4a
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/...eatures/Core/Portable/CodeRefactorings/MoveType/AbstractMoveTypeService.MoveTypeEditor.cs b/...eatures/Core/Portable/CodeRefactorings/MoveType/AbstractMoveTypeService.MoveTypeEditor.cs
@@ -133,7 +133,7 @@ private async Task<Document> AddNewDocumentWithSingleTypeDeclarationAsync(Docume
             var membersToRemove = GetMembersToRemove(root);
             foreach (var member in membersToRemove)
             {
-                AddCorrespondingDirectives(syntaxFacts, member, correspondingDirectives);
+                AddCorrespondingDirectives(member, correspondingDirectives);
                 documentEditor.RemoveNode(member, SyntaxRemoveOptions.KeepNoTrivia);
             }
 
@@ -168,6 +168,19 @@ private async Task<Document> AddNewDocumentWithSingleTypeDeclarationAsync(Docume
                 newDocument, FileName, document, this.CancellationToken).ConfigureAwait(false);
 
             return newDocumentWithUpdatedBanner;
+
+            void AddCorrespondingDirectives(SyntaxNode member, HashSet<SyntaxNode> directives)
+            {
+                foreach (var trivia in member.GetLeadingTrivia())
+                {
+                    if (trivia.IsDirective)
+                    {
+                        directives.AddIfNotNull(syntaxFacts.GetMatchingDirective(trivia.GetStructure()!, this.CancellationToken));
+                        foreach (var directive in syntaxFacts.GetMatchingConditionalDirectives(trivia.GetStructure()!, this.CancellationToken))
+                            directives.Add(directive);
+                    }
+                }
+            }
         }
 
         private void RemoveLeadingBlankLinesFromMovedType(DocumentEditor documentEditor)
@@ -183,22 +196,6 @@ private void RemoveLeadingBlankLinesFromMovedType(DocumentEditor documentEditor)
                 });
         }
 
-        private void AddCorrespondingDirectives(
-            ISyntaxFactsService syntaxFacts,
-            SyntaxNode member,
-            HashSet<SyntaxNode> directives)
-        {
-            foreach (var trivia in member.GetLeadingTrivia())
-            {
-                if (trivia.IsDirective)
-                {
-                    directives.AddIfNotNull(syntaxFacts.GetMatchingDirective(trivia.GetStructure()!, this.CancellationToken));
-                    foreach (var directive in syntaxFacts.GetMatchingConditionalDirectives(trivia.GetStructure()!, this.CancellationToken))
-                        directives.Add(directive);
-                }
-            }
-        }
-
         /// <summary>
         /// Add a trailing newline if we don't already have one if that's what the user's 
         /// preference is.