diff --git a/pkg/front_end/lib/src/base/incremental_compiler.dart b/pkg/front_end/lib/src/base/incremental_compiler.dart index 751170ad675..53d0ac920d4 100644 --- a/pkg/front_end/lib/src/base/incremental_compiler.dart +++ b/pkg/front_end/lib/src/base/incremental_compiler.dart @@ -1830,7 +1830,8 @@ class IncrementalCompiler implements IncrementalKernelGenerator { } debugLibrary.compilationUnit.addSyntheticImport( - uri: dependency.importedLibraryReference.canonicalName!.name, + importUri: + dependency.importedLibraryReference.asLibrary.importUri, prefix: dependency.name, combinators: combinators, deferred: dependency.isDeferred); diff --git a/pkg/front_end/lib/src/builder/library_builder.dart b/pkg/front_end/lib/src/builder/library_builder.dart index 78277bc8908..c14ff6ecdea 100644 --- a/pkg/front_end/lib/src/builder/library_builder.dart +++ b/pkg/front_end/lib/src/builder/library_builder.dart @@ -265,7 +265,7 @@ abstract class SourceCompilationUnit IndexedLibrary? get indexedLibrary; void addSyntheticImport( - {required String uri, + {required Uri importUri, required String? prefix, required List? combinators, required bool deferred}); diff --git a/pkg/front_end/lib/src/source/source_compilation_unit.dart b/pkg/front_end/lib/src/source/source_compilation_unit.dart index b001c272eef..97dfb299131 100644 --- a/pkg/front_end/lib/src/source/source_compilation_unit.dart +++ b/pkg/front_end/lib/src/source/source_compilation_unit.dart @@ -910,23 +910,21 @@ class SourceCompilationUnitImpl implements SourceCompilationUnit { @override // Coverage-ignore(suite): Not run. void addSyntheticImport( - {required String uri, + {required Uri importUri, required String? prefix, required List? combinators, required bool deferred}) { assert( checkState(pending: [SourceCompilationUnitState.importsAddedToScope])); - _fragmentFactory.addImport( - metadata: null, - isAugmentationImport: false, - uri: uri, - configurations: null, - prefix: prefix, - combinators: combinators, - deferred: deferred, - charOffset: -1, - prefixCharOffset: -1, - uriOffset: -1); + CompilationUnit? compilationUnit = loader.read(importUri, -1, + origin: null, + accessor: this, + isAugmentation: false, + referencesFromIndex: indexedLibrary); + Import import = new Import(this, compilationUnit, false, deferred, prefix, + combinators, null, fileUri, -1, -1, + nativeImportPath: null); + _fragmentFactoryResult.imports.add(import); } @override diff --git a/pkg/front_end/tool/dart_doctest_impl.dart b/pkg/front_end/tool/dart_doctest_impl.dart index d84aa6c06ae..66c957e93cc 100644 --- a/pkg/front_end/tool/dart_doctest_impl.dart +++ b/pkg/front_end/tool/dart_doctest_impl.dart @@ -1001,15 +1001,14 @@ class DocTestIncrementalCompiler extends IncrementalCompiler { } dartDocTestCompilationUnit.addSyntheticImport( - uri: dependency.importedLibraryReference.asLibrary.importUri - .toString(), + importUri: dependency.importedLibraryReference.asLibrary.importUri, prefix: dependency.name, combinators: combinators, deferred: dependency.isDeferred); } dartDocTestCompilationUnit.addSyntheticImport( - uri: libraryBuilder.importUri.toString(), + importUri: libraryBuilder.importUri, prefix: null, combinators: null, deferred: false);