Revert "Fix value computation for multi-line strings (issue 22993)"

pkg/analyzer/lib/src/generated/parser.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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine.parser;
 
 import "dart:math" as math;
@@ skipping 3412 matching lines @@
     }
     if (scalarValue < Character.MAX_VALUE) {
       buffer.writeCharCode(scalarValue);
     } else {
       buffer.write(Character.toChars(scalarValue));
     }
   }
 
   /**
    * Return the content of a string with the given literal representation. The
-   * [lexeme] is the literal representation of the string. The flag [isFirst] is
-   * `true` if this is the first token in a string literal. The flag [isLast] is
+   * [lexeme] is the literal representation of the string. The flag [first] is
+   * `true` if this is the first token in a string literal. The flag [last] is
    * `true` if this is the last token in a string literal.
    */
-  String _computeStringValue(String lexeme, bool isFirst, bool isLast) {
+  String _computeStringValue(String lexeme, bool first, bool last) {
     bool isRaw = false;
     int start = 0;
-    if (isFirst) {
+    if (first) {
       if (StringUtilities.startsWith4(lexeme, 0, 0x72, 0x22, 0x22, 0x22) ||
           StringUtilities.startsWith4(lexeme, 0, 0x72, 0x27, 0x27, 0x27)) {
         isRaw = true;
         start += 4;
-        if (isFirst) {
-          start = _trimInitialWhitespace(lexeme, start);
-        }
       } else if (StringUtilities.startsWith2(lexeme, 0, 0x72, 0x22) ||
           StringUtilities.startsWith2(lexeme, 0, 0x72, 0x27)) {
         isRaw = true;
         start += 2;
       } else if (StringUtilities.startsWith3(lexeme, 0, 0x22, 0x22, 0x22) ||
           StringUtilities.startsWith3(lexeme, 0, 0x27, 0x27, 0x27)) {
         start += 3;
-        if (isFirst) {
-          start = _trimInitialWhitespace(lexeme, start);
-        }
       } else if (StringUtilities.startsWithChar(lexeme, 0x22) ||
           StringUtilities.startsWithChar(lexeme, 0x27)) {
         start += 1;
       }
     }
     int end = lexeme.length;
-    if (isLast) {
+    if (last) {
       if (StringUtilities.endsWith3(lexeme, 0x22, 0x22, 0x22) ||
           StringUtilities.endsWith3(lexeme, 0x27, 0x27, 0x27)) {
         end -= 3;
       } else if (StringUtilities.endsWithChar(lexeme, 0x22) ||
           StringUtilities.endsWithChar(lexeme, 0x27)) {
         end -= 1;
       }
     }
     if (end - start + 1 < 0) {
       AnalysisEngine.instance.logger.logError(
-          "Internal error: computeStringValue($lexeme, $isFirst, $isLast)");
+          "Internal error: computeStringValue($lexeme, $first, $last)");
       return "";
     }
     if (isRaw) {
       return lexeme.substring(start, end);
     }
     StringBuffer buffer = new StringBuffer();
     int index = start;
     while (index < end) {
       index = _translateCharacter(buffer, lexeme, index);
     }
@@ skipping 4763 matching lines @@
         }
         return currentIndex + 4;
       }
     } else {
       buffer.writeCharCode(currentChar);
     }
     return currentIndex + 1;
   }
 
   /**
-   * Given the [lexeme] for a multi-line string whose content begins at the
-   * given [start] index, return the index of the first character that is
-   * included in the value of the string. According to the specification:
-   *
-   * If the first line of a multiline string consists solely of the whitespace
-   * characters defined by the production WHITESPACE 20.1), possibly prefixed
-   * by \, then that line is ignored, including the new line at its end.
-   */
-  int _trimInitialWhitespace(String lexeme, int start) {
-    int length = lexeme.length;
-    int index = start;
-    while (index < length) {
-      int currentChar = lexeme.codeUnitAt(index);
-      if (currentChar == 0x0D) {
-        if (index + 1 < length && lexeme.codeUnitAt(index + 1) == 0x0A) {
-          return index + 2;
-        }
-        return index + 1;
-      } else if (currentChar == 0x0A) {
-        return index + 1;
-      } else if (currentChar == 0x5C) {
-        if (index + 1 >= length) {
-          return start;
-        }
-        currentChar = lexeme.codeUnitAt(index + 1);
-        if (currentChar != 0x0D &&
-            currentChar != 0x0A &&
-            currentChar != 0x09 &&
-            currentChar != 0x20) {
-          return start;
-        }
-      } else if (currentChar != 0x09 && currentChar != 0x20) {
-        return start;
-      }
-      index++;
-    }
-    return start;
-  }
-
-  /**
    * Decrements the error reporting lock level. If level is more than `0`, then
    * [reportError] wont report any error.
    */
   void _unlockErrorListener() {
     if (_errorListenerLock == 0) {
       throw new IllegalStateException(
           "Attempt to unlock not locked error listener.");
     }
     _errorListenerLock--;
   }
@@ skipping 2274 matching lines @@
   }
 
   /**
    * Copy resolution data from the [fromNode] to the [toNode].
    */
   static void copyResolutionData(AstNode fromNode, AstNode toNode) {
     ResolutionCopier copier = new ResolutionCopier();
     copier._isEqualNodes(fromNode, toNode);
   }
 }