Revert "[DAS] Trigger incompatible lint for included rules"

This reverts commit 261f819 

Reason for revert: it breaks flutter customer testing on hh and on the roller.


Original change's description:
> [DAS] Trigger incompatible lint for included rules
>
> Fixes: #60125
> Change-Id: Icc0b8efda0e7e915d7315a1c2e70c1a7a5093057
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/419982
> Auto-Submit: Felipe Morschel <[email protected]>
> Reviewed-by: Samuel Rawlins <[email protected]>
> Commit-Queue: Konstantin Shcheglov <[email protected]>
> Reviewed-by: Brian Wilkerson <[email protected]>
> Reviewed-by: Konstantin Shcheglov <[email protected]>

Change-Id: I0db90864092760efde1cb02cc792c1de14eabf2d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429381
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Alexander Aprelev <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>
Reviewed-by: Siva Annamalai <[email protected]>

Author: aam

pkg/analysis_server/lib/src/context_manager.dart

@@ -403,7 +403,6 @@ class ContextManagerImpl implements ContextManager {
         driver.sourceFactory,
         driver.currentSession.analysisContext.contextRoot.root.path,
         sdkVersionConstraint,
-        resourceProvider,
       );
       var converter = AnalyzerConverter();
       convertedErrors = converter.convertAnalysisErrors(

pkg/analysis_server/lib/src/handler/legacy/edit_get_fixes.dart

@@ -133,7 +133,6 @@ class EditGetFixesHandler extends LegacyHandler
       sourceFactory,
       analysisContext.contextRoot.root.path,
       sdkVersionConstraint,
-      resourceProvider,
     );
     var options = _getOptions(sourceFactory, content);
     if (options == null) {

pkg/analysis_server/lib/src/lsp/handlers/code_actions/analysis_options.dart

@@ -87,7 +87,6 @@ class AnalysisOptionsCodeActionsProducer extends AbstractCodeActionsProducer {
       sourceFactory,
       contextRoot.root.path,
       sdkVersionConstraint,
-      resourceProvider,
     );
 
     var codeActions = <CodeActionWithPriority>[];

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -85,21 +85,11 @@ AnalysisOptionsWarningCode.INCLUDED_FILE_WARNING:
   status: noFix
   notes: |-
     The fix needs to be made in the included file.
-AnalysisOptionsWarningCode.INCOMPATIBLE_INCLUDED_LINT:
-  status: noFix
-  notes: |-
-    Without knowing which rule the user would prefer to use, we cannot remove
-    the reported one.
 AnalysisOptionsWarningCode.INCOMPATIBLE_LINT:
   status: noFix
   notes: |-
     Without knowing which rule the user would prefer to use, we cannot remove
     the reported one.
-AnalysisOptionsWarningCode.INCOMPATIBLE_LINT_FILE:
-  status: noFix
-  notes: |-
-    Without knowing which rule the user would prefer to use, we cannot remove
-    the reported one.
 AnalysisOptionsWarningCode.INVALID_OPTION:
   status: needsFix
   notes: |-

pkg/analysis_server/test/services/linter/linter_test.dart

@@ -9,7 +9,6 @@ import 'package:analyzer/source/source.dart';
 import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
 import 'package:analyzer/src/analysis_options/error/option_codes.dart';
 import 'package:analyzer/src/lint/options_rule_validator.dart';
-import 'package:analyzer_testing/resource_provider_mixin.dart';
 import 'package:linter/src/rules.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -21,17 +20,14 @@ void main() {
 }
 
 @reflectiveTest
-class LinterRuleOptionsValidatorTest with ResourceProviderMixin {
+class LinterRuleOptionsValidatorTest {
   late RecordingErrorListener recorder;
 
   late ErrorReporter reporter;
 
   List<Diagnostic> get errors => recorder.errors;
 
-  LinterRuleOptionsValidator get validator => LinterRuleOptionsValidator(
-    optionsProvider: AnalysisOptionsProvider(),
-    resourceProvider: resourceProvider,
-  );
+  LinterRuleOptionsValidator get validator => LinterRuleOptionsValidator();
 
   void setUp() {
     registerLintRules();

pkg/analysis_server/test/src/services/correction/fix/analysis_options/test_support.dart

@@ -52,7 +52,6 @@ class AnalysisOptionsFixTest with ResourceProviderMixin {
       sourceFactory,
       '/',
       dart2_12,
-      resourceProvider,
     );
     if (diagnosticFilter != null) {
       if (errors.length == 1) {

pkg/analyzer/lib/src/analysis_options/error/option_codes.g.dart

@@ -149,22 +149,6 @@ class AnalysisOptionsWarningCode extends DiagnosticCode {
         "The include file '{0}' in '{1}' can't be found when analyzing '{2}'.",
       );
 
-  ///  An error code indicating an incompatible rule.
-  ///
-  ///  Parameters:
-  ///  0: the rule name
-  ///  1: the incompatible rule
-  static const AnalysisOptionsWarningCode
-  INCOMPATIBLE_INCLUDED_LINT = AnalysisOptionsWarningCode(
-    'INCOMPATIBLE_LINT',
-    "This file enables '{0}' that is incompatible with '{1}' enabled in "
-        "another include.",
-    correctionMessage:
-        "Try removing one of the incompatible files or locally disable one of "
-        "the conflicting rules.",
-    uniqueName: 'INCOMPATIBLE_INCLUDED_LINT',
-  );
-
   ///  An error code indicating an incompatible rule.
   ///
   ///  Parameters:
@@ -177,22 +161,6 @@ class AnalysisOptionsWarningCode extends DiagnosticCode {
         correctionMessage: "Try removing one of the incompatible rules.",
       );
 
-  ///  An error code indicating an incompatible rule.
-  ///
-  ///  Parameters:
-  ///  0: the rule name
-  ///  1: the incompatible rule
-  ///  2: the path of the file containing the conflicting rule
-  static const AnalysisOptionsWarningCode
-  INCOMPATIBLE_LINT_FILE = AnalysisOptionsWarningCode(
-    'INCOMPATIBLE_LINT',
-    "The rule '{0}' is incompatible with the rule '{1}' enabled at '{2}'.",
-    correctionMessage:
-        "Try removing the incompatible rule or locally disable the conflicting "
-        "rule.",
-    uniqueName: 'INCOMPATIBLE_LINT_FILE',
-  );
-
   ///  An error code indicating that a plugin is being configured with an invalid
   ///  value for an option and a detail message is provided.
   ///

pkg/analyzer/lib/src/diagnostic/diagnostic_factory.dart

@@ -11,7 +11,6 @@ import 'package:analyzer/source/source.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/diagnostic/diagnostic.dart';
 import 'package:analyzer/src/error/codes.dart';
-import 'package:yaml/yaml.dart';
 
 /// A factory used to create diagnostics.
 class DiagnosticFactory {
@@ -284,29 +283,6 @@ class DiagnosticFactory {
     );
   }
 
-  Diagnostic incompatibleIncludedLint({
-    required Source source,
-    required String referenceRule,
-    required String incompatibleRule,
-    required YamlNode reference,
-    required YamlNode incompatible,
-  }) => Diagnostic.tmp(
-    source: source,
-    offset: incompatible.span.start.offset,
-    length: incompatible.span.end.offset,
-    errorCode: AnalysisOptionsWarningCode.INCOMPATIBLE_INCLUDED_LINT,
-    arguments: [referenceRule, incompatibleRule],
-    contextMessages: [
-      DiagnosticMessageImpl(
-        filePath: source.fullName,
-        length: reference.span.length,
-        message: 'The included file with the reference rule.',
-        offset: reference.span.start.offset,
-        url: source.uri.toString(),
-      ),
-    ],
-  );
-
   Diagnostic invalidNullAwareAfterShortCircuit(
     Source source,
     int offset,

pkg/analyzer/lib/src/error/error_code_values.g.dart

@@ -34,9 +34,7 @@ const List<DiagnosticCode> errorCodeValues = [
   AnalysisOptionsWarningCode.DUPLICATE_RULE,
   AnalysisOptionsWarningCode.INCLUDED_FILE_WARNING,
   AnalysisOptionsWarningCode.INCLUDE_FILE_NOT_FOUND,
-  AnalysisOptionsWarningCode.INCOMPATIBLE_INCLUDED_LINT,
   AnalysisOptionsWarningCode.INCOMPATIBLE_LINT,
-  AnalysisOptionsWarningCode.INCOMPATIBLE_LINT_FILE,
   AnalysisOptionsWarningCode.INVALID_OPTION,
   AnalysisOptionsWarningCode.INVALID_SECTION_FORMAT,
   AnalysisOptionsWarningCode.MULTIPLE_PLUGINS,