Ignore ButtonType when computing an extracted method return type.

pkg/analysis_server/test/services/refactoring/extract_method_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.refactoring.extract_method;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/refactoring/extract_method.dart';
@@ skipping 1057 matching lines @@
   print(v);
 }
 ''');
     _createRefactoringForStartEndComments();
     // do check
     return refactoring.checkInitialConditions().then((_) {
       expect(refactoring.returnType, 'double');
     });
   }
 
+  test_returnType_statements_nullMix() {
+    indexTestUnit('''
+main(bool p) {
+// start
+  if (p) {
+    return 42;
+  }
+  return null;
+// end
+}
+''');
+    _createRefactoringForStartEndComments();
+    // do check
+    return refactoring.checkInitialConditions().then((_) {
+      expect(refactoring.returnType, 'int');
+    });
+  }
+
   test_returnType_statements_void() {
     indexTestUnit('''
 main() {
 // start
   print(42);
 // end
 }
 ''');
     _createRefactoringForStartEndComments();
     // do check
@@ skipping 1359 matching lines @@
    * Returns a deep copy of [refactoring] parameters.
    * There was a bug masked by updating parameter instances shared between the
    * refactoring and the test.
    */
   List<RefactoringMethodParameter> _getParametersCopy() {
     return refactoring.parameters.map((p) {
       return new RefactoringMethodParameter(p.kind, p.type, p.name, id: p.id);
     }).toList();
   }
 }