From 6250ee74860ce788520f4e7058d9a8ceeaafd718 Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Thu, 10 Oct 2024 17:41:09 +0000 Subject: [PATCH 1/2] Read directives with the defining compilation unit The direct read of the imports, exports, and parts from the library element is deprecated. Unblocks https://dart-review.googlesource.com/c/sdk/+/388643 --- source_gen/lib/src/library.dart | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/source_gen/lib/src/library.dart b/source_gen/lib/src/library.dart index 97c96e64..ccf74238 100644 --- a/source_gen/lib/src/library.dart +++ b/source_gen/lib/src/library.dart @@ -37,12 +37,9 @@ class LibraryReader { Iterable get allElements => [ element, ...element.topLevelElements, - // ignore: deprecated_member_use - ...element.libraryImports, - // ignore: deprecated_member_use - ...element.libraryExports, - // ignore: deprecated_member_use - ...element.parts, + ...element.definingCompilationUnit.libraryImports, + ...element.definingCompilationUnit.libraryExports, + ...element.definingCompilationUnit.parts, ]; /// All of the declarations in this library annotated with [checker]. From bacbdc899dccdb6046e0859e5cdc44e163a938fe Mon Sep 17 00:00:00 2001 From: Nate Bosch Date: Thu, 10 Oct 2024 17:47:29 +0000 Subject: [PATCH 2/2] Remove only the direct read of parts --- source_gen/lib/src/library.dart | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source_gen/lib/src/library.dart b/source_gen/lib/src/library.dart index ccf74238..cd7dc601 100644 --- a/source_gen/lib/src/library.dart +++ b/source_gen/lib/src/library.dart @@ -37,8 +37,10 @@ class LibraryReader { Iterable get allElements => [ element, ...element.topLevelElements, - ...element.definingCompilationUnit.libraryImports, - ...element.definingCompilationUnit.libraryExports, + // ignore: deprecated_member_use + ...element.libraryImports, + // ignore: deprecated_member_use + ...element.libraryExports, ...element.definingCompilationUnit.parts, ];