Convert server to use RangeFactory

pkg/analysis_server/lib/src/services/completion/statement/statement_completion.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 services.src.completion.statement;
 
 import 'dart:async';
 
 import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/protocol_server.dart' hide Element;
 import 'package:analysis_server/src/services/correction/source_buffer.dart';
-import 'package:analysis_server/src/services/correction/source_range.dart';
 import 'package:analysis_server/src/services/correction/util.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/error/error.dart';
 import 'package:analyzer/error/error.dart' as engine;
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/error/hint_codes.dart';
 import 'package:analyzer/src/dart/error/syntactic_errors.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 /**
  * An enumeration of possible statement completion kinds.
  */
 class DartStatementCompletion {
   static const NO_COMPLETION =
       const StatementCompletionKind('No_COMPLETION', 'No completion available');
   static const SIMPLE_ENTER = const StatementCompletionKind(
       'SIMPLE_ENTER', "Insert a newline at the end of the current line");
   static const SIMPLE_SEMICOLON = const StatementCompletionKind(
@@ skipping 325 matching lines @@
     }
     DoStatement statement = node;
     SourceBuilder sb = _sourceBuilderAfterKeyword(statement.doKeyword);
     bool hasWhileKeyword = statement.whileKeyword.lexeme == "while";
     int exitDelta = 0;
     if (!_statementHasValidBody(statement.doKeyword, statement.body)) {
       String text = utils.getNodeText(statement.body);
       int delta = 0;
       if (text.startsWith(';')) {
         delta = 1;
-        _addReplaceEdit(rangeStartLength(statement.body.offset, delta), '');
+        _addReplaceEdit(range.startLength(statement.body, delta), '');
         if (hasWhileKeyword) {
           text = utils.getNodeText(statement);
           if (text.indexOf(new RegExp(r'do\s*;\s*while')) == 0) {
             int end = text.indexOf('while');
             int start = text.indexOf(';') + 1;
             delta += end - start - 1;
             _addReplaceEdit(
-                rangeStartLength(start + statement.offset, end - start), ' ');
+                new SourceRange(start + statement.offset, end - start), ' ');
           }
         }
         sb = new SourceBuilder(file, sb.offset + delta);
         sb.append(' ');
       }
       _appendEmptyBraces(sb,
           !(hasWhileKeyword && _isSyntheticExpression(statement.condition)));
       if (delta != 0) {
         exitDelta = sb.length - delta;
       }
@@ skipping 55 matching lines @@
     SourceBuilder sb =
         new SourceBuilder(file, forNode.rightParenthesis.offset + 1);
     AstNode name = forNode.identifier;
     name ??= forNode.loopVariable;
     String src = utils.getNodeText(forNode);
     if (name == null) {
       exitPosition = new Position(file, forNode.leftParenthesis.offset + 1);
       src = src.substring(forNode.leftParenthesis.offset - forNode.offset);
       if (src.startsWith(new RegExp(r'\(\s*in\s*\)'))) {
         _addReplaceEdit(
-            rangeStartEnd(forNode.leftParenthesis.offset + 1,
+            range.offsetEndIndex(forNode.leftParenthesis.offset + 1,
                 forNode.rightParenthesis.offset),
             ' in ');
       } else if (src.startsWith(new RegExp(r'\(\s*in'))) {
         _addReplaceEdit(
-            rangeStartEnd(
+            range.offsetEndIndex(
                 forNode.leftParenthesis.offset + 1, forNode.inKeyword.offset),
             ' ');
       }
     } else if (_isSyntheticExpression(forNode.iterable)) {
       exitPosition = new Position(file, forNode.rightParenthesis.offset + 1);
       src = src.substring(forNode.inKeyword.offset - forNode.offset);
       if (src.startsWith(new RegExp(r'in\s*\)'))) {
         _addReplaceEdit(
-            rangeStartEnd(forNode.inKeyword.offset + forNode.inKeyword.length,
+            range.offsetEndIndex(
+                forNode.inKeyword.offset + forNode.inKeyword.length,
                 forNode.rightParenthesis.offset),
             ' ');
       }
     }
     if (!_statementHasValidBody(forNode.forKeyword, forNode.body)) {
       sb.append(' ');
       _appendEmptyBraces(sb, exitPosition == null);
     }
     _insertBuilder(sb);
     _setCompletion(DartStatementCompletion.COMPLETE_FOR_EACH_STMT);
@@ skipping 24 matching lines @@
       } else if (!forNode.leftSeparator.isSynthetic) {
         if (_isSyntheticExpression(forNode.condition)) {
           exitPosition = _newPosition(forNode.leftSeparator.offset + 1);
           String text = utils
               .getNodeText(forNode)
               .substring(forNode.leftSeparator.offset - forNode.offset);
           if (text.startsWith(new RegExp(r';\s*\)'))) {
             // emptyCondition
             int end = text.indexOf(')');
             sb = new SourceBuilder(file, forNode.leftSeparator.offset);
-            _addReplaceEdit(rangeStartLength(sb.offset, end), '; ; ');
+            _addReplaceEdit(new SourceRange(sb.offset, end), '; ; ');
             delta = end - '; '.length;
           } else {
             // emptyInitializersEmptyCondition
             exitPosition = _newPosition(forNode.rightParenthesis.offset);
             sb = new SourceBuilder(file, forNode.rightParenthesis.offset);
           }
         } else {
           // emptyUpdaters
           exitPosition = _newPosition(forNode.rightSeparator.offset);
           sb = new SourceBuilder(file, forNode.rightSeparator.offset);
-          _addReplaceEdit(rangeStartLength(sb.offset, 0), '; ');
+          _addReplaceEdit(new SourceRange(sb.offset, 0), '; ');
           delta = -'; '.length;
         }
       } else if (_isSyntheticExpression(forNode.initialization)) {
         // emptyInitializers
         exitPosition = _newPosition(forNode.rightParenthesis.offset);
         sb = new SourceBuilder(file, forNode.rightParenthesis.offset);
       } else {
         int start = forNode.condition.offset + forNode.condition.length;
         String text =
             utils.getNodeText(forNode).substring(start - forNode.offset);
         if (text.startsWith(new RegExp(r'\s*\)'))) {
           // missingLeftSeparator
           int end = text.indexOf(')');
           sb = new SourceBuilder(file, start);
-          _addReplaceEdit(rangeStartLength(start, end), '; ');
+          _addReplaceEdit(new SourceRange(start, end), '; ');
           delta = end - '; '.length;
           exitPosition = new Position(file, start);
         } else {
           // Not possible; any comment following init is attached to init.
           exitPosition = _newPosition(forNode.rightParenthesis.offset);
           sb = new SourceBuilder(file, forNode.rightParenthesis.offset);
         }
       }
     }
     if (!_statementHasValidBody(forNode.forKeyword, forNode.body)) {
@@ skipping 365 matching lines @@
     LinkedEditGroup group = linkedPositionGroups[groupId];
     if (group == null) {
       group = new LinkedEditGroup.empty();
       linkedPositionGroups[groupId] = group;
     }
     return group;
   }
 
   void _insertBuilder(SourceBuilder builder, [int length = 0]) {
     {
-      SourceRange range = rangeStartLength(builder.offset, length);
+      SourceRange range = new SourceRange(builder.offset, length);
       String text = builder.toString();
       _addReplaceEdit(range, text);
     }
     // add linked positions
     builder.linkedPositionGroups.forEach((String id, LinkedEditGroup group) {
       LinkedEditGroup fixGroup = _getLinkedPosition(id);
       group.positions.forEach((Position position) {
         fixGroup.addPosition(position, group.length);
       });
       group.suggestions.forEach((LinkedEditSuggestion suggestion) {
@@ skipping 88 matching lines @@
   final Token keyword;
   final Token leftParenthesis, rightParenthesis;
   final Expression condition;
   final Statement block;
 
   _KeywordConditionBlockStructure(this.keyword, this.leftParenthesis,
       this.condition, this.rightParenthesis, this.block);
 
   int get offset => keyword.offset;
 }