New analyzer snapshot.

pkg/analyzer/lib/src/generated/source.dart

 // 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.source;
 
 import 'java_core.dart';
 import 'sdk.dart' show DartSdk;
 import 'engine.dart' show AnalysisContext;
 
 /**
@@ skipping 48 matching lines @@
  */
 class SourceFactory {
   /**
    * The analysis context that this source factory is associated with.
    */
   AnalysisContext context;
 
   /**
    * A cache of content used to override the default content of a source.
    */
-  ContentCache contentCache;
+  ContentCache _contentCache;
 
   /**
    * The resolvers used to resolve absolute URI's.
    */
   List<UriResolver> _resolvers;
 
   /**
    * The predicate to determine is [Source] is local.
    */
   LocalSourcePredicate _localSourcePredicate;
 
   /**
    * Initialize a newly created source factory.
    *
    * @param contentCache the cache holding content used to override the default content of a source
    * @param resolvers the resolvers used to resolve absolute URI's
    */
   SourceFactory.con1(ContentCache contentCache, List<UriResolver> resolvers) {
-    this.contentCache = contentCache;
+    this._contentCache = contentCache;
     this._resolvers = resolvers;
     this._localSourcePredicate = LocalSourcePredicate.NOT_SDK;
   }
 
   /**
    * Initialize a newly created source factory.
    *
    * @param resolvers the resolvers used to resolve absolute URI's
    */
   SourceFactory.con2(List<UriResolver> resolvers) : this.con1(new ContentCache(), resolvers);
@@ skipping 28 matching lines @@
     if (encoding.length < 2) {
       throw new IllegalArgumentException("Invalid encoding length");
     }
     UriKind kind = UriKind.fromEncoding(encoding.codeUnitAt(0));
     if (kind == null) {
       throw new IllegalArgumentException("Invalid source kind in encoding: ${kind}");
     }
     try {
       Uri uri = parseUriWithException(encoding.substring(1));
       for (UriResolver resolver in _resolvers) {
-        Source result = resolver.fromEncoding(contentCache, kind, uri);
+        Source result = resolver.fromEncoding(_contentCache, kind, uri);
         if (result != null) {
           return result;
         }
       }
       throw new IllegalArgumentException("No resolver for kind: ${kind}");
     } on JavaException catch (exception) {
       throw new IllegalArgumentException("Invalid URI in encoding");
     }
   }
 
   /**
+   * Return a cache of content used to override the default content of a source.
+   *
+   * @return a cache of content used to override the default content of a source
+   */
+  ContentCache get contentCache => _contentCache;
+
+  /**
    * Return the [DartSdk] associated with this [SourceFactory], or `null` if there
    * is no such SDK.
    *
    * @return the [DartSdk] associated with this [SourceFactory], or `null` if
    *         there is no such SDK
    */
   DartSdk get dartSdk {
     for (UriResolver resolver in _resolvers) {
       if (resolver is DartUriResolver) {
         DartUriResolver dartUriResolver = resolver as DartUriResolver;
@@ skipping 50 matching lines @@
 
   /**
    * Set the contents of the given source to the given contents. This has the effect of overriding
    * the default contents of the source. If the contents are `null` the override is removed so
    * that the default contents will be returned.
    *
    * @param source the source whose contents are being overridden
    * @param contents the new contents of the source
    * @return the original cached contents or `null` if none
    */
-  String setContents(Source source, String contents) => contentCache.setContents(source, contents);
+  String setContents(Source source, String contents) => _contentCache.setContents(source, contents);
 
   /**
    * Sets the [LocalSourcePredicate].
    *
    * @param localSourcePredicate the predicate to determine is [Source] is local
    */
   void set localSourcePredicate(LocalSourcePredicate localSourcePredicate) {
     this._localSourcePredicate = localSourcePredicate;
   }
 
   /**
    * Return the contents of the given source, or `null` if this factory does not override the
    * contents of the source.
    *
    * <b>Note:</b> This method is not intended to be used except by
    * [FileBasedSource#getContents].
    *
    * @param source the source whose content is to be returned
    * @return the contents of the given source
    */
-  String getContents(Source source) => contentCache.getContents(source);
+  String getContents(Source source) => _contentCache.getContents(source);
 
   /**
    * Return the modification stamp of the given source, or `null` if this factory does not
    * override the contents of the source.
    *
    * <b>Note:</b> This method is not intended to be used except by
    * [FileBasedSource#getModificationStamp].
    *
    * @param source the source whose modification stamp is to be returned
    * @return the modification stamp of the given source
    */
-  int getModificationStamp(Source source) => contentCache.getModificationStamp(source);
+  int getModificationStamp(Source source) => _contentCache.getModificationStamp(source);
 
   /**
    * Return a source object representing the URI that results from resolving the given (possibly
    * relative) contained URI against the URI associated with an existing source object, or
    * `null` if either the contained URI is invalid or if it cannot be resolved against the
    * source object's URI.
    *
    * @param containingSource the source containing the given URI
    * @param containedUri the (possibly relative) URI to be resolved against the containing source
    * @return the source representing the contained URI
    */
   Source resolveUri2(Source containingSource, Uri containedUri) {
     if (containedUri.isAbsolute) {
       for (UriResolver resolver in _resolvers) {
-        Source result = resolver.resolveAbsolute(contentCache, containedUri);
+        Source result = resolver.resolveAbsolute(_contentCache, containedUri);
         if (result != null) {
           return result;
         }
       }
       return null;
     } else {
       return containingSource.resolveRelative(containedUri);
     }
   }
 }
@@ skipping 264 matching lines @@
         return PACKAGE_URI;
       }
       break;
     }
     return null;
   }
 
   /**
    * The single character encoding used to identify this kind of URI.
    */
-  int encoding = 0;
+  final int encoding;
 
   /**
    * Initialize a newly created URI kind to have the given encoding.
    *
    * @param encoding the single character encoding used to identify this kind of URI.
    */
-  UriKind(String name, int ordinal, int encoding) : super(name, ordinal) {
-    this.encoding = encoding;
-  }
+  UriKind(String name, int ordinal, this.encoding) : super(name, ordinal);
 }
 
 /**
  * A source range defines an [Element]'s source coordinates relative to its [Source].
  *
  * @coverage dart.engine.utilities
  */
 class SourceRange {
   /**
    * An empty [SourceRange] with offset `0` and length `0`.
    */
   static SourceRange EMPTY = new SourceRange(0, 0);
 
   /**
    * The 0-based index of the first character of the source code for this element, relative to the
    * source buffer in which this element is contained.
    */
-  int offset = 0;
+  final int offset;
 
   /**
    * The number of characters of the source code for this element, relative to the source buffer in
    * which this element is contained.
    */
-  int length = 0;
+  final int length;
 
   /**
    * Initialize a newly created source range using the given offset and the given length.
    *
    * @param offset the given offset
    * @param length the given length
    */
-  SourceRange(int offset, int length) {
-    this.offset = offset;
-    this.length = length;
-  }
+  SourceRange(this.offset, this.length);
 
   /**
    * @return `true` if <code>x</code> is in [offset, offset + length) interval.
    */
   bool contains(int x) => offset <= x && x < offset + length;
 
   /**
    * @return `true` if <code>x</code> is in (offset, offset + length) interval.
    */
   bool containsExclusive(int x) => offset < x && x < offset + length;
@@ skipping 101 matching lines @@
 
 /**
  * Instances of the class `DartUriResolver` resolve `dart` URI's.
  *
  * @coverage dart.engine.source
  */
 class DartUriResolver extends UriResolver {
   /**
    * The Dart SDK against which URI's are to be resolved.
    */
-  DartSdk dartSdk;
+  DartSdk _sdk;
 
   /**
    * The name of the `dart` scheme.
    */
   static String _DART_SCHEME = "dart";
 
   /**
    * Return `true` if the given URI is a `dart:` URI.
    *
    * @param uri the URI being tested
    * @return `true` if the given URI is a `dart:` URI
    */
   static bool isDartUri(Uri uri) => _DART_SCHEME == uri.scheme;
 
   /**
    * Initialize a newly created resolver to resolve Dart URI's against the given platform within the
    * given Dart SDK.
    *
    * @param sdk the Dart SDK against which URI's are to be resolved
    */
   DartUriResolver(DartSdk sdk) {
-    this.dartSdk = sdk;
+    this._sdk = sdk;
   }
 
   Source fromEncoding(ContentCache contentCache, UriKind kind, Uri uri) {
     if (identical(kind, UriKind.DART_URI)) {
-      return dartSdk.fromEncoding(contentCache, kind, uri);
+      return _sdk.fromEncoding(contentCache, kind, uri);
     }
     return null;
   }
 
+  /**
+   * Return the [DartSdk] against which URIs are to be resolved.
+   *
+   * @return the [DartSdk] against which URIs are to be resolved.
+   */
+  DartSdk get dartSdk => _sdk;
+
   Source resolveAbsolute(ContentCache contentCache, Uri uri) {
     if (!isDartUri(uri)) {
       return null;
     }
-    return dartSdk.mapDartUri(uri.toString());
+    return _sdk.mapDartUri(uri.toString());
   }
 }
 
 /**
  * Instances of the class `LineInfo` encapsulate information about line and column information
  * within a source file.
  *
  * @coverage dart.engine.utilities
  */
 class LineInfo {
@@ skipping 35 matching lines @@
 }
 
 /**
  * Instances of the class `Location` represent the location of a character as a line and
  * column pair.
  */
 class LineInfo_Location {
   /**
    * The one-based index of the line containing the character.
    */
-  int lineNumber = 0;
+  final int lineNumber;
 
   /**
    * The one-based index of the column containing the character.
    */
-  int columnNumber = 0;
+  final int columnNumber;
 
   /**
    * Initialize a newly created location to represent the location of the character at the given
    * line and column position.
    *
    * @param lineNumber the one-based index of the line containing the character
    * @param columnNumber the one-based index of the column containing the character
    */
-  LineInfo_Location(int lineNumber, int columnNumber) {
-    this.lineNumber = lineNumber;
-    this.columnNumber = columnNumber;
-  }
+  LineInfo_Location(this.lineNumber, this.columnNumber);
 }
 
 /**
  * Instances of class `ContentCache` hold content used to override the default content of a
  * [Source].
  *
  * @coverage dart.engine.source
  */
 class ContentCache {
   /**
@@ skipping 39 matching lines @@
    *
    * @param source the source whose contents are being overridden
    * @param contents the new contents of the source
    * @return the original cached contents or `null` if none
    */
   String setContents(Source source, String contents) {
     if (contents == null) {
       _stampMap.remove(source);
       return _contentMap.remove(source);
     } else {
-      _stampMap[source] = JavaSystem.currentTimeMillis();
+      int newStamp = JavaSystem.currentTimeMillis();
+      int oldStamp = javaMapPut(_stampMap, source, newStamp);
+      if (newStamp == oldStamp) {
+        _stampMap[source] = newStamp + 1;
+      }
       return javaMapPut(_contentMap, source, contents);
     }
   }
 }