diff --git a/.github/workflows/tool_linter_rules.yaml b/.github/workflows/tool_linter_rules.yaml index c10c33c..dad63e9 100644 --- a/.github/workflows/tool_linter_rules.yaml +++ b/.github/workflows/tool_linter_rules.yaml @@ -17,7 +17,7 @@ jobs: - name: 🎯 Setup Dart uses: dart-lang/setup-dart@v1 with: - sdk: 3.6.0 + sdk: 3.7.0 - name: 📦 Install Dependencies run: dart pub get diff --git a/README.md b/README.md index 1fa1843..86c083e 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,6 @@ Below is a list of rules that are not enabled by default together with the reaso | [`matching_super_parameters`](https://dart.dev/tools/linter-rules/matching_super_parameters) | Not specified | | [`no_literal_bool_comparisons`](https://dart.dev/tools/linter-rules/no_literal_bool_comparisons) | Not specified | | [`omit_obvious_local_variable_types`](https://dart.dev/tools/linter-rules/omit_obvious_local_variable_types) | Not specified | -| [`omit_obvious_property_types`](https://dart.dev/tools/linter-rules/omit_obvious_property_types) | Not specified | | [`package_prefixed_library_names`](https://dart.dev/tools/linter-rules/package_prefixed_library_names) | [Broken; superseded by `unnecessary_library_name`](https://github.com/dart-lang/lints/issues/172) | | [`prefer_double_quotes`](https://dart.dev/tools/linter-rules/prefer_double_quotes) | Incompatible with [prefer_single_quotes](https://dart.dev/tools/linter-rules/prefer_single_quotes) | | [`prefer_expression_function_bodies`](https://dart.dev/tools/linter-rules/prefer_expression_function_bodies) | Not specified | @@ -119,14 +118,12 @@ Below is a list of rules that are not enabled by default together with the reaso | [`prefer_mixin`](https://dart.dev/tools/linter-rules/prefer_mixin) | Not specified | | [`prefer_relative_imports`](https://dart.dev/tools/linter-rules/prefer_relative_imports) | Incompatible with [always_use_package_imports](https://dart.dev/tools/linter-rules/always_use_package_imports) | | [`prefer_void_to_null`](https://dart.dev/tools/linter-rules/prefer_void_to_null) | [Has unresolved false positives](https://github.com/dart-lang/linter/issues/4758) | +| [`require_trailing_commas`](https://dart.dev/tools/linter-rules/require_trailing_commas) | Not specified | | [`specify_nonobvious_local_variable_types`](https://dart.dev/tools/linter-rules/specify_nonobvious_local_variable_types) | Not specified | -| [`specify_nonobvious_property_types`](https://dart.dev/tools/linter-rules/specify_nonobvious_property_types) | Not specified | -| [`strict_top_level_inference`](https://dart.dev/tools/linter-rules/strict_top_level_inference) | Not specified | | [`unnecessary_async`](https://dart.dev/tools/linter-rules/unnecessary_async) | Not specified | | [`unnecessary_final`](https://dart.dev/tools/linter-rules/unnecessary_final) | Incompatible with [prefer_final_locals](https://dart.dev/tools/linter-rules/prefer_final_locals) | | [`unnecessary_ignore`](https://dart.dev/tools/linter-rules/unnecessary_ignore) | Not specified | | [`unnecessary_null_aware_operator_on_extension_on_nullable`](https://dart.dev/tools/linter-rules/unnecessary_null_aware_operator_on_extension_on_nullable) | Not specified | -| [`unnecessary_underscores`](https://dart.dev/tools/linter-rules/unnecessary_underscores) | Not specified | | [`unreachable_from_main`](https://dart.dev/tools/linter-rules/unreachable_from_main) | Not specified | | [`unsafe_variance`](https://dart.dev/tools/linter-rules/unsafe_variance) | Not specified | | [`use_decorated_box`](https://dart.dev/tools/linter-rules/use_decorated_box) | [Has unresolved malfunctions](https://github.com/dart-lang/linter/issues/3286) | diff --git a/lib/analysis_options.8.0.0.yaml b/lib/analysis_options.8.0.0.yaml new file mode 100644 index 0000000..b32d47d --- /dev/null +++ b/lib/analysis_options.8.0.0.yaml @@ -0,0 +1,215 @@ +analyzer: + language: + strict-casts: true + strict-inference: true + strict-raw-types: true + + errors: + close_sinks: ignore + missing_required_param: error + missing_return: error + record_literal_one_positional_no_trailing_comma: error + collection_methods_unrelated_type: warning + unrelated_type_equality_checks: warning + + exclude: + - test/.test_coverage.dart + - lib/generated_plugin_registrant.dart + +linter: + rules: + - always_declare_return_types + - always_put_required_named_parameters_first + - always_use_package_imports + - annotate_overrides + - avoid_bool_literals_in_conditional_expressions + - avoid_catches_without_on_clauses + - avoid_catching_errors + - avoid_double_and_int_checks + - avoid_dynamic_calls + - avoid_empty_else + - avoid_equals_and_hash_code_on_mutable_classes + - avoid_escaping_inner_quotes + - avoid_field_initializers_in_const_classes + - avoid_final_parameters + - avoid_function_literals_in_foreach_calls + - avoid_init_to_null + - avoid_js_rounded_ints + - avoid_multiple_declarations_per_line + - avoid_positional_boolean_parameters + - avoid_print + - avoid_private_typedef_functions + - avoid_redundant_argument_values + - avoid_relative_lib_imports + - avoid_renaming_method_parameters + - avoid_return_types_on_setters + - avoid_returning_null_for_void + - avoid_returning_this + - avoid_setters_without_getters + - avoid_shadowing_type_parameters + - avoid_single_cascade_in_expression_statements + - avoid_slow_async_io + - avoid_type_to_string + - avoid_types_as_parameter_names + - avoid_unnecessary_containers + - avoid_unused_constructor_parameters + - avoid_void_async + - avoid_web_libraries_in_flutter + - await_only_futures + - camel_case_extensions + - camel_case_types + - cancel_subscriptions + - cascade_invocations + - cast_nullable_to_non_nullable + - collection_methods_unrelated_type + - combinators_ordering + - comment_references + - conditional_uri_does_not_exist + - constant_identifier_names + - control_flow_in_finally + - curly_braces_in_flow_control_structures + - dangling_library_doc_comments + - depend_on_referenced_packages + - deprecated_consistency + - directives_ordering + - document_ignores + - empty_catches + - empty_constructor_bodies + - empty_statements + - eol_at_end_of_file + - exhaustive_cases + - file_names + - flutter_style_todos + - hash_and_equals + - implicit_call_tearoffs + - implementation_imports + - implicit_reopen + - invalid_case_patterns + - invalid_runtime_check_with_js_interop_types + - join_return_with_assignment + - leading_newlines_in_multiline_strings + - library_annotations + - library_prefixes + - library_private_types_in_public_api + - lines_longer_than_80_chars + - literal_only_boolean_expressions + - missing_code_block_language_in_doc_comment + - missing_whitespace_between_adjacent_strings + - no_adjacent_strings_in_list + - no_default_cases + - no_duplicate_case_values + - no_leading_underscores_for_library_prefixes + - no_leading_underscores_for_local_identifiers + - no_logic_in_create_state + - no_runtimeType_toString + - no_self_assignments + - no_wildcard_variable_uses + - non_constant_identifier_names + - noop_primitive_operations + - null_check_on_nullable_type_parameter + - null_closures + - omit_local_variable_types + - omit_obvious_property_types + - one_member_abstracts + - only_throw_errors + - overridden_fields + - package_names + - parameter_assignments + - prefer_adjacent_string_concatenation + - prefer_asserts_in_initializer_lists + - prefer_asserts_with_message + - prefer_collection_literals + - prefer_conditional_assignment + - prefer_const_constructors + - prefer_const_constructors_in_immutables + - prefer_const_declarations + - prefer_const_literals_to_create_immutables + - prefer_constructors_over_static_methods + - prefer_contains + - prefer_final_fields + - prefer_final_in_for_each + - prefer_final_locals + - prefer_for_elements_to_map_fromIterable + - prefer_function_declarations_over_variables + - prefer_generic_function_type_aliases + - prefer_if_elements_to_conditional_expressions + - prefer_if_null_operators + - prefer_initializing_formals + - prefer_inlined_adds + - prefer_int_literals + - prefer_interpolation_to_compose_strings + - prefer_is_empty + - prefer_is_not_empty + - prefer_is_not_operator + - prefer_iterable_whereType + - prefer_null_aware_method_calls + - prefer_null_aware_operators + - prefer_single_quotes + - prefer_spread_collections + - prefer_typing_uninitialized_variables + - provide_deprecation_message + - public_member_api_docs + - recursive_getters + - secure_pubspec_urls + - sized_box_for_whitespace + - sized_box_shrink_expand + - slash_for_doc_comments + - sort_child_properties_last + - sort_constructors_first + - sort_pub_dependencies + - sort_unnamed_constructors_first + - specify_nonobvious_property_types + - strict_top_level_inference + - test_types_in_equals + - throw_in_finally + - tighten_type_of_initializing_formals + - type_annotate_public_apis + - type_init_formals + - type_literal_in_constant_pattern + - unawaited_futures + - unintended_html_in_doc_comment + - unnecessary_await_in_return + - unnecessary_breaks + - unnecessary_brace_in_string_interps + - unnecessary_const + - unnecessary_constructor_name + - unnecessary_getters_setters + - unnecessary_lambdas + - unnecessary_late + - unnecessary_library_directive + - unnecessary_library_name + - unnecessary_new + - unnecessary_null_aware_assignments + - unnecessary_null_checks + - unnecessary_null_in_if_null_operators + - unnecessary_nullable_for_final_variable_declarations + - unnecessary_overrides + - unnecessary_parenthesis + - unnecessary_raw_strings + - unnecessary_statements + - unnecessary_string_escapes + - unnecessary_string_interpolations + - unnecessary_this + - unnecessary_to_list_in_spreads + - unnecessary_underscores + - unrelated_type_equality_checks + - use_build_context_synchronously + - use_colored_box + - use_enums + - use_full_hex_values_for_flutter_colors + - use_function_type_syntax_for_parameters + - use_if_null_to_convert_nulls_to_bools + - use_is_even_rather_than_modulo + - use_key_in_widget_constructors + - use_late_for_private_fields_and_variables + - use_named_constants + - use_raw_strings + - use_rethrow_when_possible + - use_setters_to_change_properties + - use_string_buffers + - use_string_in_part_of_directives + - use_super_parameters + - use_test_throws_matchers + - use_to_and_as_if_applicable + - valid_regexps + - void_checks diff --git a/lib/analysis_options.yaml b/lib/analysis_options.yaml index c2f4cbb..34576f8 100644 --- a/lib/analysis_options.yaml +++ b/lib/analysis_options.yaml @@ -1 +1 @@ -include: package:very_good_analysis/analysis_options.7.0.0.yaml +include: package:very_good_analysis/analysis_options.8.0.0.yaml diff --git a/pubspec.yaml b/pubspec.yaml index 83b1e50..a9f8148 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,4 +8,4 @@ documentation: https://github.com/VeryGoodOpenSource/very_good_analysis topics: [lints, analyzer, analysis] environment: - sdk: ^3.5.0 + sdk: ^3.7.0 diff --git a/tool/bump_version/main.dart b/tool/bump_version/main.dart index 24c55bb..a2e15a5 100644 --- a/tool/bump_version/main.dart +++ b/tool/bump_version/main.dart @@ -27,17 +27,20 @@ import 'dart:io'; /// ``` /// /// It is expected that the first matched group will be `6.0.0`. -final _latestAnalysisVersionRegExp = - RegExp(r'analysis_options\.(\d+\.\d+\.\d+)\.yaml'); +final _latestAnalysisVersionRegExp = RegExp( + r'analysis_options\.(\d+\.\d+\.\d+)\.yaml', +); void main(List args) { final analysisOptionsFile = File('lib/analysis_options.yaml'); final content = analysisOptionsFile.readAsStringSync(); - final latestVersion = - _latestAnalysisVersionRegExp.firstMatch(content)?.group(1); + final latestVersion = _latestAnalysisVersionRegExp + .firstMatch(content) + ?.group(1); - final latestAnalysisOptionsFile = - File('lib/analysis_options.$latestVersion.yaml'); + final latestAnalysisOptionsFile = File( + 'lib/analysis_options.$latestVersion.yaml', + ); final newVersion = args[0]; final newAnalysisOptionsFile = File('lib/analysis_options.$newVersion.yaml'); diff --git a/tool/linter_rules/bin/inspect.dart b/tool/linter_rules/bin/inspect.dart index bf7f363..2e8e12f 100644 --- a/tool/linter_rules/bin/inspect.dart +++ b/tool/linter_rules/bin/inspect.dart @@ -4,7 +4,7 @@ import 'package:http/http.dart'; import 'package:linter_rules/linter_rules.dart'; /// The [Uri] to fetch all linter rules from. -final _allLinterRulesUri = Uri.parse( +final Uri _allLinterRulesUri = Uri.parse( 'https://raw.githubusercontent.com/dart-lang/site-www/refs/heads/main/src/_data/linter_rules.json', ); @@ -43,21 +43,21 @@ Future main( final response = await get(_allLinterRulesUri); final json = jsonDecode(response.body) as List; - final dartRules = json - .map( - (rule) => LinterRule.fromJson(rule as Map), - ) - .toList(); + final dartRules = + json + .map((rule) => LinterRule.fromJson(rule as Map)) + .toList(); log('Fetched ${dartRules.length} Dart linter rules'); final vgaRules = await allVeryGoodAnalysisRules(version: version); log('Fetched ${vgaRules.length} Very Good Analysis rules'); log(''); - final deprecatedDartRules = dartRules - .where((rule) => rule.state == LinterRuleState.deprecated) - .map((rule) => rule.name) - .toSet(); + final deprecatedDartRules = + dartRules + .where((rule) => rule.state == LinterRuleState.deprecated) + .map((rule) => rule.name) + .toSet(); final deprecatedVgaRules = vgaRules.where(deprecatedDartRules.contains).toList(); final deprecationMessage = StringBuffer( diff --git a/tool/linter_rules/exclusion_reasons.json b/tool/linter_rules/exclusion_reasons.json index 1ac0c7e..d9ed319 100644 --- a/tool/linter_rules/exclusion_reasons.json +++ b/tool/linter_rules/exclusion_reasons.json @@ -17,7 +17,6 @@ "matching_super_parameters": "Not specified", "no_literal_bool_comparisons": "Not specified", "omit_obvious_local_variable_types": "Not specified", - "omit_obvious_property_types": "Not specified", "package_prefixed_library_names": "[Broken; superseded by `unnecessary_library_name`](https://github.com/dart-lang/lints/issues/172)", "prefer_double_quotes": "Incompatible with [prefer_single_quotes](https://dart.dev/tools/linter-rules/prefer_single_quotes)", "prefer_expression_function_bodies": "Not specified", @@ -26,14 +25,12 @@ "prefer_mixin": "Not specified", "prefer_relative_imports": "Incompatible with [always_use_package_imports](https://dart.dev/tools/linter-rules/always_use_package_imports)", "prefer_void_to_null": "[Has unresolved false positives](https://github.com/dart-lang/linter/issues/4758)", + "require_trailing_commas": "Not specified", "specify_nonobvious_local_variable_types": "Not specified", - "specify_nonobvious_property_types": "Not specified", - "strict_top_level_inference": "Not specified", "unnecessary_async": "Not specified", "unnecessary_final": "Incompatible with [prefer_final_locals](https://dart.dev/tools/linter-rules/prefer_final_locals)", "unnecessary_ignore": "Not specified", "unnecessary_null_aware_operator_on_extension_on_nullable": "Not specified", - "unnecessary_underscores": "Not specified", "unreachable_from_main": "Not specified", "unsafe_variance": "Not specified", "use_decorated_box": "[Has unresolved malfunctions](https://github.com/dart-lang/linter/issues/3286)", diff --git a/tool/linter_rules/lib/exclusion_reason_table.dart b/tool/linter_rules/lib/exclusion_reason_table.dart index de68904..76c8c54 100644 --- a/tool/linter_rules/lib/exclusion_reason_table.dart +++ b/tool/linter_rules/lib/exclusion_reason_table.dart @@ -10,7 +10,7 @@ const _noReasonFallback = 'Not specified'; /// The tag delimiting the start and end of the excluded rules table in the /// README.md file. -const ReadmeTag _excludedRulesTableTag = ( +const _excludedRulesTableTag = ( '', '', ); @@ -60,16 +60,18 @@ Future main( List args, { void Function(String) log = print, }) async { - final argsParser = ArgParser() - ..addOption( - 'version', - help: 'The version of the Very Good Analysis to update the table for.', - ) - ..addFlag( - 'set-exit-if-changed', - help: - '''Set the exit code to 2 if there are changes to the exclusion reasons.''', - ); + final argsParser = + ArgParser() + ..addOption( + 'version', + help: + 'The version of the Very Good Analysis to update the table for.', + ) + ..addFlag( + 'set-exit-if-changed', + help: + '''Set the exit code to 2 if there are changes to the exclusion reasons.''', + ); final parsedArgs = argsParser.parse(args); final version = parsedArgs['version'] as String? ?? latestVgaVersion(); @@ -82,8 +84,8 @@ Future main( (await allVeryGoodAnalysisRules(version: version)).toSet(); log('Found ${veryGoodAnalysisRules.length} Very Good Analysis rules'); - final excludedRules = linterRules.difference(veryGoodAnalysisRules).toList() - ..sort(); + final excludedRules = + linterRules.difference(veryGoodAnalysisRules).toList()..sort(); log('Found ${excludedRules.length} excluded rules'); final previousExclusionReasons = await readExclusionReasons(); @@ -92,8 +94,11 @@ Future main( rule: previousExclusionReasons[rule] ?? _noReasonFallback, }; - final hasChanged = !const DeepCollectionEquality() - .equals(previousExclusionReasons, exclusionReasons); + final hasChanged = + !const DeepCollectionEquality().equals( + previousExclusionReasons, + exclusionReasons, + ); if (!hasChanged) { log('No changes to the exclusion reasons'); return; @@ -101,15 +106,13 @@ Future main( await writeExclusionReasons(exclusionReasons); - final markdownTable = generateMarkdownTable( - [ - ['Rule', 'Reason'], - ...excludedRules.map((rule) { - final ruleMarkdownLink = '[`$rule`](${_linterRuleLink(rule)})'; - return [ruleMarkdownLink, exclusionReasons[rule]!]; - }), - ], - ); + final markdownTable = generateMarkdownTable([ + ['Rule', 'Reason'], + ...excludedRules.map((rule) { + final ruleMarkdownLink = '[`$rule`](${_linterRuleLink(rule)})'; + return [ruleMarkdownLink, exclusionReasons[rule]!]; + }), + ]); await Readme().updateTagContent(_excludedRulesTableTag, '\n$markdownTable'); diff --git a/tool/linter_rules/lib/src/all_linter_rules.dart b/tool/linter_rules/lib/src/all_linter_rules.dart index 209ad07..df70348 100644 --- a/tool/linter_rules/lib/src/all_linter_rules.dart +++ b/tool/linter_rules/lib/src/all_linter_rules.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:http/http.dart'; /// The [Uri] to fetch all linter rules from. -final _allLinterRulesUri = Uri.parse( +final Uri _allLinterRulesUri = Uri.parse( 'https://raw.githubusercontent.com/dart-lang/sdk/main/pkg/linter/tool/machine/rules.json', ); @@ -17,17 +17,18 @@ final _allLinterRulesUri = Uri.parse( Future> allLinterRules() async { final response = await get(_allLinterRulesUri); - final data = (jsonDecode(response.body) as List) - ..removeWhere((data) { - final rule = data as Map; - final state = rule['state'] as String; - return state == 'removed'; - }) - ..removeWhere((data) { - final rule = data as Map; - final sdk = rule['sinceDartSdk'] as String; - return sdk.contains('wip'); - }); + final data = + (jsonDecode(response.body) as List) + ..removeWhere((data) { + final rule = data as Map; + final state = rule['state'] as String; + return state == 'removed'; + }) + ..removeWhere((data) { + final rule = data as Map; + final sdk = rule['sinceDartSdk'] as String; + return sdk.contains('wip'); + }); return data.map((data) { final rule = data as Map; diff --git a/tool/linter_rules/lib/src/all_vga_rules.dart b/tool/linter_rules/lib/src/all_vga_rules.dart index 67f6592..6271b5a 100644 --- a/tool/linter_rules/lib/src/all_vga_rules.dart +++ b/tool/linter_rules/lib/src/all_vga_rules.dart @@ -7,9 +7,11 @@ import 'package:yaml/yaml.dart'; /// /// It assumes that the current directory is the root of the `linter_rules` /// package (tool/linter_rules). -final _allVeryGoodAnalysisOptionsDirectoryPath = path.joinAll( - ['..', '..', 'lib'], -); +final String _allVeryGoodAnalysisOptionsDirectoryPath = path.joinAll([ + '..', + '..', + 'lib', +]); /// The name of the analysis options file. /// diff --git a/tool/linter_rules/lib/src/latest_vga_version.dart b/tool/linter_rules/lib/src/latest_vga_version.dart index aa32d5a..33ccd33 100644 --- a/tool/linter_rules/lib/src/latest_vga_version.dart +++ b/tool/linter_rules/lib/src/latest_vga_version.dart @@ -6,9 +6,12 @@ import 'package:path/path.dart' as path; /// /// It assumes that the current directory is the root of the `linter_rules` /// package (tool/linter_rules). -final _latestVeryGoodAnalaysisFilePath = path.joinAll( - ['..', '..', 'lib', 'analysis_options.yaml'], -); +final String _latestVeryGoodAnalaysisFilePath = path.joinAll([ + '..', + '..', + 'lib', + 'analysis_options.yaml', +]); /// Returns the latest Very Good Analysis version from the analysis options /// file. diff --git a/tool/linter_rules/lib/src/linter_rules_reasons.dart b/tool/linter_rules/lib/src/linter_rules_reasons.dart index ad25500..ded360e 100644 --- a/tool/linter_rules/lib/src/linter_rules_reasons.dart +++ b/tool/linter_rules/lib/src/linter_rules_reasons.dart @@ -7,7 +7,7 @@ import 'package:path/path.dart' as path; /// /// It assumes that the current directory is the root of the `linter_rules` /// package (tool/linter_rules). -final _reasonsFilePath = path.join('exclusion_reasons.json'); +final String _reasonsFilePath = path.join('exclusion_reasons.json'); /// The reasons for disabling a rule. /// diff --git a/tool/linter_rules/lib/src/markdown_table_generator.dart b/tool/linter_rules/lib/src/markdown_table_generator.dart index 486842b..d23f9a6 100644 --- a/tool/linter_rules/lib/src/markdown_table_generator.dart +++ b/tool/linter_rules/lib/src/markdown_table_generator.dart @@ -21,9 +21,10 @@ /// | Row 2, Cell 1 | Row 2, Cell 2 | /// ``` String generateMarkdownTable(List> rows) { - final buffer = StringBuffer() - ..writeln('| ${rows.first.join(' | ')} |') - ..writeln('| ${rows.first.map((_) => '---').join(' | ')} |'); + final buffer = + StringBuffer() + ..writeln('| ${rows.first.join(' | ')} |') + ..writeln('| ${rows.first.map((_) => '---').join(' | ')} |'); for (var i = 1; i < rows.length; i++) { buffer.writeln('| ${rows[i].join(' | ')} |'); } diff --git a/tool/linter_rules/lib/src/readme.dart b/tool/linter_rules/lib/src/readme.dart index ae7c86b..0aa8d68 100644 --- a/tool/linter_rules/lib/src/readme.dart +++ b/tool/linter_rules/lib/src/readme.dart @@ -16,9 +16,7 @@ class Readme { /// /// It assumes that the current directory is the root of the `linter_rules` /// package (tool/linter_rules). - static final _readmePath = path.joinAll( - ['..', '..', 'README.md'], - ); + static final String _readmePath = path.joinAll(['..', '..', 'README.md']); late final _readmeFile = File(_readmePath); diff --git a/tool/linter_rules/pubspec.yaml b/tool/linter_rules/pubspec.yaml index 6445b91..65fa0a0 100644 --- a/tool/linter_rules/pubspec.yaml +++ b/tool/linter_rules/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.1.0+1 publish_to: none environment: - sdk: ^3.4.0 + sdk: ^3.7.0 dependencies: args: ^2.6.0