From 10f9657ff468ff8ef1445d093336c10c90e47b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= <i@ntk.me>
Date: Tue, 16 Apr 2024 17:58:44 -0700
Subject: [PATCH] Code review

---
 lib/src/embedded/importer/file.dart        |  4 ++--
 lib/src/embedded/importer/host.dart        |  4 ++--
 lib/src/importer/canonicalize_context.dart | 12 +++++-------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/src/embedded/importer/file.dart b/lib/src/embedded/importer/file.dart
index fcbe72ce8..7c4d9975c 100644
--- a/lib/src/embedded/importer/file.dart
+++ b/lib/src/embedded/importer/file.dart
@@ -21,8 +21,8 @@ final class FileImporter extends ImporterBase {
       ..importerId = _importerId
       ..url = url.toString()
       ..fromImport = fromImport;
-    var containingUrl = canonicalizeContext.containingUrlWithoutMarking;
-    if (containingUrl case var containingUrl?) {
+    if (canonicalizeContext.containingUrlWithoutMarking
+        case var containingUrl?) {
       request.containingUrl = containingUrl.toString();
     }
     var response = dispatcher.sendFileImportRequest(request);
diff --git a/lib/src/embedded/importer/host.dart b/lib/src/embedded/importer/host.dart
index 4d68a5e10..e5342dc31 100644
--- a/lib/src/embedded/importer/host.dart
+++ b/lib/src/embedded/importer/host.dart
@@ -35,8 +35,8 @@ final class HostImporter extends ImporterBase {
       ..importerId = _importerId
       ..url = url.toString()
       ..fromImport = fromImport;
-    var containingUrl = canonicalizeContext.containingUrlWithoutMarking;
-    if (containingUrl case var containingUrl?) {
+    if (canonicalizeContext.containingUrlWithoutMarking
+        case var containingUrl?) {
       request.containingUrl = containingUrl.toString();
     }
     var response = dispatcher.sendCanonicalizeRequest(request);
diff --git a/lib/src/importer/canonicalize_context.dart b/lib/src/importer/canonicalize_context.dart
index d1e01a9c3..e28e69e8d 100644
--- a/lib/src/importer/canonicalize_context.dart
+++ b/lib/src/importer/canonicalize_context.dart
@@ -1,7 +1,9 @@
-// Copyright 2014 Google Inc. Use of this source code is governed by an
+// Copyright 2024 Google Inc. Use of this source code is governed by an
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
+import 'dart:async';
+
 import 'package:meta/meta.dart';
 
 /// Contextual information used by importers' `canonicalize` method.
@@ -25,17 +27,13 @@ final class CanonicalizeContext {
   /// Whether [containingUrl] has been accessed.
   ///
   /// This is used to determine whether canonicalize result is cacheable.
-  ///
-  /// @nodoc
-  @internal
   bool get wasContainingUrlAccessed => _wasContainingUrlAccessed;
   var _wasContainingUrlAccessed = false;
 
   /// Runs [callback] in a context with specificed [fromImport].
-  ///
-  /// @nodoc
-  @internal
   T withFromImport<T>(bool fromImport, T callback()) {
+    assert(Zone.current[#_canonicalizeContext] == this);
+
     var oldFromImport = _fromImport;
     _fromImport = fromImport;
     try {