diff --git a/.github/workflows/dart_ci.yaml b/.github/workflows/dart_ci.yaml index 386af56..265cb24 100644 --- a/.github/workflows/dart_ci.yaml +++ b/.github/workflows/dart_ci.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - sdk: [ 2.13.4, 2.18.7, stable, beta ] + sdk: [ 2.18.7, 2.19.6, stable ] steps: - uses: actions/checkout@v2 - uses: dart-lang/setup-dart@v1 diff --git a/lib/src/analyzer_helpers.dart b/lib/src/analyzer_helpers.dart index 1a99669..58ea8c6 100644 --- a/lib/src/analyzer_helpers.dart +++ b/lib/src/analyzer_helpers.dart @@ -172,7 +172,7 @@ String _copyFieldDeclaration(FieldDeclaration decl, String initializer) { if (decl.staticKeyword != null) { result = '${decl.staticKeyword} $result'; } - result = '$result ${decl.fields.variables.first.name.name}'; + result = '$result ${decl.fields.variables.first.name.lexeme}'; if (initializer.isNotEmpty) { result = '$result = $initializer;'; } else { @@ -192,7 +192,7 @@ String _copyGetterDeclaration(MethodDeclaration decl, String body) { result = 'static $result'; } - result = '$result ${decl.name.name}'; + result = '$result ${decl.name.lexeme}'; if (decl.body.keyword != null) { result = '$result ${decl.body.keyword}${decl.body.star ?? ''}'; } @@ -205,12 +205,12 @@ String _copySetterDeclaration(MethodDeclaration decl, String body) { if (decl.isStatic) { result = 'static $result'; } - result = '$result ${decl.name.name}${decl.parameters} {\n$body\n }'; + result = '$result ${decl.name.lexeme}${decl.parameters} {\n$body\n }'; return result; } String _copyMethodDeclaration(MethodDeclaration decl, String body) { - var result = '${decl.name.name}'; + var result = '${decl.name.lexeme}'; if (decl.returnType != null) { result = '${decl.returnType} $result'; } diff --git a/pubspec.yaml b/pubspec.yaml index e6f0b29..32891ab 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ environment: sdk: ">=2.12.0 <3.0.0" dependencies: - analyzer: '>=2.0.0 <5.0.0' + analyzer: ^5.0.0 build: ^2.0.3 collection: ^1.15.0 path: ^1.8.0 diff --git a/test/test_utils.dart b/test/test_utils.dart index 847d582..57bae68 100644 --- a/test/test_utils.dart +++ b/test/test_utils.dart @@ -31,7 +31,7 @@ class TestAnnotation { ConstructorDeclaration? getConstructor(ClassDeclaration classDecl, {String? name}) { for (var member in classDecl.members) { - if (member is ConstructorDeclaration && member.name?.name == name) { + if (member is ConstructorDeclaration && member.name?.lexeme == name) { return member; } } @@ -41,7 +41,7 @@ ConstructorDeclaration? getConstructor(ClassDeclaration classDecl, FieldDeclaration? getFieldByName(ClassDeclaration classDecl, String name) { for (var member in classDecl.members) { if (member is FieldDeclaration && - member.fields.variables.first.name.name == name) { + member.fields.variables.first.name.lexeme == name) { return member; } } @@ -50,7 +50,7 @@ FieldDeclaration? getFieldByName(ClassDeclaration classDecl, String name) { MethodDeclaration? getMethodByName(ClassDeclaration classDecl, String name) { for (var member in classDecl.members) { - if (member is MethodDeclaration && member.name.name == name) { + if (member is MethodDeclaration && member.name.lexeme == name) { return member; } }