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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/analysis_server/test/src/utilities/change_builder_dart_test.dart

Issue 2551023005: Prepare for decoupling analyzer ASTs from element model. (Closed)
Patch Set: Created 4 years 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 | « pkg/analysis_server/test/services/correction/fix_test.dart ('k') | pkg/analyzer/benchmark/errors_in_all_libraries.dart » ('j') | pkg/analyzer/lib/dart/ast/resolution_accessors.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/test/src/utilities/change_builder_dart_test.dart
diff --git a/pkg/analysis_server/test/src/utilities/change_builder_dart_test.dart b/pkg/analysis_server/test/src/utilities/change_builder_dart_test.dart
index a221d9bd2478f395bfc2c530fa58b2e2ede42d6f..d2e9a9610408bd76425c6e209a5a8026bf04a3b4 100644
--- a/pkg/analysis_server/test/src/utilities/change_builder_dart_test.dart
+++ b/pkg/analysis_server/test/src/utilities/change_builder_dart_test.dart
@@ -9,6 +9,7 @@ import 'package:analysis_server/src/provisional/edit/utilities/change_builder_co
import 'package:analysis_server/src/provisional/edit/utilities/change_builder_dart.dart';
import 'package:analysis_server/src/utilities/change_builder_dart.dart';
import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/ast/resolution_accessors.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:test/test.dart';
@@ -62,8 +63,8 @@ class DartEditBuilderImplTest extends AbstractContextTest {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
- (builder as DartEditBuilder)
- .writeClassDeclaration('C', interfaces: [declaration.element.type]);
+ (builder as DartEditBuilder).writeClassDeclaration('C',
+ interfaces: [elementForClassDeclaration(declaration).type]);
});
});
SourceEdit edit = getEdit(builder);
@@ -111,8 +112,8 @@ class DartEditBuilderImplTest extends AbstractContextTest {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
- (builder as DartEditBuilder)
- .writeClassDeclaration('C', mixins: [classA.element.type]);
+ (builder as DartEditBuilder).writeClassDeclaration('C',
+ mixins: [elementForClassDeclaration(classA).type]);
});
});
SourceEdit edit = getEdit(builder);
@@ -130,7 +131,8 @@ class DartEditBuilderImplTest extends AbstractContextTest {
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
(builder as DartEditBuilder).writeClassDeclaration('C',
- mixins: [classB.element.type], superclass: classA.element.type);
+ mixins: [elementForClassDeclaration(classB).type],
+ superclass: elementForClassDeclaration(classA).type);
});
});
SourceEdit edit = getEdit(builder);
@@ -168,8 +170,8 @@ class DartEditBuilderImplTest extends AbstractContextTest {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(0, (EditBuilder builder) {
- (builder as DartEditBuilder)
- .writeClassDeclaration('C', superclass: declaration.element.type);
+ (builder as DartEditBuilder).writeClassDeclaration('C',
+ superclass: elementForClassDeclaration(declaration).type);
});
});
SourceEdit edit = getEdit(builder);
@@ -290,7 +292,8 @@ class DartEditBuilderImplTest extends AbstractContextTest {
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeFieldDeclaration('f',
- type: declaration.element.type, typeGroupName: 'type');
+ type: elementForClassDeclaration(declaration).type,
+ typeGroupName: 'type');
});
});
SourceEdit edit = getEdit(builder);
@@ -375,7 +378,8 @@ class DartEditBuilderImplTest extends AbstractContextTest {
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeGetterDeclaration('g',
- returnType: classA.element.type, returnTypeGroupName: 'returnType');
+ returnType: elementForClassDeclaration(classA).type,
+ returnTypeGroupName: 'returnType');
});
});
SourceEdit edit = getEdit(builder);
@@ -405,8 +409,8 @@ class B extends A {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
- (builder as DartEditBuilder)
- .writeOverrideOfInheritedMember(declaration.element.methods[0]);
+ (builder as DartEditBuilder).writeOverrideOfInheritedMember(
+ elementForClassDeclaration(declaration).methods[0]);
});
});
SourceEdit edit = getEdit(builder);
@@ -424,8 +428,8 @@ A add(A a) {
CompilationUnit unit = resolveLibraryUnit(source);
FunctionDeclaration f = unit.declarations[0];
FormalParameterList parameters = f.functionExpression.parameters;
- Iterable<ParameterElement> elements = parameters.parameters
- .map((FormalParameter parameter) => parameter.element);
+ Iterable<ParameterElement> elements =
+ parameters.parameters.map(elementForFormalParameter);
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
@@ -443,8 +447,8 @@ A add(A a) {
CompilationUnit unit = resolveLibraryUnit(source);
FunctionDeclaration f = unit.declarations[0];
FormalParameterList parameters = f.functionExpression.parameters;
- Iterable<ParameterElement> elements = parameters.parameters
- .map((FormalParameter parameter) => parameter.element);
+ Iterable<ParameterElement> elements =
+ parameters.parameters.map(elementForFormalParameter);
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
@@ -462,8 +466,8 @@ A add(A a) {
CompilationUnit unit = resolveLibraryUnit(source);
FunctionDeclaration f = unit.declarations[0];
FormalParameterList parameters = f.functionExpression.parameters;
- Iterable<ParameterElement> elements = parameters.parameters
- .map((FormalParameter parameter) => parameter.element);
+ Iterable<ParameterElement> elements =
+ parameters.parameters.map(elementForFormalParameter);
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
@@ -532,7 +536,7 @@ f(int i, String s) {
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
- .writeParameterSource(classA.element.type, 'a');
+ .writeParameterSource(elementForClassDeclaration(classA).type, 'a');
});
});
SourceEdit edit = getEdit(builder);
@@ -547,8 +551,8 @@ f(int i, String s) {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
- (builder as DartEditBuilder)
- .writeType(unit.element.context.typeProvider.dynamicType);
+ (builder as DartEditBuilder).writeType(
+ elementForCompilationUnit(unit).context.typeProvider.dynamicType);
});
});
SourceEdit edit = getEdit(builder);
@@ -565,8 +569,10 @@ f(int i, String s) {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
- (builder as DartEditBuilder)
- .writeType(classB.element.type.instantiate([classA.element.type]));
+ (builder as DartEditBuilder).writeType(
+ elementForClassDeclaration(classB)
+ .type
+ .instantiate([elementForClassDeclaration(classA).type]));
});
});
SourceEdit edit = getEdit(builder);
@@ -582,8 +588,9 @@ f(int i, String s) {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
- (builder as DartEditBuilder)
- .writeType(classC.element.type, groupName: 'type');
+ (builder as DartEditBuilder).writeType(
+ elementForClassDeclaration(classC).type,
+ groupName: 'type');
});
});
SourceEdit edit = getEdit(builder);
@@ -605,8 +612,10 @@ f(int i, String s) {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
- (builder as DartEditBuilder).writeType(classC.element.type,
- addSupertypeProposals: true, groupName: 'type');
+ (builder as DartEditBuilder).writeType(
+ elementForClassDeclaration(classC).type,
+ addSupertypeProposals: true,
+ groupName: 'type');
});
});
SourceEdit edit = getEdit(builder);
@@ -653,7 +662,7 @@ f(int i, String s) {
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder).writeType(
- unit.element.context.typeProvider.dynamicType,
+ elementForCompilationUnit(unit).context.typeProvider.dynamicType,
required: true);
});
});
@@ -671,7 +680,7 @@ f(int i, String s) {
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
(builder as DartEditBuilder)
- .writeType(classA.element.type, required: true);
+ .writeType(elementForClassDeclaration(classA).type, required: true);
});
});
SourceEdit edit = getEdit(builder);
@@ -702,7 +711,8 @@ f(int i, String s) {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
- (builder as DartEditBuilder).writeType(classA.element.type);
+ (builder as DartEditBuilder)
+ .writeType(elementForClassDeclaration(classA).type);
});
});
SourceEdit edit = getEdit(builder);
@@ -734,8 +744,10 @@ f(int i, String s) {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
- (builder as DartEditBuilderImpl)
- .writeTypes([classA.element.type, classB.element.type]);
+ (builder as DartEditBuilderImpl).writeTypes([
+ elementForClassDeclaration(classA).type,
+ elementForClassDeclaration(classB).type
+ ]);
});
});
SourceEdit edit = getEdit(builder);
@@ -767,9 +779,10 @@ f(int i, String s) {
DartChangeBuilderImpl builder = new DartChangeBuilderImpl(context);
builder.addFileEdit(source, 1, (FileEditBuilder builder) {
builder.addInsertion(content.length - 1, (EditBuilder builder) {
- (builder as DartEditBuilderImpl).writeTypes(
- [classA.element.type, classB.element.type],
- prefix: 'implements ');
+ (builder as DartEditBuilderImpl).writeTypes([
+ elementForClassDeclaration(classA).type,
+ elementForClassDeclaration(classB).type
+ ], prefix: 'implements ');
});
});
SourceEdit edit = getEdit(builder);
« no previous file with comments | « pkg/analysis_server/test/services/correction/fix_test.dart ('k') | pkg/analyzer/benchmark/errors_in_all_libraries.dart » ('j') | pkg/analyzer/lib/dart/ast/resolution_accessors.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698