Index: pkg/analyzer/lib/src/task/dart.dart |
diff --git a/pkg/analyzer/lib/src/task/dart.dart b/pkg/analyzer/lib/src/task/dart.dart |
index 7d53e095d20250ee72a9a0503b4dab94970b4291..ffada05a97977277fb84a84c4a0490c9f3205664 100644 |
--- a/pkg/analyzer/lib/src/task/dart.dart |
+++ b/pkg/analyzer/lib/src/task/dart.dart |
@@ -369,16 +369,6 @@ final ResultDescriptor<CompilationUnit> RESOLVED_UNIT5 = |
cachingPolicy: AST_CACHING_POLICY); |
/** |
- * The resolved [CompilationUnit] associated with a compilation unit, with |
- * constants not yet resolved. |
- * |
- * The result is only available for [LibrarySpecificUnit]s. |
- */ |
-final ResultDescriptor<CompilationUnit> RESOLVED_UNIT6 = |
- new ResultDescriptor<CompilationUnit>('RESOLVED_UNIT6', null, |
- cachingPolicy: AST_CACHING_POLICY); |
- |
-/** |
* The errors produced while scanning a compilation unit. |
* |
* The list will be empty if there were no errors, but will not be `null`. |
@@ -1741,7 +1731,7 @@ class BuildTypeProviderTask extends SourceBasedAnalysisTask { |
*/ |
class ComputeConstantDependenciesTask extends ConstantEvaluationAnalysisTask { |
/** |
- * The name of the [RESOLVED_UNIT6] input. |
+ * The name of the [RESOLVED_UNIT_NO_CONSTANTS] input. |
*/ |
static const String UNIT_INPUT = 'UNIT_INPUT'; |
@@ -1795,13 +1785,13 @@ class ComputeConstantDependenciesTask extends ConstantEvaluationAnalysisTask { |
CompilationUnitElementImpl unit = (target as Element) |
.getAncestor((Element element) => element is CompilationUnitElement); |
return <String, TaskInput>{ |
- UNIT_INPUT: RESOLVED_UNIT6 |
+ UNIT_INPUT: RESOLVED_UNIT_NO_CONSTANTS |
.of(new LibrarySpecificUnit(unit.librarySource, target.source)), |
TYPE_PROVIDER_INPUT: TYPE_PROVIDER.of(AnalysisContextTarget.request) |
}; |
} else if (target is ConstantEvaluationTarget_Annotation) { |
return <String, TaskInput>{ |
- UNIT_INPUT: RESOLVED_UNIT6 |
+ UNIT_INPUT: RESOLVED_UNIT_NO_CONSTANTS |
.of(new LibrarySpecificUnit(target.librarySource, target.source)), |
TYPE_PROVIDER_INPUT: TYPE_PROVIDER.of(AnalysisContextTarget.request) |
}; |
@@ -2088,7 +2078,7 @@ class DartErrorsTask extends SourceBasedAnalysisTask { |
*/ |
class EvaluateUnitConstantsTask extends SourceBasedAnalysisTask { |
/** |
- * The name of the [RESOLVED_UNIT6] input. |
+ * The name of the [RESOLVED_UNIT_NO_CONSTANTS] input. |
*/ |
static const String UNIT_INPUT = 'UNIT_INPUT'; |
@@ -2126,7 +2116,7 @@ class EvaluateUnitConstantsTask extends SourceBasedAnalysisTask { |
static Map<String, TaskInput> buildInputs(LibrarySpecificUnit target) { |
return <String, TaskInput>{ |
'libraryElement': LIBRARY_ELEMENT.of(target.library), |
- UNIT_INPUT: RESOLVED_UNIT6.of(target), |
+ UNIT_INPUT: RESOLVED_UNIT_NO_CONSTANTS.of(target), |
CONSTANT_VALUES: |
COMPILATION_UNIT_CONSTANTS.of(target).toListOf(CONSTANT_VALUE) |
}; |
@@ -2250,7 +2240,7 @@ class ExportNamespaceBuilder { |
*/ |
class GatherUsedImportedElementsTask extends SourceBasedAnalysisTask { |
/** |
- * The name of the [RESOLVED_UNIT6] input. |
+ * The name of the [RESOLVED_UNIT_NO_CONSTANTS] input. |
*/ |
static const String UNIT_INPUT = 'UNIT_INPUT'; |
@@ -2291,7 +2281,9 @@ class GatherUsedImportedElementsTask extends SourceBasedAnalysisTask { |
* given [target]. |
*/ |
static Map<String, TaskInput> buildInputs(LibrarySpecificUnit target) { |
- return <String, TaskInput>{UNIT_INPUT: RESOLVED_UNIT6.of(target)}; |
+ return <String, TaskInput>{ |
+ UNIT_INPUT: RESOLVED_UNIT_NO_CONSTANTS.of(target) |
+ }; |
} |
/** |
@@ -2309,7 +2301,7 @@ class GatherUsedImportedElementsTask extends SourceBasedAnalysisTask { |
*/ |
class GatherUsedLocalElementsTask extends SourceBasedAnalysisTask { |
/** |
- * The name of the [RESOLVED_UNIT6] input. |
+ * The name of the [RESOLVED_UNIT_NO_CONSTANTS] input. |
*/ |
static const String UNIT_INPUT = 'UNIT_INPUT'; |
@@ -2350,7 +2342,9 @@ class GatherUsedLocalElementsTask extends SourceBasedAnalysisTask { |
* given [target]. |
*/ |
static Map<String, TaskInput> buildInputs(LibrarySpecificUnit target) { |
- return <String, TaskInput>{UNIT_INPUT: RESOLVED_UNIT6.of(target)}; |
+ return <String, TaskInput>{ |
+ UNIT_INPUT: RESOLVED_UNIT_NO_CONSTANTS.of(target) |
+ }; |
} |
/** |
@@ -2368,7 +2362,7 @@ class GatherUsedLocalElementsTask extends SourceBasedAnalysisTask { |
*/ |
class GenerateHintsTask extends SourceBasedAnalysisTask { |
/** |
- * The name of the [RESOLVED_UNIT6] input. |
+ * The name of the [RESOLVED_UNIT_NO_CONSTANTS] input. |
*/ |
static const String RESOLVED_UNIT_INPUT = 'RESOLVED_UNIT'; |
@@ -2873,7 +2867,7 @@ class PublicNamespaceBuilder { |
} |
/** |
- * A task that finishes resolution by requesting [RESOLVED_UNIT6] for every |
+ * A task that finishes resolution by requesting [RESOLVED_UNIT_NO_CONSTANTS] for every |
* unit in the libraries closure and produces [LIBRARY_ELEMENT]. |
*/ |
class ResolveLibraryReferencesTask extends SourceBasedAnalysisTask { |
@@ -2913,8 +2907,9 @@ class ResolveLibraryReferencesTask extends SourceBasedAnalysisTask { |
'resolvedUnits': IMPORT_EXPORT_SOURCE_CLOSURE |
.of(libSource) |
.toMapOf(UNITS) |
- .toFlattenList((Source library, Source unit) => |
- RESOLVED_UNIT6.of(new LibrarySpecificUnit(library, unit))), |
+ .toFlattenList( |
+ (Source library, Source unit) => RESOLVED_UNIT_NO_CONSTANTS |
+ .of(new LibrarySpecificUnit(library, unit))), |
}; |
} |
@@ -2985,7 +2980,7 @@ class ResolveLibraryTypeNamesTask extends SourceBasedAnalysisTask { |
} |
/** |
- * A task that builds [RESOLVED_UNIT6] for a unit. |
+ * A task that builds [RESOLVED_UNIT_NO_CONSTANTS] for a unit. |
*/ |
class ResolveUnitReferencesTask extends SourceBasedAnalysisTask { |
/** |
@@ -3009,7 +3004,7 @@ class ResolveUnitReferencesTask extends SourceBasedAnalysisTask { |
static final TaskDescriptor DESCRIPTOR = new TaskDescriptor( |
'ResolveUnitReferencesTask', createTask, buildInputs, <ResultDescriptor>[ |
RESOLVE_REFERENCES_ERRORS, |
- RESOLVED_UNIT6 |
+ RESOLVED_UNIT_NO_CONSTANTS |
]); |
ResolveUnitReferencesTask( |
@@ -3042,7 +3037,7 @@ class ResolveUnitReferencesTask extends SourceBasedAnalysisTask { |
// |
outputs[RESOLVE_REFERENCES_ERRORS] = |
removeDuplicateErrors(errorListener.errors); |
- outputs[RESOLVED_UNIT6] = unit; |
+ outputs[RESOLVED_UNIT_NO_CONSTANTS] = unit; |
} |
/** |