|
2 | 2 | // for details. All rights reserved. Use of this source code is governed by a |
3 | 3 | // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
|
5 | | -// ignore_for_file: analyzer_use_new_elements |
6 | | - |
7 | | -import 'package:analyzer/dart/element/element.dart'; |
8 | 5 | import 'package:analyzer/dart/element/type.dart'; |
9 | 6 | import 'package:analyzer/src/dart/element/element.dart'; |
10 | 7 | import 'package:test/test.dart'; |
@@ -2004,19 +2001,13 @@ library |
2004 | 2001 |
|
2005 | 2002 | // We intentionally don't check the text, because we want to test |
2006 | 2003 | // requesting individual elements, not all accessors/variables at once. |
2007 | | - var getter = _elementOfDefiningUnit(library, ['@getter', 'x']) |
2008 | | - as PropertyAccessorElementImpl; |
2009 | | - var variable = getter.variable2 as TopLevelVariableElementImpl; |
| 2004 | + var getter = library.getters.single; |
| 2005 | + var variable = getter.variable3 as TopLevelVariableElementImpl2; |
2010 | 2006 | expect(variable, isNotNull); |
2011 | 2007 | expect(variable.isFinal, isFalse); |
2012 | | - expect(variable.getter, same(getter)); |
| 2008 | + expect(variable.getter2, same(getter)); |
2013 | 2009 | _assertTypeStr(variable.type, 'int'); |
2014 | | - expect( |
2015 | | - variable, |
2016 | | - same( |
2017 | | - _elementOfDefiningUnit(library, ['@topLevelVariable', 'x']), |
2018 | | - ), |
2019 | | - ); |
| 2010 | + expect(variable, same(library.topLevelVariables.single)); |
2020 | 2011 | } |
2021 | 2012 |
|
2022 | 2013 | test_variable_implicit_type() async { |
@@ -3638,23 +3629,6 @@ library |
3638 | 3629 | var typeStr = type.getDisplayString(); |
3639 | 3630 | expect(typeStr, expected); |
3640 | 3631 | } |
3641 | | - |
3642 | | - // TODO(scheglov): This is duplicate. |
3643 | | - Element _elementOfDefiningUnit( |
3644 | | - LibraryElementImpl library, List<String> names) { |
3645 | | - var reference = library.definingCompilationUnit.reference!; |
3646 | | - for (var name in names) { |
3647 | | - reference = reference.getChild(name); |
3648 | | - } |
3649 | | - |
3650 | | - var element = reference.element; |
3651 | | - if (element != null) { |
3652 | | - return element; |
3653 | | - } |
3654 | | - |
3655 | | - var elementFactory = library.linkedData!.elementFactory; |
3656 | | - return elementFactory.elementOfReference(reference)!; |
3657 | | - } |
3658 | 3632 | } |
3659 | 3633 |
|
3660 | 3634 | abstract class TopLevelVariableElementTest_augmentation |
|
0 commit comments