Skip to content
This repository was archived by the owner on Jul 16, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ jobs:
bash <(curl -s https://codecov.io/bash) -f coverage/coverage.lcov

minimal-dart:
name: Build on minimal supported 2.12 dart
name: Build on minimal supported 2.14 dart

runs-on: ubuntu-latest

steps:
- uses: dart-lang/setup-dart@v1
with:
sdk: "2.12.4"
sdk: "2.14.0"
- uses: actions/checkout@v2
- name: Install dependencies
run: pub downgrade
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

* chore: changed min `SDK` version to `2.14.0`.
* chore: restrict `analyzer` version to `>=2.4.0 <2.6.0`.
* chore: changed the supported `analyzer_plugin` version to `^0.8.0`.

## 4.4.0

* feat: introduce `check-unused-l10n` command.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ abstract class IntlBaseVisitor extends GeneralizingAstVisitor<void> {

@override
void visitFieldDeclaration(FieldDeclaration node) {
if (node.fields.type?.as<TypeName>()?.name.name != 'String') {
if (node.fields.type?.as<NamedType>()?.name.name != 'String') {
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class _Visitor extends RecursiveAstVisitor<void> {

@override
void visitClassDeclaration(ClassDeclaration node) {
final classType = node.extendsClause?.superclass.type;
final classType = node.extendsClause?.superclass2.type;
if (!isWidgetOrSubclass(classType) && !isWidgetStateOrSubclass(classType)) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class _Visitor extends RecursiveAstVisitor<void> {
void visitClassDeclaration(ClassDeclaration node) {
super.visitClassDeclaration(node);

final type = node.extendsClause?.superclass.type;
final type = node.extendsClause?.superclass2.type;
if (type == null || !isWidgetStateOrSubclass(type)) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ class _Visitor extends RecursiveAstVisitor<void> {

bool _hasObjectType(TypeAnnotation? type) =>
type?.type?.isDartCoreObject ??
(type is TypeName && type.name.name == 'Object');
(type is NamedType && type.name.name == 'Object');
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class _Visitor extends SimpleAstVisitor<void> {

@override
void visitClassDeclaration(ClassDeclaration node) {
final classType = node.extendsClause?.superclass.type;
final classType = node.extendsClause?.superclass2.type;
if (!isWidgetOrSubclass(classType) && !isWidgetStateOrSubclass(classType)) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class _Visitor extends SimpleAstVisitor<void> {
void visitClassDeclaration(ClassDeclaration node) {
super.visitClassDeclaration(node);

final classType = node.extendsClause?.superclass.type;
final classType = node.extendsClause?.superclass2.type;
if (isWidgetOrSubclass(classType) &&
(!_ignorePrivateWidgets || !Identifier.isPrivateName(node.name.name))) {
_nodes.add(node);
Expand Down
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ issue_tracker: https://github.com/dart-code-checker/dart-code-metrics/issues
documentation: https://dartcodemetrics.dev/docs/getting-started/introduction

environment:
sdk: ">=2.12.0 <3.0.0"
sdk: ">=2.14.0 <3.0.0"

dependencies:
analyzer: '>=2.1.0 <2.4.0'
analyzer_plugin: ^0.7.0
analyzer: '>=2.4.0 <2.6.0'
analyzer_plugin: ^0.8.0
ansicolor: ^2.0.1
args: ^2.0.0
collection: ^1.15.0
Expand Down
2 changes: 1 addition & 1 deletion test/analyzer_plugin/analyzer_plugin_utils_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart';
import 'package:dart_code_metrics/lint_analyzer.dart';
import 'package:dart_code_metrics/src/analyzer_plugin/analyzer_plugin_utils.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/issue.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/replacement.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/severity.dart';
import 'package:mocktail/mocktail.dart';
import 'package:source_span/source_span.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@TestOn('vm')
import 'package:dart_code_metrics/lint_analyzer.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/issue.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/severity.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/reporters/reporters_list/html/components/issue_details_tooltip.dart';
import 'package:source_span/source_span.dart';
import 'package:test/test.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@TestOn('vm')
import 'package:ansicolor/ansicolor.dart';
import 'package:dart_code_metrics/lint_analyzer.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/metrics/models/metric_value_level.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/issue.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/severity.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/reporters/reporters_list/console/lint_console_reporter_helper.dart';
import 'package:source_span/source_span.dart';
import 'package:test/test.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import 'package:analyzer/dart/ast/ast.dart';
import 'package:dart_code_metrics/lint_analyzer.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/metrics/models/metric_documentation.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/metrics/models/metric_value.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/metrics/models/metric_value_level.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/context_message.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/entity_type.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/issue.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/lint_file_report.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/replacement.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/report.dart';
import 'package:dart_code_metrics/src/analyzers/lint_analyzer/models/severity.dart';
import 'package:mocktail/mocktail.dart';
Expand Down
2 changes: 1 addition & 1 deletion test/config_builder/models/analysis_options_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void main() {
expect(
(options.options['linter'] as Map<String, Object>)['rules'],
containsAll(
<String>['always_declare_return_types', 'type_init_formals'],
<String>['avoid_empty_else', 'type_init_formals'],
),
);

Expand Down
2 changes: 1 addition & 1 deletion test/resources/analysis_options_common.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include: package:pedantic/analysis_options.yaml
include: package:lints/recommended.yaml

analyzer:
exclude:
Expand Down