Enable 'Surround with XYZ' only for Statement(s) in Block(s).

[email protected]

Change-Id: I6488bd699bb2375de3aed1171f89def23068ae17
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107781
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/services/correction/assist_internal.dart

@@ -3749,6 +3749,12 @@ class AssistProcessor {
           selectedStatements.add(selectedNode);
         }
       }
+      // we want only statements in blocks
+      for (var statement in selectedStatements) {
+        if (statement.parent is! Block) {
+          return;
+        }
+      }
       // we want only statements
       if (selectedStatements.isEmpty ||
           selectedStatements.length != selectedNodes.length) {

pkg/analysis_server/test/src/services/correction/assist/surround_with_block_test.dart

@@ -19,6 +19,18 @@ class SurroundWithBlockTest extends AssistProcessorTest {
   @override
   AssistKind get kind => DartAssistKind.SURROUND_WITH_BLOCK;
 
+  test_notStatementInBlock() async {
+    await resolveTestUnit('''
+main() {
+  while (true)
+// start
+    print(0);
+// end
+}
+''');
+    await assertNoAssist();
+  }
+
   test_twoStatements() async {
     await resolveTestUnit('''
 main() {