commit a251cd9b1e79fa927f1280014be73a317cbad951
author Konstantin Shcheglov <scheglov@google.com> Mon May 16 01:09:38 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Mon May 16 01:09:38 2022 +0000
tree 1c07e58a47184c9d8ea2940d4ef6bc3b87d12758
parent edc54c55dc8fe17c552246f2e625923e5a5fb85f

Remove using externalSummaries in FileState.

Instead FileSystemState methods return ExternalLibrary when necessary.

Change-Id: I27670b478b1be3a7c61fad4e3f79f47906d63282
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/244867
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Samuel Rawlins <srawlins@google.com>

pkg/analyzer/lib/src/dart/analysis/file_state.dart

diff --git a/pkg/analyzer/lib/src/dart/analysis/file_state.dart b/pkg/analyzer/lib/src/dart/analysis/file_state.dart
index b7fddeb..4fc7f27 100644
--- a/pkg/analyzer/lib/src/dart/analysis/file_state.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/file_state.dart
@@ -47,7 +47,7 @@
 class ExternalLibrary {
   final Uri uri;
 
-  ExternalLibrary(this.uri);
+  ExternalLibrary._(this.uri);
 }
 
 /// [FileContentOverlay] is used to temporary override content of files.
@@ -232,20 +232,9 @@
 
   LibraryCycle? get internal_libraryCycle => _libraryCycle;
 
-  /// Return `true` if the file is a stub created for a library in the provided
-  /// external summary store.
-  bool get isExternalLibrary {
-    return _fsState.externalSummaries != null &&
-        _fsState.externalSummaries!.hasLinkedLibrary(uriStr);
-  }
-
   /// Return `true` if the file does not have a `library` directive, and has a
   /// `part of` directive, so is probably a part.
   bool get isPart {
-    if (_fsState.externalSummaries != null &&
-        _fsState.externalSummaries!.hasUnlinkedUnit(uriStr)) {
-      return _fsState.externalSummaries!.isPartUnit(uriStr);
-    }
     return !_unlinked2!.hasLibraryDirective && _unlinked2!.hasPartOfDirective;
   }
 
@@ -872,10 +861,11 @@
   Either2<FileState?, ExternalLibrary> getFileForUri(Uri uri) {
     // If the external store has this URI, create a stub file for it.
     // We are given all required unlinked and linked summaries for it.
+    final externalSummaries = this.externalSummaries;
     if (externalSummaries != null) {
       String uriStr = uri.toString();
-      if (externalSummaries!.hasLinkedLibrary(uriStr)) {
-        return Either2.t2(ExternalLibrary(uri));
+      if (externalSummaries.hasLinkedLibrary(uriStr)) {
+        return Either2.t2(ExternalLibrary._(uri));
       }
     }