Add fixes for two additional lints

pkg/analysis_server/lib/src/services/correction/util.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.
 
 import 'dart:math';
 
 import 'package:analysis_server/src/protocol_server.dart'
     show doSourceChange_addElementEdit;
 import 'package:analysis_server/src/services/correction/strings.dart';
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 848 matching lines @@
   SourceRange getLinesRange(SourceRange sourceRange,
       {bool skipLeadingEmptyLines: false}) {
     // start
     int startOffset = sourceRange.offset;
     int startLineOffset = getLineContentStart(startOffset);
     if (skipLeadingEmptyLines) {
       startLineOffset = skipEmptyLinesLeft(startLineOffset);
     }
     // end
     int endOffset = sourceRange.end;
-    int afterEndLineOffset = getLineContentEnd(endOffset);
+    int afterEndLineOffset = endOffset;
+    int lineStart = unit.lineInfo.getOffsetOfLine(
+        unit.lineInfo.getLocation(startLineOffset).lineNumber - 1);
+    if (lineStart == startLineOffset) {
+      // Only consume line ends after the end of the range if there is nothing
+      // else on the line containing the beginning of the range. Otherwise this
+      // will end up incorrectly merging two line.
+      afterEndLineOffset = getLineContentEnd(endOffset);
+    }
     // range
     return range.startOffsetEndOffset(startLineOffset, afterEndLineOffset);
   }
 
   /**
    * Returns a [SourceRange] that covers all the given [Statement]s.
    */
   SourceRange getLinesRangeStatements(List<Statement> statements) {
     return getLinesRange(range.nodes(statements));
   }
@@ skipping 623 matching lines @@
   @override
   visitSimpleIdentifier(SimpleIdentifier node) {
     if (node.inDeclarationContext()) {
       Element element = node.staticElement;
       if (element is LocalElement) {
         elements.add(element);
       }
     }
   }
 }