From 59291135557523e66170ef0271fd0599fa835d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= Date: Fri, 12 Apr 2024 18:56:49 -0700 Subject: [PATCH] Use the same passContainingUrl as before --- lib/src/async_import_cache.dart | 9 +++++---- lib/src/import_cache.dart | 11 ++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/src/async_import_cache.dart b/lib/src/async_import_cache.dart index 01ac1e698..8ddc66f3d 100644 --- a/lib/src/async_import_cache.dart +++ b/lib/src/async_import_cache.dart @@ -207,16 +207,17 @@ final class AsyncImportCache { /// that result is cacheable at all. Future<(AsyncCanonicalizeResult?, bool cacheable)> _canonicalize( AsyncImporter importer, Uri url, Uri? baseUrl, bool forImport) async { - var containingUrlAvailable = + var passContainingUrl = baseUrl != null && (url.scheme == '' || await importer.isNonCanonicalScheme(url.scheme)); + var canonicalizeContext = - CanonicalizeContext(containingUrlAvailable ? baseUrl : null, forImport); + CanonicalizeContext(passContainingUrl ? baseUrl : null, forImport); var result = await withCanonicalizeContext( canonicalizeContext, () => importer.canonicalize(url)); - var cacheable = !containingUrlAvailable || - !canonicalizeContext.wasContainingUrlAccessed; + var cacheable = + !passContainingUrl || !canonicalizeContext.wasContainingUrlAccessed; if (result == null) return (null, cacheable); diff --git a/lib/src/import_cache.dart b/lib/src/import_cache.dart index ea90e5875..7e5c941a0 100644 --- a/lib/src/import_cache.dart +++ b/lib/src/import_cache.dart @@ -5,7 +5,7 @@ // DO NOT EDIT. This file was generated from async_import_cache.dart. // See tool/grind/synchronize.dart for details. // -// Checksum: 3c180aa4cb4ccae770c2c53d3801fa13873fc17d +// Checksum: 36bc42050cf2eb3a43f36376c4f06c1708eee777 // // ignore_for_file: unused_import @@ -207,16 +207,17 @@ final class ImportCache { /// that result is cacheable at all. (CanonicalizeResult?, bool cacheable) _canonicalize( Importer importer, Uri url, Uri? baseUrl, bool forImport) { - var containingUrlAvailable = + var passContainingUrl = baseUrl != null && (url.scheme == '' || importer.isNonCanonicalScheme(url.scheme)); + var canonicalizeContext = - CanonicalizeContext(containingUrlAvailable ? baseUrl : null, forImport); + CanonicalizeContext(passContainingUrl ? baseUrl : null, forImport); var result = withCanonicalizeContext( canonicalizeContext, () => importer.canonicalize(url)); - var cacheable = !containingUrlAvailable || - !canonicalizeContext.wasContainingUrlAccessed; + var cacheable = + !passContainingUrl || !canonicalizeContext.wasContainingUrlAccessed; if (result == null) return (null, cacheable);