| Index: pkg/analyzer/lib/src/generated/engine.dart
|
| diff --git a/pkg/analyzer/lib/src/generated/engine.dart b/pkg/analyzer/lib/src/generated/engine.dart
|
| index c513eece76052af5f1e01ef7f2c4d6fcbeaf0f9d..cfd50280291d9b73769af90f1fcca2111b3f5f37 100644
|
| --- a/pkg/analyzer/lib/src/generated/engine.dart
|
| +++ b/pkg/analyzer/lib/src/generated/engine.dart
|
| @@ -7,6 +7,7 @@
|
|
|
| library engine;
|
|
|
| +import 'dart:collection';
|
| import 'java_core.dart';
|
| import 'java_engine.dart';
|
| import 'utilities_collection.dart';
|
| @@ -18,10 +19,10 @@ import 'scanner.dart';
|
| import 'ast.dart';
|
| import 'parser.dart' show Parser, IncrementalParser;
|
| import 'sdk.dart' show DartSdk;
|
| +import 'constant.dart';
|
| import 'element.dart';
|
| import 'resolver.dart';
|
| import 'html.dart' as ht;
|
| -import 'package:analyzer/src/generated/constant.dart';
|
|
|
| /**
|
| * Instances of the class `AnalysisCache` implement an LRU cache of information related to
|
| @@ -873,7 +874,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
|
| * A table mapping sources to the change notices that are waiting to be returned related to that
|
| * source.
|
| */
|
| - Map<Source, ChangeNoticeImpl> _pendingNotices = new Map<Source, ChangeNoticeImpl>();
|
| + HashMap<Source, ChangeNoticeImpl> _pendingNotices = new HashMap<Source, ChangeNoticeImpl>();
|
|
|
| /**
|
| * A set containing information about the tasks that have been performed since the last change
|
| @@ -3627,7 +3628,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
|
| * <b>Note:</b> This method must only be invoked while we are synchronized on [cacheLock].
|
| */
|
| void _invalidateAllLocalResolutionInformation() {
|
| - Map<Source, List<Source>> oldPartMap = new Map<Source, List<Source>>();
|
| + HashMap<Source, List<Source>> oldPartMap = new HashMap<Source, List<Source>>();
|
| MapIterator<Source, SourceEntry> iterator = _privatePartition.iterator();
|
| while (iterator.moveNext()) {
|
| Source source = iterator.key;
|
| @@ -4038,7 +4039,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
|
| Source librarySource = task.libraryElement.source;
|
| CaughtException thrownException = task.exception;
|
| DartEntry libraryEntry = null;
|
| - Map<Source, TimestampedData<List<AnalysisError>>> hintMap = task.hintMap;
|
| + HashMap<Source, TimestampedData<List<AnalysisError>>> hintMap = task.hintMap;
|
| if (hintMap == null) {
|
| // We don't have any information about which sources to mark as invalid other than the library
|
| // source.
|
| @@ -4949,7 +4950,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
|
| *
|
| * @param oldPartMap the table containing the parts associated with each library
|
| */
|
| - void _removeFromPartsUsingMap(Map<Source, List<Source>> oldPartMap) {
|
| + void _removeFromPartsUsingMap(HashMap<Source, List<Source>> oldPartMap) {
|
| for (MapEntry<Source, List<Source>> entry in getMapEntrySet(oldPartMap)) {
|
| Source librarySource = entry.getKey();
|
| List<Source> oldParts = entry.getValue();
|
| @@ -5261,7 +5262,7 @@ class AnalysisContextImpl_CycleBuilder {
|
| * A table mapping the sources of the defining compilation units of libraries to the
|
| * representation of the library that has the information needed to resolve the library.
|
| */
|
| - Map<Source, ResolvableLibrary> _libraryMap = new Map<Source, ResolvableLibrary>();
|
| + HashMap<Source, ResolvableLibrary> _libraryMap = new HashMap<Source, ResolvableLibrary>();
|
|
|
| /**
|
| * The dependency graph used to compute the libraries in the cycle.
|
| @@ -5784,7 +5785,7 @@ abstract class AnalysisContextStatistics {
|
| * Implementation of the [AnalysisContextStatistics].
|
| */
|
| class AnalysisContextStatisticsImpl implements AnalysisContextStatistics {
|
| - Map<String, AnalysisContextStatistics_CacheRow> _dataMap = new Map<String, AnalysisContextStatistics_CacheRow>();
|
| + Map<String, AnalysisContextStatistics_CacheRow> _dataMap = new HashMap<String, AnalysisContextStatistics_CacheRow>();
|
|
|
| List<Source> _sources = new List<Source>();
|
|
|
| @@ -5965,7 +5966,7 @@ class AnalysisDelta {
|
| /**
|
| * A mapping from source to what type of analysis should be performed on that source.
|
| */
|
| - Map<Source, AnalysisLevel> _analysisMap = new Map<Source, AnalysisLevel>();
|
| + HashMap<Source, AnalysisLevel> _analysisMap = new HashMap<Source, AnalysisLevel>();
|
|
|
| /**
|
| * Return a collection of the sources that have been added. This is equivalent to calling
|
| @@ -7645,7 +7646,7 @@ class BuildDartElementModelTask extends AnalysisTask {
|
| /**
|
| * A table mapping library sources to the information being maintained for those libraries.
|
| */
|
| - Map<Source, ResolvableLibrary> _libraryMap = new Map<Source, ResolvableLibrary>();
|
| + HashMap<Source, ResolvableLibrary> _libraryMap = new HashMap<Source, ResolvableLibrary>();
|
|
|
| /**
|
| * Initialize a newly created task to perform analysis within the given context.
|
| @@ -7759,7 +7760,7 @@ class BuildDartElementModelTask extends AnalysisTask {
|
| void _buildDirectiveModels() {
|
| AnalysisContext analysisContext = context;
|
| for (ResolvableLibrary library in librariesInCycle) {
|
| - Map<String, PrefixElementImpl> nameToPrefixMap = new Map<String, PrefixElementImpl>();
|
| + HashMap<String, PrefixElementImpl> nameToPrefixMap = new HashMap<String, PrefixElementImpl>();
|
| List<ImportElement> imports = new List<ImportElement>();
|
| List<ExportElement> exports = new List<ExportElement>();
|
| for (Directive directive in library.definingCompilationUnit.directives) {
|
| @@ -7872,8 +7873,8 @@ class BuildDartElementModelTask extends AnalysisTask {
|
| *
|
| * @return the map that was built
|
| */
|
| - Map<Source, ResolvableLibrary> _buildLibraryMap() {
|
| - Map<Source, ResolvableLibrary> libraryMap = new Map<Source, ResolvableLibrary>();
|
| + HashMap<Source, ResolvableLibrary> _buildLibraryMap() {
|
| + HashMap<Source, ResolvableLibrary> libraryMap = new HashMap<Source, ResolvableLibrary>();
|
| int libraryCount = librariesInCycle.length;
|
| for (int i = 0; i < libraryCount; i++) {
|
| ResolvableLibrary library = librariesInCycle[i];
|
| @@ -7936,7 +7937,7 @@ abstract class CachePartition {
|
| /**
|
| * A table mapping the sources known to the context to the information known about the source.
|
| */
|
| - Map<Source, SourceEntry> _sourceMap = new Map<Source, SourceEntry>();
|
| + HashMap<Source, SourceEntry> _sourceMap = new HashMap<Source, SourceEntry>();
|
|
|
| /**
|
| * The maximum number of sources for which AST structures should be kept in the cache.
|
| @@ -8358,13 +8359,13 @@ class ChangeSet {
|
| * A table mapping the sources whose content has been changed to the current content of those
|
| * sources.
|
| */
|
| - Map<Source, String> _changedContent = new Map<Source, String>();
|
| + HashMap<Source, String> _changedContent = new HashMap<Source, String>();
|
|
|
| /**
|
| * A table mapping the sources whose content has been changed within a single range to the current
|
| * content of those sources and information about the affected range.
|
| */
|
| - final Map<Source, ChangeSet_ContentChange> changedRanges = new Map<Source, ChangeSet_ContentChange>();
|
| + final HashMap<Source, ChangeSet_ContentChange> changedRanges = new HashMap<Source, ChangeSet_ContentChange>();
|
|
|
| /**
|
| * A list containing the sources that have been removed.
|
| @@ -8536,7 +8537,7 @@ class ChangeSet {
|
| * @param label the label used to prefix the sources
|
| * @return `true` if future lists of sources will need a separator
|
| */
|
| - bool _appendSources2(JavaStringBuilder builder, Map<Source, dynamic> sources, bool needsSeparator, String label) {
|
| + bool _appendSources2(JavaStringBuilder builder, HashMap<Source, dynamic> sources, bool needsSeparator, String label) {
|
| if (sources.isEmpty) {
|
| return needsSeparator;
|
| }
|
| @@ -10478,7 +10479,7 @@ class GenerateDartHintsTask extends AnalysisTask {
|
| * A table mapping the sources that were analyzed to the hints that were generated for the
|
| * sources.
|
| */
|
| - Map<Source, TimestampedData<List<AnalysisError>>> _hintMap;
|
| + HashMap<Source, TimestampedData<List<AnalysisError>>> _hintMap;
|
|
|
| /**
|
| * Initialize a newly created task to perform analysis within the given context.
|
| @@ -10501,7 +10502,7 @@ class GenerateDartHintsTask extends AnalysisTask {
|
| * @return a table mapping the sources that were analyzed to the hints that were generated for the
|
| * sources
|
| */
|
| - Map<Source, TimestampedData<List<AnalysisError>>> get hintMap => _hintMap;
|
| + HashMap<Source, TimestampedData<List<AnalysisError>>> get hintMap => _hintMap;
|
|
|
| @override
|
| String get taskDescription {
|
| @@ -10531,7 +10532,7 @@ class GenerateDartHintsTask extends AnalysisTask {
|
| //
|
| // Store the results.
|
| //
|
| - _hintMap = new Map<Source, TimestampedData<List<AnalysisError>>>();
|
| + _hintMap = new HashMap<Source, TimestampedData<List<AnalysisError>>>();
|
| for (int i = 0; i < unitCount; i++) {
|
| int modificationTime = _units[i].modificationTime;
|
| Source source = _units[i].data.element.source;
|
| @@ -13071,7 +13072,7 @@ class PartitionManager {
|
| /**
|
| * A table mapping SDK's to the partitions used for those SDK's.
|
| */
|
| - Map<DartSdk, SdkCachePartition> _sdkPartitions = new Map<DartSdk, SdkCachePartition>();
|
| + HashMap<DartSdk, SdkCachePartition> _sdkPartitions = new HashMap<DartSdk, SdkCachePartition>();
|
|
|
| /**
|
| * The default cache size for a Dart SDK partition.
|
| @@ -13654,7 +13655,7 @@ class RecordingErrorListener implements AnalysisErrorListener {
|
| /**
|
| * A HashMap of lists containing the errors that were collected, keyed by each [Source].
|
| */
|
| - Map<Source, Set<AnalysisError>> _errors = new Map<Source, Set<AnalysisError>>();
|
| + Map<Source, Set<AnalysisError>> _errors = new HashMap<Source, Set<AnalysisError>>();
|
|
|
| /**
|
| * Add all of the errors recorded by the given listener to this listener.
|
|
|