Version 2.15.0-280.0.dev
Merge commit '3b47f1535d342d064096dfe91a94e0410634b399' into 'dev'
diff --git a/pkg/analyzer/test/src/dart/resolution/comment_test.dart b/pkg/analyzer/test/src/dart/resolution/comment_test.dart
index 3d386b9..7735e22 100644
--- a/pkg/analyzer/test/src/dart/resolution/comment_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/comment_test.dart
@@ -15,359 +15,7 @@
@reflectiveTest
class CommentDriverResolutionTest extends PubPackageResolutionTest {
- test_error_unqualifiedReferenceToNonLocalStaticMember() async {
- await assertNoErrorsInCode(r'''
-class A {
- static void foo() {}
-}
-
-/// [foo]
-class B extends A {}
-''');
-
- assertElement(
- findNode.simple('foo]'),
- findElement.method('foo', of: 'A'),
- );
- }
-
- test_identifier_beforeClass() async {
- await assertNoErrorsInCode(r'''
-/// [foo]
-class A {
- foo() {}
-}
-''');
-
- assertElement(
- findNode.simple('foo]'),
- findElement.method('foo'),
- );
- }
-
- test_identifier_beforeConstructor() async {
- await assertNoErrorsInCode(r'''
-class A {
- /// [p]
- A(int p);
-}''');
-
- assertElement(
- findNode.simple('p]'),
- findElement.parameter('p'),
- );
- }
-
- test_identifier_beforeEnum() async {
- await assertNoErrorsInCode(r'''
-/// This is the [Samurai] kind.
-enum Samurai {
- /// Use [int].
- WITH_SWORD,
- /// Like [WITH_SWORD], but only without one.
- WITHOUT_SWORD
-}''');
-
- assertElement(
- findNode.simple('Samurai]'),
- findElement.enum_('Samurai'),
- );
- assertElement(
- findNode.simple('int]'),
- intElement,
- );
- assertElement(
- findNode.simple('WITH_SWORD]'),
- findElement.getter('WITH_SWORD'),
- );
- }
-
- test_identifier_beforeFunction_blockBody() async {
- await assertNoErrorsInCode(r'''
-/// [p]
-foo(int p) {}
-''');
-
- assertElement(
- findNode.simple('p]'),
- findElement.parameter('p'),
- );
- }
-
- test_identifier_beforeFunction_expressionBody() async {
- await assertNoErrorsInCode(r'''
-/// [p]
-foo(int p) => null;
-''');
-
- assertElement(
- findNode.simple('p]'),
- findElement.parameter('p'),
- );
- }
-
- test_identifier_beforeFunctionTypeAlias() async {
- await assertNoErrorsInCode(r'''
-/// [p]
-typedef Foo(int p);
-''');
-
- assertElement(
- findNode.simple('p]'),
- findElement.parameter('p'),
- );
- }
-
- test_identifier_beforeGenericTypeAlias() async {
- await assertNoErrorsInCode(r'''
-/// Can resolve [T], [S], and [p].
-typedef Foo<T> = Function<S>(int p);
-''');
-
- assertElement(
- findNode.simple('T]'),
- findElement.typeParameter('T'),
- );
- assertElement(findNode.simple('S]'), findElement.typeParameter('S'));
- assertElement(
- findNode.simple('p]'),
- findElement.parameter('p'),
- );
- }
-
- test_identifier_beforeGetter() async {
- await assertNoErrorsInCode(r'''
-/// [int]
-get g => null;
-''');
-
- assertElement(findNode.simple('int]'), intElement);
- }
-
- test_identifier_beforeMethod() async {
- await assertNoErrorsInCode(r'''
-abstract class A {
- /// [p1]
- ma(int p1);
-
- /// [p2]
- mb(int p2);
-
- /// [p3] and [p4]
- mc(int p3, p4());
-
- /// [p5]
- md(int p5, {int p6});
-}
-''');
-
- assertElement(findNode.simple('p1]'), findElement.parameter('p1'));
- assertElement(findNode.simple('p2]'), findElement.parameter('p2'));
- assertElement(findNode.simple('p3]'), findElement.parameter('p3'));
- assertElement(findNode.simple('p4]'), findElement.parameter('p4'));
- assertElement(findNode.simple('p5]'), findElement.parameter('p5'));
- }
-
- test_identifier_class_instanceGetter() async {
- await assertNoErrorsInCode(r'''
-class A {
- int get foo => 0;
-}
-
-/// [A.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('A.foo'), findElement.class_('A'));
- assertElement(findNode.simple('foo]'), findElement.getter('foo'));
- }
-
- test_identifier_class_instanceMethod() async {
- await assertNoErrorsInCode(r'''
-class A {
- void foo() {}
-}
-
-/// [A.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('A.foo'), findElement.class_('A'));
- assertElement(findNode.simple('foo]'), findElement.method('foo'));
- }
-
- test_identifier_class_instanceSetter() async {
- await assertNoErrorsInCode(r'''
-class A {
- set foo(int _) {}
-}
-
-/// [A.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('A.foo'), findElement.class_('A'));
- assertElement(findNode.simple('foo]'), findElement.setter('foo'));
- }
-
- test_identifier_class_staticGetter() async {
- await assertNoErrorsInCode(r'''
-class A {
- static int get foo => 0;
-}
-
-/// [A.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('A.foo'), findElement.class_('A'));
- assertElement(findNode.simple('foo]'), findElement.getter('foo'));
- }
-
- test_identifier_class_staticMethod() async {
- await assertNoErrorsInCode(r'''
-class A {
- static void foo() {}
-}
-
-/// [A.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('A.foo'), findElement.class_('A'));
- assertElement(findNode.simple('foo]'), findElement.method('foo'));
- }
-
- test_identifier_class_staticSetter() async {
- await assertNoErrorsInCode(r'''
-class A {
- static set foo(int _) {}
-}
-
-/// [A.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('A.foo'), findElement.class_('A'));
- assertElement(findNode.simple('foo]'), findElement.setter('foo'));
- }
-
- test_identifier_extension_instanceGetter() async {
- await assertNoErrorsInCode(r'''
-extension E on int {
- int get foo => 0;
-}
-
-/// [E.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
- assertElement(findNode.simple('foo]'), findElement.getter('foo'));
- }
-
- test_identifier_extension_instanceMethod() async {
- await assertNoErrorsInCode(r'''
-extension E on int {
- void foo() {}
-}
-
-/// [E.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
- assertElement(findNode.simple('foo]'), findElement.method('foo'));
- }
-
- test_identifier_extension_instanceSetter() async {
- await assertNoErrorsInCode(r'''
-extension E on int {
- set foo(int _) {}
-}
-
-/// [E.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
- assertElement(findNode.simple('foo]'), findElement.setter('foo'));
- }
-
- test_identifier_extension_staticGetter() async {
- await assertNoErrorsInCode(r'''
-extension E on int {
- static int get foo => 0;
-}
-
-/// [E.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
- assertElement(findNode.simple('foo]'), findElement.getter('foo'));
- }
-
- test_identifier_extension_staticMethod() async {
- await assertNoErrorsInCode(r'''
-extension E on int {
- static void foo() {}
-}
-
-/// [E.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
- assertElement(findNode.simple('foo]'), findElement.method('foo'));
- }
-
- test_identifier_extension_staticSetter() async {
- await assertNoErrorsInCode(r'''
-extension E on int {
- static set foo(int _) {}
-}
-
-/// [E.foo]
-void f() {}
-''');
-
- assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
- assertElement(findNode.simple('foo]'), findElement.setter('foo'));
- }
-
- test_identifier_parameter_functionTyped() async {
- await assertNoErrorsInCode(r'''
-/// [bar]
-foo(int bar()) {}
-''');
-
- assertElement(
- findNode.simple('bar]'),
- findElement.parameter('bar'),
- );
- }
-
- test_identifier_setter() async {
- await assertNoErrorsInCode(r'''
-class A {
- /// [x] in A
- mA() {}
- set x(value) {}
-}
-
-class B extends A {
- /// [x] in B
- mB() {}
-}
-''');
-
- var x = findElement.setter('x', of: 'A');
- assertElement(findNode.simple('x] in A'), x);
- assertElement(findNode.simple('x] in B'), x);
- }
-
- test_new() async {
+ test_newKeyword() async {
await assertErrorsInCode('''
class A {
A();
@@ -394,4 +42,356 @@
findElement.constructor('named', of: 'A'),
);
}
+
+ test_prefixedIdentifier_class_instanceGetter() async {
+ await assertNoErrorsInCode(r'''
+class A {
+ int get foo => 0;
+}
+
+/// [A.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('A.foo'), findElement.class_('A'));
+ assertElement(findNode.simple('foo]'), findElement.getter('foo'));
+ }
+
+ test_prefixedIdentifier_class_instanceMethod() async {
+ await assertNoErrorsInCode(r'''
+class A {
+ void foo() {}
+}
+
+/// [A.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('A.foo'), findElement.class_('A'));
+ assertElement(findNode.simple('foo]'), findElement.method('foo'));
+ }
+
+ test_prefixedIdentifier_class_instanceSetter() async {
+ await assertNoErrorsInCode(r'''
+class A {
+ set foo(int _) {}
+}
+
+/// [A.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('A.foo'), findElement.class_('A'));
+ assertElement(findNode.simple('foo]'), findElement.setter('foo'));
+ }
+
+ test_prefixedIdentifier_class_staticGetter() async {
+ await assertNoErrorsInCode(r'''
+class A {
+ static int get foo => 0;
+}
+
+/// [A.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('A.foo'), findElement.class_('A'));
+ assertElement(findNode.simple('foo]'), findElement.getter('foo'));
+ }
+
+ test_prefixedIdentifier_class_staticMethod() async {
+ await assertNoErrorsInCode(r'''
+class A {
+ static void foo() {}
+}
+
+/// [A.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('A.foo'), findElement.class_('A'));
+ assertElement(findNode.simple('foo]'), findElement.method('foo'));
+ }
+
+ test_prefixedIdentifier_class_staticSetter() async {
+ await assertNoErrorsInCode(r'''
+class A {
+ static set foo(int _) {}
+}
+
+/// [A.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('A.foo'), findElement.class_('A'));
+ assertElement(findNode.simple('foo]'), findElement.setter('foo'));
+ }
+
+ test_prefixedIdentifier_extension_instanceGetter() async {
+ await assertNoErrorsInCode(r'''
+extension E on int {
+ int get foo => 0;
+}
+
+/// [E.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
+ assertElement(findNode.simple('foo]'), findElement.getter('foo'));
+ }
+
+ test_prefixedIdentifier_extension_instanceMethod() async {
+ await assertNoErrorsInCode(r'''
+extension E on int {
+ void foo() {}
+}
+
+/// [E.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
+ assertElement(findNode.simple('foo]'), findElement.method('foo'));
+ }
+
+ test_prefixedIdentifier_extension_instanceSetter() async {
+ await assertNoErrorsInCode(r'''
+extension E on int {
+ set foo(int _) {}
+}
+
+/// [E.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
+ assertElement(findNode.simple('foo]'), findElement.setter('foo'));
+ }
+
+ test_prefixedIdentifier_extension_staticGetter() async {
+ await assertNoErrorsInCode(r'''
+extension E on int {
+ static int get foo => 0;
+}
+
+/// [E.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
+ assertElement(findNode.simple('foo]'), findElement.getter('foo'));
+ }
+
+ test_prefixedIdentifier_extension_staticMethod() async {
+ await assertNoErrorsInCode(r'''
+extension E on int {
+ static void foo() {}
+}
+
+/// [E.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
+ assertElement(findNode.simple('foo]'), findElement.method('foo'));
+ }
+
+ test_prefixedIdentifier_extension_staticSetter() async {
+ await assertNoErrorsInCode(r'''
+extension E on int {
+ static set foo(int _) {}
+}
+
+/// [E.foo]
+void f() {}
+''');
+
+ assertElement(findNode.simple('E.foo'), findElement.extension_('E'));
+ assertElement(findNode.simple('foo]'), findElement.setter('foo'));
+ }
+
+ test_simpleIdentifier_beforeClass() async {
+ await assertNoErrorsInCode(r'''
+/// [foo]
+class A {
+ foo() {}
+}
+''');
+
+ assertElement(
+ findNode.simple('foo]'),
+ findElement.method('foo'),
+ );
+ }
+
+ test_simpleIdentifier_beforeConstructor() async {
+ await assertNoErrorsInCode(r'''
+class A {
+ /// [p]
+ A(int p);
+}''');
+
+ assertElement(
+ findNode.simple('p]'),
+ findElement.parameter('p'),
+ );
+ }
+
+ test_simpleIdentifier_beforeEnum() async {
+ await assertNoErrorsInCode(r'''
+/// This is the [Samurai] kind.
+enum Samurai {
+ /// Use [int].
+ WITH_SWORD,
+ /// Like [WITH_SWORD], but only without one.
+ WITHOUT_SWORD
+}''');
+
+ assertElement(
+ findNode.simple('Samurai]'),
+ findElement.enum_('Samurai'),
+ );
+ assertElement(
+ findNode.simple('int]'),
+ intElement,
+ );
+ assertElement(
+ findNode.simple('WITH_SWORD]'),
+ findElement.getter('WITH_SWORD'),
+ );
+ }
+
+ test_simpleIdentifier_beforeFunction_blockBody() async {
+ await assertNoErrorsInCode(r'''
+/// [p]
+foo(int p) {}
+''');
+
+ assertElement(
+ findNode.simple('p]'),
+ findElement.parameter('p'),
+ );
+ }
+
+ test_simpleIdentifier_beforeFunction_expressionBody() async {
+ await assertNoErrorsInCode(r'''
+/// [p]
+foo(int p) => null;
+''');
+
+ assertElement(
+ findNode.simple('p]'),
+ findElement.parameter('p'),
+ );
+ }
+
+ test_simpleIdentifier_beforeFunctionTypeAlias() async {
+ await assertNoErrorsInCode(r'''
+/// [p]
+typedef Foo(int p);
+''');
+
+ assertElement(
+ findNode.simple('p]'),
+ findElement.parameter('p'),
+ );
+ }
+
+ test_simpleIdentifier_beforeGenericTypeAlias() async {
+ await assertNoErrorsInCode(r'''
+/// Can resolve [T], [S], and [p].
+typedef Foo<T> = Function<S>(int p);
+''');
+
+ assertElement(
+ findNode.simple('T]'),
+ findElement.typeParameter('T'),
+ );
+ assertElement(findNode.simple('S]'), findElement.typeParameter('S'));
+ assertElement(
+ findNode.simple('p]'),
+ findElement.parameter('p'),
+ );
+ }
+
+ test_simpleIdentifier_beforeGetter() async {
+ await assertNoErrorsInCode(r'''
+/// [int]
+get g => null;
+''');
+
+ assertElement(findNode.simple('int]'), intElement);
+ }
+
+ test_simpleIdentifier_beforeMethod() async {
+ await assertNoErrorsInCode(r'''
+abstract class A {
+ /// [p1]
+ ma(int p1);
+
+ /// [p2]
+ mb(int p2);
+
+ /// [p3] and [p4]
+ mc(int p3, p4());
+
+ /// [p5]
+ md(int p5, {int p6});
+}
+''');
+
+ assertElement(findNode.simple('p1]'), findElement.parameter('p1'));
+ assertElement(findNode.simple('p2]'), findElement.parameter('p2'));
+ assertElement(findNode.simple('p3]'), findElement.parameter('p3'));
+ assertElement(findNode.simple('p4]'), findElement.parameter('p4'));
+ assertElement(findNode.simple('p5]'), findElement.parameter('p5'));
+ }
+
+ test_simpleIdentifier_parameter_functionTyped() async {
+ await assertNoErrorsInCode(r'''
+/// [bar]
+foo(int bar()) {}
+''');
+
+ assertElement(
+ findNode.simple('bar]'),
+ findElement.parameter('bar'),
+ );
+ }
+
+ test_simpleIdentifier_setter() async {
+ await assertNoErrorsInCode(r'''
+class A {
+ /// [x] in A
+ mA() {}
+ set x(value) {}
+}
+
+class B extends A {
+ /// [x] in B
+ mB() {}
+}
+''');
+
+ var x = findElement.setter('x', of: 'A');
+ assertElement(findNode.simple('x] in A'), x);
+ assertElement(findNode.simple('x] in B'), x);
+ }
+
+ test_simpleIdentifier_unqualifiedReferenceToNonLocalStaticMember() async {
+ await assertNoErrorsInCode('''
+class A {
+ static void foo() {}
+}
+
+/// [foo]
+class B extends A {}
+''');
+
+ assertElement(
+ findNode.simple('foo]'),
+ findElement.method('foo', of: 'A'),
+ );
+ }
}
diff --git a/tools/VERSION b/tools/VERSION
index 606d727..a07350a 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 15
PATCH 0
-PRERELEASE 279
+PRERELEASE 280
PRERELEASE_PATCH 0
\ No newline at end of file
