Add SingleStringLiteral with accessors.

pkg/analyzer/lib/src/generated/ast.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.ast;
 
 import 'dart:collection';
@@ skipping 10423 matching lines @@
    *
    * @param string the value of the literal
    */
   void set value(String string) {
     _value = string;
   }
 
   @override
   void visitChildren(AstVisitor visitor) {
   }
+
+  /**
+   * Return the offset of the after-last contents character.
+   */
+  int get contentsEnd {
+    int end = _contents.end;
+    String lexeme = _contents.lexeme;
+    if (StringUtilities.endsWith3(lexeme, 0x22, 0x22, 0x22) ||
+        StringUtilities.endsWith3(lexeme, 0x27, 0x27, 0x27)) {
+      end -= 3;
+    } else {
+      end -= 1;
+    }
+    return end;
+  }
+
+  /**
+   * Return the offset of the first contents character.
+   */
+  int get contentsOffset {
+    int offset = _contents.offset;
+    String lexeme = _contents.lexeme;
+    if (lexeme.codeUnitAt(0) == 0x72) {
+      offset += 1;
+    }
+    if (StringUtilities.startsWith3(lexeme, offset, 0x22, 0x22, 0x22) ||
+        StringUtilities.startsWith3(lexeme, offset, 0x27, 0x27, 0x27)) {
+      offset += 3;
+    } else {
+      offset += 1;
+    }
+    return offset;
+  }
 }
 
 /**
  * Instances of the class `IsExpression` represent an is expression.
  *
  * <pre>
  * isExpression ::=
  *     [Expression] 'is' '!'? [TypeName]
  * </pre>
  */
@@ skipping 5481 matching lines @@
  *
  * multiLineStringLiteral ::=
  *     "'''" characters "'''"
  *   | '"""' characters '"""'
  *
  * singleLineStringLiteral ::=
  *     "'" characters "'"
  *     '"' characters '"'
  * </pre>
  */
-class SimpleStringLiteral extends StringLiteral {
+class SimpleStringLiteral extends SingleStringLiteral {
   /**
    * The token representing the literal.
    */
   Token literal;
 
   /**
    * The value of the literal.
    */
   String _value;
 
@@ skipping 12 matching lines @@
     this._value = StringUtilities.intern(value);
   }
 
   @override
   accept(AstVisitor visitor) => visitor.visitSimpleStringLiteral(this);
 
   @override
   Token get beginToken => literal;
 
   @override
+  int get contentsOffset {
+    int contentsOffset = 0;
+    if (isRaw) {
+      contentsOffset += 1;
+    }
+    if (isMultiline) {
+      contentsOffset += 3;
+    } else {
+      contentsOffset += 1;
+    }
+    return offset + contentsOffset;
+  }
+
+  @override
+  int get contentsEnd {
+    return contentsOffset + value.length;
+  }
+
+  @override
   Token get endToken => literal;
 
   /**
    * Return the toolkit specific, non-Dart, element associated with this literal, or `null`.
    *
    * @return the element associated with this literal
    */
   Element get toolkitElement => _toolkitElement;
 
   /**
    * Return the value of the literal.
    *
    * @return the value of the literal
    */
   String get value => _value;
 
   /**
-   * Return the offset of the first value character.
-   *
-   * @return the offset of the first value character
-   */
-  int get valueOffset {
-    int valueOffset = 0;
-    if (isRaw) {
-      valueOffset += 1;
-    }
-    if (isMultiline) {
-      valueOffset += 3;
-    } else {
-      valueOffset += 1;
-    }
-    return offset + valueOffset;
-  }
-
-  /**
    * Return `true` if this string literal is a multi-line string.
    *
    * @return `true` if this string literal is a multi-line string
    */
   bool get isMultiline {
     String lexeme = literal.lexeme;
     if (lexeme.length < 6) {
       return false;
     }
     return StringUtilities.endsWith3(lexeme, 0x22, 0x22, 0x22) || StringUtilities.endsWith3(lexeme, 0x27, 0x27, 0x27);
   }
 
-  /**
-   * Return `true` if this string literal is a raw string.
-   *
-   * @return `true` if this string literal is a raw string
-   */
   bool get isRaw => literal.lexeme.codeUnitAt(0) == 0x72;
 
   @override
   bool get isSynthetic => literal.isSynthetic;
 
   /**
    * Set the toolkit specific, non-Dart, element associated with this literal.
    *
    * @param element the toolkit specific element to be associated with this literal
    */
@@ skipping 48 matching lines @@
 
 /**
  * Instances of the class `StringInterpolation` represent a string interpolation literal.
  *
  * <pre>
  * stringInterpolation ::=
  *     ''' [InterpolationElement]* '''
  *   | '"' [InterpolationElement]* '"'
  * </pre>
  */
-class StringInterpolation extends StringLiteral {
+class StringInterpolation extends SingleStringLiteral {
   /**
    * The elements that will be composed to produce the resulting string.
    */
   NodeList<InterpolationElement> _elements;
 
   /**
    * Initialize a newly created string interpolation expression.
    *
    * @param elements the elements that will be composed to produce the resulting string
    */
@@ skipping 20 matching lines @@
 
   @override
   void visitChildren(AstVisitor visitor) {
     _elements.accept(visitor);
   }
 
   @override
   void appendStringValue(JavaStringBuilder builder) {
     throw new IllegalArgumentException();
   }
+
+  @override
+  int get contentsOffset {
+    InterpolationString element = _elements.first;
+    return element.contentsOffset;
+  }
+
+  @override
+  int get contentsEnd {
+    InterpolationString element = _elements.last;
+    return element.contentsEnd;
+  }
+
+  @override
+  bool get isRaw => false;
 }
 
 /**
  * Instances of the class `StringLiteral` represent a string literal expression.
  *
  * <pre>
  * stringLiteral ::=
  *     [SimpleStringLiteral]
  *   | [AdjacentStrings]
  *   | [StringInterpolation]
@@ skipping 20 matching lines @@
    * Append the value of the given string literal to the given string builder.
    *
    * @param builder the builder to which the string's value is to be appended
    * @throws IllegalArgumentException if the string is not a constant string without any string
    *           interpolation
    */
   void appendStringValue(JavaStringBuilder builder);
 }
 
 /**
+ * Instances of the class [SingleStringLiteral] represent a single string
+ * literal expression.
+ *
+ * <pre>
+ * singleStringLiteral ::=
+ *     [SimpleStringLiteral]
+ *   | [StringInterpolation]
+ * </pre>
+ */
+abstract class SingleStringLiteral extends StringLiteral {

[Brian Wilkerson, 2014/10/06 21:59:26]

GeneralizingAstVisitor should have a visitSingleStringLiteral method added to
it.

[scheglov, 2014/10/07 00:53:34]

Done.

+  /**
+   * Return the offset of the first contents character.
+   */
+  int get contentsOffset;
+
+  /**
+   * Return the offset of the after-last contents character.
+   */
+  int get contentsEnd;
+
+  /**
+   * Return `true` if this string literal is a raw string.
+   */
+  bool get isRaw;
+}
+
+/**
  * Instances of the class `SuperConstructorInvocation` represent the invocation of a
  * superclass' constructor from within a constructor's initialization list.
  *
  * <pre>
  * superInvocation ::=
  *     'super' ('.' [SimpleIdentifier])? [ArgumentList]
  * </pre>
  */
 class SuperConstructorInvocation extends ConstructorInitializer {
   /**
@@ skipping 3399 matching lines @@
     _elements[index] = node;
   }
   void clear() {
     _elements = <E> [];
   }
   int get length => _elements.length;
   void set length(int value) {
     throw new UnsupportedError("Cannot resize NodeList.");
   }
 }