Add tests for highlighting implicit instance creation.

And in general run analysis server tests with `previewDart2 = true`.

R=brianwilkerson@google.com, devoncarew@google.com

Change-Id: I063d667e96a46d60d3b10aa1a87b4c7a7d2252e5
Reviewed-on: https://dart-review.googlesource.com/42101
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Konstantin Shcheglov
2018-02-16 20:52:01 +00:00
parent 04100796c1
commit a412f24e41
4 changed files with 45 additions and 4 deletions
@@ -496,7 +496,7 @@ void my_function(String a) {
assertHasRegion(HighlightRegionType.COMMENT_BLOCK, '/* b', 19);
}
test_CONSTRUCTOR() async {
test_CONSTRUCTOR_explicitNew() async {
addTestFile('''
class AAA<T> {
AAA() {}
@@ -516,6 +516,26 @@ main() {
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'name(42)');
}
test_CONSTRUCTOR_implicitNew() async {
addTestFile('''
class AAA<T> {
AAA() {}
AAA.name(p) {}
}
main() {
AAA<int>();
AAA<int>.name(42);
}
''');
await prepareHighlights();
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'AAA<int>(');
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'AAA<int>.name(');
assertHasRegion(HighlightRegionType.CLASS, 'int>(');
assertHasRegion(HighlightRegionType.CLASS, 'int>.name(');
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'name(p)');
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'name(42)');
}
test_DIRECTIVE() async {
addTestFile('''
library lib;
@@ -497,7 +497,7 @@ void my_function(String a) {
assertHasRegion(HighlightRegionType.COMMENT_BLOCK, '/* b', 19);
}
test_CONSTRUCTOR() async {
test_CONSTRUCTOR_explicitNew() async {
addTestFile('''
class AAA<T> {
AAA() {}
@@ -517,6 +517,26 @@ main() {
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'name(42)');
}
test_CONSTRUCTOR_implicitNew() async {
addTestFile('''
class AAA<T> {
AAA() {}
AAA.name(p) {}
}
main() {
AAA<int>();
AAA<int>.name(42);
}
''');
await prepareHighlights();
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'AAA<int>(');
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'AAA<int>.name(');
assertHasRegion(HighlightRegionType.CLASS, 'int>(');
assertHasRegion(HighlightRegionType.CLASS, 'int>.name(');
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'name(p)');
assertHasRegion(HighlightRegionType.CONSTRUCTOR, 'name(42)');
}
test_DIRECTIVE() async {
addTestFile('''
library lib;
@@ -116,7 +116,8 @@ class AbstractAnalysisTest extends Object with ResourceProviderMixin {
//
// Create server
//
AnalysisServerOptions options = new AnalysisServerOptions();
AnalysisServerOptions options = new AnalysisServerOptions()
..previewDart2 = true;
return new AnalysisServer(
serverChannel,
resourceProvider,
@@ -353,7 +353,7 @@ class AnalysisTestHelper extends Object with ResourceProviderMixin {
serverChannel,
resourceProvider,
new MockPackageMapProvider(),
new AnalysisServerOptions(),
new AnalysisServerOptions()..previewDart2 = true,
new DartSdkManager('/', false),
InstrumentationService.NULL_SERVICE);
handler = new AnalysisDomainHandler(server);