Revert "Fix warnings about missing imports"

This reverts commit d770c16.
simolus3 · Dec 11, 2023 · 8ac1260 · 8ac1260
1 parent 633cc52
commit 8ac1260
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 76 deletions.
diff --git a/drift_dev/lib/src/analysis/driver/driver.dart b/drift_dev/lib/src/analysis/driver/driver.dart
@@ -174,40 +174,19 @@ class DriftAnalysisDriver {
   }
 
   Future<void> _warnAboutUnresolvedImportsInDriftFile(FileState known) async {
-    await discoverIfNecessary(known);
-
     final state = known.discovery;
     if (state is DiscoveredDriftFile) {
       for (final import in state.imports) {
         final file = await findLocalElements(import.importedUri);
 
         if (file.isValidImport != true) {
-          var crossesPackageBoundaries = false;
-
-          if (import.importedUri.scheme == 'package' &&
-              known.ownUri.scheme == 'package') {
-            final ownPackage = known.ownUri.pathSegments.first;
-            final importedPackage = import.importedUri.pathSegments.first;
-            crossesPackageBoundaries = ownPackage != importedPackage;
-          }
-
-          final message = StringBuffer(
-            'The imported file, `${import.importedUri}`, does not exist or '
-            "can't be imported.",
-          );
-          if (crossesPackageBoundaries) {
-            message
-              ..writeln()
-              ..writeln(
-                'Note: When importing drift files across packages, the '
-                'imported package needs to apply a drift builder. '
-                'See https://github.com/simolus3/drift/issues/2719 for '
-                'details.',
-              );
-          }
-
           known.errorsDuringDiscovery.add(
-              DriftAnalysisError.inDriftFile(import.ast, message.toString()));
+            DriftAnalysisError.inDriftFile(
+              import.ast,
+              'The imported file, `${import.importedUri}`, does not exist or '
+              "can't be imported.",
+            ),
+          );
         }
       }
     }
@@ -264,7 +243,7 @@ class DriftAnalysisDriver {
     await _warnAboutUnresolvedImportsInDriftFile(known);
 
     // Also make sure elements in transitive imports have been resolved.
-    final seen = <Uri>{};
+    final seen = cache.knownFiles.keys.toSet();
     final pending = <Uri>[known.ownUri];
 
     while (pending.isNotEmpty) {

diff --git a/drift_dev/test/backends/build/build_integration_test.dart b/drift_dev/test/backends/build/build_integration_test.dart
@@ -766,7 +766,8 @@ CREATE TABLE [STRING_TABLE](
         Future<void> runTest(String source, expectedMessage) async {
           final build = emulateDriftBuild(
             inputs: {'a|lib/a.drift': source},
-            logger: loggerThat(emits(record(expectedMessage))),
+            logger: loggerThat(emits(isA<LogRecord>()
+                .having((e) => e.message, 'message', expectedMessage))),
             modularBuild: true,
             options: options,
           );
@@ -801,40 +802,4 @@ CREATE TABLE [STRING_TABLE](
       });
     }
   });
-
-  test('warns about missing imports', () async {
-    await emulateDriftBuild(
-      inputs: {
-        'a|lib/main.drift': '''
-import 'package:b/b.drift';
-import 'package:a/missing.drift';
-
-CREATE TABLE users (
-  another INTEGER REFERENCES b(foo)
-);
-''',
-        'b|lib/b.drift': '''
-CREATE TABLE b (foo INTEGER);
-''',
-      },
-      logger: loggerThat(
-        emitsInAnyOrder(
-          [
-            record(
-              allOf(
-                contains(
-                    "The imported file, `package:b/b.drift`, does not exist or can't be imported"),
-                contains('Note: When importing drift files across packages'),
-              ),
-            ),
-            record(allOf(
-              contains('package:a/missing.drift'),
-              isNot(contains('Note: When')),
-            )),
-            record(contains('`b` could not be found in any import.')),
-          ],
-        ),
-      ),
-    );
-  });
 }
diff --git a/drift_dev/test/backends/build/drift_builder_test.dart b/drift_dev/test/backends/build/drift_builder_test.dart
@@ -19,7 +19,7 @@ void main() {
     );
 
     await emulateDriftBuild(inputs: {
-      'a|lib/a.dart': '''
+      'foo|lib/a.dart': '''
 // @dart = 2.11
 
 import 'package:drift/drift.dart';
@@ -32,7 +32,7 @@ class Database {}
 
   test('includes version override in part file mode', () async {
     final writer = await emulateDriftBuild(inputs: {
-      'a|lib/a.dart': '''
+      'foo|lib/a.dart': '''
 // @dart = 2.13
 
 import 'package:drift/drift.dart';
@@ -44,7 +44,7 @@ class Database {}
 
     checkOutputs(
       {
-        'a|lib/a.drift.dart': decodedMatches(contains('// @dart=2.13')),
+        'foo|lib/a.drift.dart': decodedMatches(contains('// @dart=2.13')),
       },
       writer.dartOutputs,
       writer.writer,

diff --git a/drift_dev/test/utils.dart b/drift_dev/test/utils.dart
@@ -32,10 +32,6 @@ Logger loggerThat(dynamic expectedLogs) {
   return logger;
 }
 
-TypeMatcher<LogRecord> record(dynamic message) {
-  return isA<LogRecord>().having((e) => e.message, 'message', message);
-}
-
 final _packageConfig = Future(() async {
   final uri = await Isolate.packageConfig;
 
@@ -85,10 +81,6 @@ Future<DriftBuildResult> emulateDriftBuild({
       for (final input in inputs.keys) {
         final inputId = makeAssetId(input);
 
-        // Assets from other packages are visible, but we're not running
-        // builders on them.
-        if (inputId.package != 'a') continue;
-
         if (expectedOutputs(stage, inputId).isNotEmpty) {
           final readerForPhase = _TrackingAssetReader(reader);