Convert server to use RangeFactory

pkg/analysis_server/lib/src/services/refactoring/convert_method_to_getter.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 services.src.refactoring.convert_method_to_getter;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol_server.dart' hide Element;
-import 'package:analysis_server/src/services/correction/source_range.dart';
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring.dart';
 import 'package:analysis_server/src/services/refactoring/refactoring_internal.dart';
 import 'package:analysis_server/src/services/search/hierarchy.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/element/ast_provider.dart';
 import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 /**
  * [ConvertMethodToGetterRefactoring] implementation.
  */
 class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
     implements ConvertMethodToGetterRefactoring {
   final SearchEngine searchEngine;
   final AstProvider astProvider;
   final ExecutableElement element;
 
@@ skipping 76 matching lines @@
         return;
       }
     }
     // insert "get "
     {
       SourceEdit edit = new SourceEdit(element.nameOffset, 0, 'get ');
       doSourceChange_addElementEdit(change, element, edit);
     }
     // remove parameters
     {
-      SourceEdit edit = newSourceEdit_range(rangeNode(parameters), '');
+      SourceEdit edit = newSourceEdit_range(range.node(parameters), '');
       doSourceChange_addElementEdit(change, element, edit);
     }
   }
 
   Future<Null> _updateElementReferences(Element element) async {
     List<SearchMatch> matches = await searchEngine.searchReferences(element);
     List<SourceReference> references = getSourceReferences(matches);
     for (SourceReference reference in references) {
       Element refElement = reference.element;
       SourceRange refRange = reference.range;
       // prepare invocation
       MethodInvocation invocation;
       {
         CompilationUnit refUnit =
             await astProvider.getParsedUnitForElement(refElement);
         AstNode refNode =
             new NodeLocator(refRange.offset).searchWithin(refUnit);
         invocation = refNode.getAncestor((node) => node is MethodInvocation);
       }
       // we need invocation
       if (invocation != null) {
-        SourceRange range = rangeEndEnd(refRange, invocation);
-        SourceEdit edit = newSourceEdit_range(range, '');
+        SourceEdit edit = newSourceEdit_range(
+            range.offsetEndIndex(refRange.end, invocation.end), '');
         doSourceChange_addElementEdit(change, refElement, edit);
       }
     }
   }
 }