Change the ChangeBuilder API to use SourceRange

pkg/analysis_server/lib/src/utilities/change_builder_dart.dart

 // Copyright (c) 2015, 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.
 
 import 'dart:async';
 
 import 'package:analysis_server/protocol/protocol_generated.dart'
     hide Element, ElementKind;
 import 'package:analysis_server/src/provisional/edit/utilities/change_builder_core.dart';
 import 'package:analysis_server/src/provisional/edit/utilities/change_builder_dart.dart';
 import 'package:analysis_server/src/services/correction/name_suggestion.dart';
+import 'package:analysis_server/src/services/correction/source_range.dart';
 import 'package:analysis_server/src/services/correction/util.dart';
 import 'package:analysis_server/src/utilities/change_builder_core.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
@@ skipping 639 matching lines @@
         type.isDynamic ||
         type is InterfaceType && type.element == futureType.element) {
       return;
     }
     // prepare code for the types
     String futureTypeCode = utils.getTypeSource(futureType, librariesToImport);
     String nodeCode = utils.getNodeText(typeAnnotation);
     // wrap the existing type with Future
     String returnTypeCode =
         nodeCode == 'void' ? futureTypeCode : '$futureTypeCode<$nodeCode>';
-    addReplacement(typeAnnotation.offset, typeAnnotation.length,
-        (EditBuilder builder) {
+    addReplacement(rangeNode(typeAnnotation), (EditBuilder builder) {
       builder.write(returnTypeCode);
     });
   }
 
   /**
    * Create an edit to replace the return type of the innermost function
    * containing the given [node] with the type `Future`. The [typeProvider] is
    * used to check the current return type, because if it is already `Future` no
    * edit will be added.
    */
@@ skipping 35 matching lines @@
   void _addSuperTypesAsSuggestions(DartType type, Set<DartType> alreadyAdded) {
     if (type is InterfaceType && alreadyAdded.add(type)) {
       addSuggestion(LinkedEditSuggestionKind.TYPE, type.displayName);
       _addSuperTypesAsSuggestions(type.superclass, alreadyAdded);
       for (InterfaceType interfaceType in type.interfaces) {
         _addSuperTypesAsSuggestions(interfaceType, alreadyAdded);
       }
     }
   }
 }