[analyzer] Fixes incompatible_lint diagnostics for package includes

Fixes: #61497
Change-Id: I55cb128f4e671750f46151c9469871082eb0a755
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449370
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: FMorschel

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

@@ -8,6 +8,8 @@ import 'package:analyzer/error/listener.dart';
 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/file_system/file_system.dart';
+import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/lint/options_rule_validator.dart';
 import 'package:analyzer_testing/resource_provider_mixin.dart';
 import 'package:linter/src/rules.dart';
@@ -23,18 +25,20 @@ void main() {
 @reflectiveTest
 class LinterRuleOptionsValidatorTest with ResourceProviderMixin {
   late RecordingDiagnosticListener recorder;
-
+  late SourceFactory sourceFactory;
   late DiagnosticReporter reporter;
 
   List<Diagnostic> get diagnostics => recorder.diagnostics;
 
   LinterRuleOptionsValidator get validator => LinterRuleOptionsValidator(
     optionsProvider: AnalysisOptionsProvider(),
     resourceProvider: resourceProvider,
+    sourceFactory: sourceFactory,
   );
 
   void setUp() {
     registerLintRules();
+    sourceFactory = SourceFactory([ResourceUriResolver(resourceProvider)]);
     recorder = RecordingDiagnosticListener();
     reporter = DiagnosticReporter(recorder, _TestSource());
   }

pkg/analyzer/lib/src/analysis_options/options_file_validator.dart

@@ -84,6 +84,7 @@ List<Diagnostic> analyzeAnalysisOptions(
       sdkVersionConstraint: sdkVersionConstraint,
       isPrimarySource: isSourcePrimary,
       optionsProvider: optionsProvider,
+      sourceFactory: sourceFactory,
       resourceProvider: resourceProvider,
     ).validate(options);
     addDirectErrorOrIncludedError(
@@ -299,6 +300,7 @@ class OptionsFileValidator {
     required bool isPrimarySource,
     required AnalysisOptionsProvider optionsProvider,
     required ResourceProvider resourceProvider,
+    required SourceFactory sourceFactory,
   }) : _validators = [
          AnalyzerOptionsValidator(),
          _CodeStyleOptionsValidator(),
@@ -307,6 +309,7 @@ class OptionsFileValidator {
          LinterRuleOptionsValidator(
            resourceProvider: resourceProvider,
            optionsProvider: optionsProvider,
+           sourceFactory: sourceFactory,
            sdkVersionConstraint: sdkVersionConstraint,
            isPrimarySource: isPrimarySource,
          ),

pkg/analyzer/lib/src/lint/options_rule_validator.dart

@@ -11,6 +11,7 @@ import 'package:analyzer/src/analysis_options/error/option_codes.dart';
 import 'package:analyzer/src/analysis_options/options_validator.dart';
 import 'package:analyzer/src/analysis_rule/rule_context.dart';
 import 'package:analyzer/src/diagnostic/diagnostic_factory.dart';
+import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/lint/registry.dart';
 import 'package:analyzer/src/util/yaml.dart';
 import 'package:analyzer/src/utilities/extensions/string.dart';
@@ -54,10 +55,12 @@ class LinterRuleOptionsValidator extends OptionsValidator {
 
   final AnalysisOptionsProvider optionsProvider;
   final ResourceProvider resourceProvider;
+  final SourceFactory sourceFactory;
 
   LinterRuleOptionsValidator({
     required this.resourceProvider,
     required this.optionsProvider,
+    required this.sourceFactory,
     this.sdkVersionConstraint,
     this.isPrimarySource = true,
   });
@@ -105,6 +108,14 @@ class LinterRuleOptionsValidator extends OptionsValidator {
 
     if (includePath.isEmpty) return null;
 
+    if (sourceUri != null) {
+      var source = FileSource(resourceProvider.getFile(sourceUri.toFilePath()));
+      var resolved = sourceFactory.resolveUri(source, includePath);
+      if (resolved is FileSource) {
+        return resolved.file.toUri();
+      }
+    }
+
     var uri = Uri.parse(includePath);
     if (uri == sourceUri) {
       // The URI is the same as the source URI, so we don't need to resolve it.

pkg/analyzer/test/src/diagnostics/analysis_options/analysis_options_test_support.dart

@@ -8,6 +8,7 @@ import 'package:analyzer/src/analysis_options/options_file_validator.dart';
 import 'package:analyzer/src/context/source.dart';
 import 'package:analyzer/src/file_system/file_system.dart';
 import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer/src/source/package_map_resolver.dart';
 import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
 import 'package:analyzer_testing/resource_provider_mixin.dart';
 import 'package:meta/meta.dart';
@@ -18,6 +19,7 @@ import '../../../generated/test_support.dart';
 abstract class AbstractAnalysisOptionsTest
     with ResourceProviderMixin, LintRegistrationMixin {
   late SourceFactory sourceFactory;
+  Map<String, String>? dependencies;
 
   late File analysisOptionsFile = newFile(analysisOptionsPath, '');
   late String analysisOptionsPath = convertPath('/analysis_options.yaml');
@@ -64,7 +66,14 @@ abstract class AbstractAnalysisOptionsTest
   );
 
   void setUp() {
-    var resolvers = [ResourceUriResolver(resourceProvider)];
+    var resolvers = [
+      ResourceUriResolver(resourceProvider),
+      if (dependencies != null)
+        PackageMapUriResolver(resourceProvider, {
+          for (var entry in dependencies!.entries)
+            entry.key: [getFolder(convertPath(entry.value))],
+        }),
+    ];
     sourceFactory = SourceFactoryImpl(resolvers);
   }
 

pkg/analyzer/test/src/options/options_file_validator_test.dart

@@ -80,6 +80,7 @@ class OptionsFileValidatorTest
     isPrimarySource: true,
     optionsProvider: optionsProvider,
     resourceProvider: resourceProvider,
+    sourceFactory: SourceFactory([ResourceUriResolver(resourceProvider)]),
   );
   final AnalysisOptionsProvider optionsProvider = AnalysisOptionsProvider();
 

pkg/analyzer/test/src/options/options_rule_validator_test.dart

@@ -50,6 +50,11 @@ class DeprecatedSince3Lint extends TestLintRule {
 @reflectiveTest
 class OptionsRuleValidatorIncludedFileTest extends AbstractAnalysisOptionsTest
     with OptionsRuleValidatorTestMixin {
+  static const otherLib = '/other/lib';
+
+  @override
+  get dependencies => {'other': otherLib};
+
   void test_compatible_multiple_include() {
     newFile('/included1.yaml', '''
 linter:
@@ -260,6 +265,26 @@ linter:
     );
   }
 
+  void test_package_import() {
+    newFile('$otherLib/analysis_options.yaml', '''
+linter:
+  rules:
+    rule_pos: true
+''');
+    testProjectPath = '/test';
+    assertErrors(
+      '''
+include:
+  - package:other/analysis_options.yaml
+
+linter:
+  rules:
+    rule_neg: true
+''',
+      [AnalysisOptionsWarningCode.incompatibleLintFiles],
+    );
+  }
+
   Future<void> test_removed_rule_inInclude_ok() async {
     newFile('/included.yaml', '''
 linter:
@@ -490,6 +515,8 @@ linter:
 }
 
 mixin OptionsRuleValidatorTestMixin on AbstractAnalysisOptionsTest {
+  String? testProjectPath;
+
   /// Assert that when the validator is used on the given [content] the
   /// [expectedCodes] are produced.
   void assertErrors(
@@ -498,15 +525,17 @@ mixin OptionsRuleValidatorTestMixin on AbstractAnalysisOptionsTest {
     VersionConstraint? sdk,
   }) {
     GatheringDiagnosticListener listener = GatheringDiagnosticListener();
-    var reporter = DiagnosticReporter(
-      listener,
-      StringSource(content, 'analysis_options.yaml'),
-    );
-    var source = StringSource(content, 'analysis_options.yaml');
+    String filePath = 'analysis_options.yaml';
+    if (testProjectPath != null) {
+      filePath = resourceProvider.pathContext.join(testProjectPath!, filePath);
+    }
+    var source = StringSource(content, filePath);
+    var reporter = DiagnosticReporter(listener, source);
     var validator = LinterRuleOptionsValidator(
       optionsProvider: AnalysisOptionsProvider(sourceFactory),
-      sdkVersionConstraint: sdk,
       resourceProvider: resourceProvider,
+      sourceFactory: sourceFactory,
+      sdkVersionConstraint: sdk,
     );
     validator.validate(
       reporter,