Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(565)

Unified Diff: pkg/analyzer/lib/src/dart/element/element.dart

Issue 2030853003: Resynthesize constructor initializers lazily. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/summary/resynthesize.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/dart/element/element.dart
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index df85f1aa7f9e46f5a7c9b62d815db366fcf74ad4..636e0e995200fafd654dbb68c66c49e299c7aa45 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -25,6 +25,7 @@ import 'package:analyzer/src/generated/java_engine.dart';
import 'package:analyzer/src/generated/resolver.dart';
import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer/src/generated/testing/ast_factory.dart';
import 'package:analyzer/src/generated/utilities_collection.dart';
import 'package:analyzer/src/generated/utilities_dart.dart';
import 'package:analyzer/src/generated/utilities_general.dart';
@@ -1690,7 +1691,7 @@ class ConstructorElementImpl extends ExecutableElementImpl
* The initializers for this constructor (used for evaluating constant
* instance creation expressions).
*/
- List<ConstructorInitializer> constantInitializers;
+ List<ConstructorInitializer> _constantInitializers;
/**
* The offset of the `.` before this constructor name or `null` if not named.
@@ -1739,6 +1740,21 @@ class ConstructorElementImpl extends ExecutableElementImpl
setModifier(Modifier.CONST, isConst);
}
+ List<ConstructorInitializer> get constantInitializers {
+ if (serializedExecutable != null && _constantInitializers == null) {
+ _constantInitializers ??= serializedExecutable.constantInitializers
+ .map((i) => _buildConstructorInitializer(i))
+ .toList(growable: false);
+ }
+ return _constantInitializers;
+ }
+
+ void set constantInitializers(
+ List<ConstructorInitializer> constantInitializers) {
+ assert(serializedExecutable == null);
+ _constantInitializers = constantInitializers;
+ }
+
@override
ClassElement get enclosingElement => super.enclosingElement as ClassElement;
@@ -1871,6 +1887,62 @@ class ConstructorElementImpl extends ExecutableElementImpl
@override
ConstructorDeclaration computeNode() =>
getNodeMatching((node) => node is ConstructorDeclaration);
+
+ /**
+ * Resynthesize the AST for the given serialized constructor initializer.
+ */
+ ConstructorInitializer _buildConstructorInitializer(
+ UnlinkedConstructorInitializer serialized) {
+ UnlinkedConstructorInitializerKind kind = serialized.kind;
+ String name = serialized.name;
+ List<Expression> arguments = <Expression>[];
+ {
+ int numArguments = serialized.arguments.length;
+ int numNames = serialized.argumentNames.length;
+ for (int i = 0; i < numArguments; i++) {
+ Expression expression = enclosingUnit.resynthesizerContext
+ .buildExpression(this, serialized.arguments[i]);
+ int nameIndex = numNames + i - numArguments;
+ if (nameIndex >= 0) {
+ expression = AstFactory.namedExpression2(
+ serialized.argumentNames[nameIndex], expression);
+ }
+ arguments.add(expression);
+ }
+ }
+ switch (kind) {
+ case UnlinkedConstructorInitializerKind.field:
+ ConstructorFieldInitializer initializer =
+ AstFactory.constructorFieldInitializer(
+ false,
+ name,
+ enclosingUnit.resynthesizerContext
+ .buildExpression(this, serialized.expression));
+ initializer.fieldName.staticElement = enclosingElement.getField(name);
+ return initializer;
+ case UnlinkedConstructorInitializerKind.superInvocation:
+ SuperConstructorInvocation initializer =
+ AstFactory.superConstructorInvocation2(
+ name.isNotEmpty ? name : null, arguments);
+ ClassElement superElement = enclosingElement.supertype.element;
+ ConstructorElement element = name.isEmpty
+ ? superElement.unnamedConstructor
+ : superElement.getNamedConstructor(name);
+ initializer.staticElement = element;
+ initializer.constructorName?.staticElement = element;
+ return initializer;
+ case UnlinkedConstructorInitializerKind.thisInvocation:
+ RedirectingConstructorInvocation initializer =
+ AstFactory.redirectingConstructorInvocation2(
+ name.isNotEmpty ? name : null, arguments);
+ ConstructorElement element = name.isEmpty
+ ? enclosingElement.unnamedConstructor
+ : enclosingElement.getNamedConstructor(name);
+ initializer.staticElement = element;
+ initializer.constructorName?.staticElement = element;
+ return initializer;
+ }
+ }
}
/**
« no previous file with comments | « no previous file | pkg/analyzer/lib/src/summary/resynthesize.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698