Quick Fixes for unused catch clause/stack.

pkg/analysis_server/test/services/correction/fix_test.dart

 // Copyright (c) 2014, 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.correction.fix;
 
 import 'package:analysis_server/src/protocol.dart' hide AnalysisError;
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/parser.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:unittest/unittest.dart';
 
 import '../../abstract_context.dart';
 import '../../abstract_single_unit.dart';
 import '../../reflective_tests.dart';
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(FixProcessorTest);
 }
 
 typedef bool AnalysisErrorFilter(AnalysisError error);
 
 @reflectiveTest
 class FixProcessorTest extends AbstractSingleUnitTest {
-  AnalysisErrorFilter errorFilter = null;
+  AnalysisErrorFilter errorFilter = (AnalysisError error) {
+    return error.errorCode != HintCode.UNUSED_CATCH_CLAUSE &&
+        error.errorCode != HintCode.UNUSED_CATCH_STACK &&
+        error.errorCode != HintCode.UNUSED_ELEMENT &&
+        error.errorCode != HintCode.UNUSED_FIELD &&
+        error.errorCode != HintCode.UNUSED_LOCAL_VARIABLE;
+  };
 
   Fix fix;
   SourceChange change;
   String resultCode;
 
   void assert_undefinedFunction_create_returnType_bool(String lineWithTest) {
     resolveTestUnit('''
 main() {
   bool b = true;
   $lineWithTest
@@ skipping 2392 matching lines @@
 ''');
     assertHasFix(FixKind.REMOVE_UNNECASSARY_CAST, '''
 main(Object p) {
   if (p is String) {
     String v = p;
   }
 }
 ''');
   }
 
+  void test_removeUnusedCatchClause() {
+    errorFilter = (AnalysisError error) => true;
+    resolveTestUnit('''
+main() {
+  try {
+    throw 42;
+  } on int catch (e) {
+  }
+}
+''');
+    assertHasFix(FixKind.REMOVE_UNUSED_CATCH_CLAUSE, '''
+main() {
+  try {
+    throw 42;
+  } on int {
+  }
+}
+''');
+  }
+
+  void test_removeUnusedCatchStack() {
+    errorFilter = (AnalysisError error) => true;
+    resolveTestUnit('''
+main() {
+  try {
+    throw 42;
+  } catch (e, stack) {
+  }
+}
+''');
+    assertHasFix(FixKind.REMOVE_UNUSED_CATCH_STACK, '''
+main() {
+  try {
+    throw 42;
+  } catch (e) {
+  }
+}
+''');
+  }
+
   void test_removeUnusedImport() {
     resolveTestUnit('''
 import 'dart:math';
 main() {
 }
 ''');
     assertHasFix(FixKind.REMOVE_UNUSED_IMPORT, '''
 main() {
 }
 ''');
@@ skipping 981 matching lines @@
     UriResolver pkgResolver =
         new PackageMapUriResolver(provider, {'my_pkg': [myPkgFolder]});
     context.sourceFactory = new SourceFactory(
         [AbstractContextTest.SDK_RESOLVER, resourceResolver, pkgResolver]);
     // force 'my_pkg' resolution
     addSource('/tmp/other.dart', "import 'package:my_pkg/my_lib.dart';");
   }
 
   AnalysisError _findErrorToFix() {
     List<AnalysisError> errors = context.computeErrors(testSource);
-    errors.removeWhere((error) {
-      return error.errorCode == HintCode.UNUSED_CATCH_CLAUSE ||
-          error.errorCode == HintCode.UNUSED_CATCH_STACK ||
-          error.errorCode == HintCode.UNUSED_ELEMENT ||
-          error.errorCode == HintCode.UNUSED_FIELD ||
-          error.errorCode == HintCode.UNUSED_LOCAL_VARIABLE;
-    });
     if (errorFilter != null) {
       errors = errors.where(errorFilter).toList();
     }
     expect(errors, hasLength(1));
     return errors[0];
   }
 
   List<Position> _findResultPositions(List<String> searchStrings) {
     List<Position> positions = <Position>[];
     for (String search in searchStrings) {
       int offset = resultCode.indexOf(search);
       positions.add(new Position(testFile, offset));
     }
     return positions;
   }
 }