Merge pull request #696 from Workiva/fix-analyzer-plugin-stable

Fix analyzer plugin build in Dart stable

Author: rm-astro-wf

.github/workflows/dart_ci.yml

@@ -79,6 +79,9 @@ jobs:
 
   analyzer_plugin:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./tools/analyzer_plugin
     strategy:
       fail-fast: false
       matrix:
@@ -92,13 +95,23 @@ jobs:
       - name: Print Dart SDK version
         run: dart --version
 
+      - id: link
+        name: Override over_react dependency with local path
+        run: cd ../.. && pub get && dart tool/travis_link_plugin_deps.dart
+
       - id: install
         name: Install dependencies
         run: pub get
+        if: always() && steps.link.outcome == 'success'
 
-      - name: Run analyzer_plugin checks
-        run: |
-          dart tool/travis_link_plugin_deps.dart
-          cd ./tools/analyzer_plugin
-          ./tool/travis.sh
+      - name: Validate dependencies
+        run: pub run dependency_validator --no-fatal-pins -i analyzer,build_runner,build_web_compilers,built_value_generator
+        if: always() && steps.install.outcome == 'success'
+
+      - name: Verify formatting
+        run: pub run dart_dev format --check
+        if: always() && matrix.sdk == '2.7.2' && steps.install.outcome == 'success'
+
+      - name: Run tests
+        run: pub run dart_dev test
         if: always() && steps.install.outcome == 'success'

tools/analyzer_plugin/lib/src/assist/contributor_base.dart

@@ -1,8 +1,8 @@
-import 'package:analyzer/analyzer.dart'; // ignore: deprecated_member_use
 import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:meta/meta.dart';
+import 'package:over_react_analyzer_plugin/src/util/analyzer_util.dart';
 import 'package:over_react_analyzer_plugin/src/async_plugin_apis/assist.dart';
 export 'package:over_react_analyzer_plugin/src/doc_utils/docs_meta_annotation.dart';
 

tools/analyzer_plugin/lib/src/async_plugin_apis/diagnostic.dart

@@ -181,7 +181,7 @@ class _DiagnosticGenerator {
     // but it doesn't do it for plugin errors, so we need to do that here.
     final lineInfo = unitResult.unit.lineInfo;
     final filteredErrors =
-        filterIgnores(collector.errors, lineInfo, () => IgnoreInfo.calculateIgnores(unitResult.content, lineInfo));
+        filterIgnores(collector.errors, lineInfo, () => IgnoreInfo.forDart(unitResult.unit, unitResult.content));
 
     return _GeneratorResult(filteredErrors, notifications);
   }

tools/analyzer_plugin/lib/src/diagnostic/bad_key.dart

@@ -158,19 +158,19 @@ class BadKeyDiagnostic extends ComponentUsageDiagnosticContributor {
         collector.addError(
           dynamicOrObjectCode,
           result.locationFor(expression),
-          errorMessageArgs: [type.getDisplayString(), getTypeContextString()],
+          errorMessageArgs: [type.getDisplayString(withNullability: false), getTypeContextString()],
         );
       } else if (type.isDartCoreBool || type.isDartCoreNull) {
         collector.addError(
           lowQualityCode,
           result.locationFor(expression),
-          errorMessageArgs: [type.getDisplayString(), getTypeContextString()],
+          errorMessageArgs: [type.getDisplayString(withNullability: false), getTypeContextString()],
         );
       } else if (inheritsToStringImplFromObject(type?.element)) {
         collector.addError(
           toStringCode,
           result.locationFor(expression),
-          errorMessageArgs: [type.getDisplayString(), getTypeContextString()],
+          errorMessageArgs: [type.getDisplayString(withNullability: false), getTypeContextString()],
         );
       }
     }

tools/analyzer_plugin/lib/src/diagnostic/invalid_child.dart

@@ -72,7 +72,7 @@ class InvalidChildDiagnostic extends ComponentUsageDiagnosticContributor {
           await collector.addErrorWithFix(
             code,
             location,
-            errorMessageArgs: [invalidType.getDisplayString(), missingBuilderMessageSuffix],
+            errorMessageArgs: [invalidType.getDisplayString(withNullability: false), missingBuilderMessageSuffix],
             fixKind: addBuilderInvocationFix,
             computeFix: () => buildFileEdit(result, (builder) {
               buildMissingInvocationEdits(argument, builder);
@@ -81,7 +81,7 @@ class InvalidChildDiagnostic extends ComponentUsageDiagnosticContributor {
         } else if (invalidType is FunctionType || invalidType.isDartCoreFunction) {
           // Functions can be used as children
         } else {
-          collector.addError(code, location, errorMessageArgs: [invalidType.getDisplayString()]);
+          collector.addError(code, location, errorMessageArgs: [invalidType.getDisplayString(withNullability: false)]);
         }
       });
     }

tools/analyzer_plugin/lib/src/diagnostic/missing_cascade_parens.dart

@@ -1,6 +1,6 @@
 // ignore: deprecated_member_use
-import 'package:analyzer/analyzer.dart' show NodeLocator;
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:over_react_analyzer_plugin/src/util/analyzer_util.dart';
 import 'package:over_react_analyzer_plugin/src/util/react_types.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
 import 'package:over_react_analyzer_plugin/src/diagnostic/analyzer_debug_helper.dart';
@@ -110,7 +110,7 @@ class MissingCascadeParensDiagnostic extends DiagnosticContributor {
           continue;
         }
 
-        debug.log('${invocation.function.staticType?.getDisplayString()}');
+        debug.log('${invocation.function.staticType?.getDisplayString(withNullability: false)}');
 
         if (isBadFunction && (invocation.function.staticType?.isReactElement ?? false)) {
           final expr = invocation.function?.tryCast<InvocationExpression>() ??

tools/analyzer_plugin/lib/src/diagnostic/render_return_value.dart

@@ -131,14 +131,14 @@ class RenderReturnValueDiagnostic extends DiagnosticContributor {
           await collector.addErrorWithFix(
             code,
             location,
-            errorMessageArgs: [returnType.getDisplayString(), missingBuilderMessageSuffix],
+            errorMessageArgs: [returnType.getDisplayString(withNullability: false), missingBuilderMessageSuffix],
             fixKind: addBuilderInvocationFix,
             computeFix: () => buildFileEdit(result, (builder) {
               buildMissingInvocationEdits(returnExpression, builder);
             }),
           );
         } else {
-          collector.addError(code, location, errorMessageArgs: [returnType.getDisplayString()]);
+          collector.addError(code, location, errorMessageArgs: [returnType.getDisplayString(withNullability: false)]);
         }
       });