Fix detection of bad catch-clauses and try-statements

pkg/analysis_server/test/services/completion/statement/statement_completion_test.dart

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library test.services.completion.statement;
 
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/services/completion/statement/statement_completion.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:test/test.dart';
@@ skipping 574 matching lines @@
   }
 }
 ''',
         (s) => _after(s, 'in '));
   }
 }
 
 @reflectiveTest
 class _IfCompletionTest extends StatementCompletionTest {
   test_afterCondition_BAD() async {
-    // TODO(messick): Fix the code to make this like test_completeIfWithCondition.
-    // Recap: Finding the node at the selectionOffset returns the block, not the
-    // if-statement. Need to understand if that only happens when the if-statement
-    // is the only statement in the block, or perhaps first or last? And what
-    // happens when it is in the middle of other statements?
+    // TODO(messick) Stop inserting the space after the closing brace.
     await _prepareCompletion(
         'if (true) ', // Trigger completion after space.
         '''
 main() {
   if (true) ////
 }
 ''',
         atEnd: true);
     _assertHasChange(
-        // Note: This is not what we want.
-        'Insert a newline at the end of the current line',
+        'Complete if-statement',
         '''
 main() {
-  if (true) ////
-  }
+  if (true) {
+    ////
+  } ////
 }
 ''',
-        (s) => _after(s, 'if (true) '));
+        (s) => _after(s, '    '));
   }
 
   test_emptyCondition() async {
     await _prepareCompletion(
         'if ()',
         '''
 main() {
   if ()
 }
 ''',
@@ skipping 202 matching lines @@
 }
 ''',
         (s) => _after(s, 'switch ('));
   }
 }
 
 @reflectiveTest
 class _TryCompletionTest extends StatementCompletionTest {
   test_catchOnly() async {
     await _prepareCompletion(
-        'catch',
+        '{} catch',
         '''
 main() {
   try {
   } catch(e){} catch ////
 }
 ''',
         atEnd: true);
     _assertHasChange(
         'Complete try-statement',
         '''
 main() {
   try {
   } catch(e){} catch () {
     ////
   }
 }
 ''',
         (s) => _after(s, 'catch ('));
   }
 
+  test_catchSecond() async {
+    await _prepareCompletion(
+        '} catch ',
+        '''
+main() {
+  try {
+  } catch() {
+  } catch(e){} catch ////
+}
+''',
+        atEnd: true);
+    _assertHasChange(
+        'Complete try-statement',
+        '''
+main() {
+  try {
+  } catch() {
+  } catch(e){} catch () {
+    ////
+  }
+}
+''',
+        (s) => _afterLast(s, 'catch ('));
+  }
+
   test_finallyOnly() async {
     await _prepareCompletion(
         'finally',
         '''
 main() {
   try {
   } finally
 }
 ''',
         atEnd: true);
@@ skipping 194 matching lines @@
         '''
 main() {
   while () {
     ////
   }
 }
 ''',
         (s) => _after(s, 'while ('));
   }
 }