Version 2.18.0-222.0.dev

Merge commit '3c793774c34877d1b18aa62066e2ac0288257be8' into 'dev'

Author: Dart CI

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

@@ -663,7 +663,7 @@ class FileState {
 
   /// Return the unlinked unit, from bytes or new.
   AnalysisDriverUnlinkedUnit _getUnlinkedUnit() {
-    final testData = _fsState.testData?.forFile(resource);
+    final testData = _fsState.testData?.forFile(resource, uri);
 
     var bytes = _fsState._byteStore.get(_unlinkedKey!);
     if (bytes != null && bytes.isNotEmpty) {
@@ -1262,7 +1262,7 @@ class FileSystemState {
   }
 
   @visibleForTesting
-  FileState? getExistingFileForResource(File file) {
+  FileState? getExisting(File file) {
     return _pathToFile[file.path];
   }
 
@@ -1460,21 +1460,22 @@ class FileSystemStateTestView {
 class FileSystemTestData {
   final Map<File, FileTestData> files = {};
 
-  FileTestData forFile(File file) {
-    return files[file] ??= FileTestData._(file);
+  FileTestData forFile(File file, Uri uri) {
+    return files[file] ??= FileTestData._(file, uri);
   }
 }
 
 class FileTestData {
   final File file;
+  final Uri uri;
 
   /// We add the key every time we get unlinked data from the byte store.
   final List<String> unlinkedKeyGet = [];
 
   /// We add the key every time we put unlinked data into the byte store.
   final List<String> unlinkedKeyPut = [];
 
-  FileTestData._(this.file);
+  FileTestData._(this.file, this.uri);
 }
 
 /// Precomputed properties of a file URI, used because [Uri] is relatively
@@ -1608,7 +1609,7 @@ class LibraryFileStateKind extends LibraryOrAugmentationFileKind {
   });
 
   @override
-  LibraryFileStateKind? get library => this;
+  LibraryFileStateKind get library => this;
 
   bool hasPart(PartFileStateKind part) {
     return file.partedFiles.contains(part.file);

pkg/analyzer/test/src/dart/analysis/analyzer_state_printer.dart

@@ -10,9 +10,11 @@ import 'package:analyzer/src/dart/analysis/library_context.dart';
 import 'package:analyzer/src/dart/micro/resolve_file.dart';
 import 'package:collection/collection.dart';
 import 'package:path/path.dart';
+import 'package:test/test.dart';
 
 class AnalyzerStatePrinter {
   final MemoryByteStore byteStore;
+  final FileStateIdProvider fileStateIdProvider;
   final KeyShorter keyShorter;
   final LibraryContext libraryContext;
   final ResourceProvider resourceProvider;
@@ -22,6 +24,7 @@ class AnalyzerStatePrinter {
 
   AnalyzerStatePrinter({
     required this.byteStore,
+    required this.fileStateIdProvider,
     required this.keyShorter,
     required this.libraryContext,
     required this.resourceProvider,
@@ -93,35 +96,88 @@ class AnalyzerStatePrinter {
     });
   }
 
+  void _writeFile(FileState file) {
+    _withIndent(() {
+      _writelnWithIndent('id: ${fileStateIdProvider[file]}');
+      _writeFileKind(file);
+      _writeFileUnlinkedKey(file);
+    });
+  }
+
+  void _writeFileKind(FileState file) {
+    final kind = file.kind;
+    if (kind is LibraryFileStateKind) {
+      _writelnWithIndent('kind: library');
+      expect(kind.library.file, same(file));
+    } else if (kind is PartOfNameFileStateKind) {
+      _writelnWithIndent('kind: partOfName');
+      _withIndent(() {
+        final library = kind.library;
+        if (library != null) {
+          final id = fileStateIdProvider[library.file];
+          _writelnWithIndent('library: $id');
+        } else {
+          _writelnWithIndent('name: ${kind.directive.name}');
+        }
+      });
+    } else if (kind is PartOfUriKnownFileStateKind) {
+      _writelnWithIndent('kind: partOfUriKnown');
+      _withIndent(() {
+        final library = kind.library;
+        if (library != null) {
+          final id = fileStateIdProvider[library.file];
+          _writelnWithIndent('library: $id');
+        } else {
+          final id = fileStateIdProvider[kind.uriFile];
+          _writelnWithIndent('uriFile: $id');
+        }
+      });
+    } else {
+      throw UnimplementedError('${kind.runtimeType}');
+    }
+  }
+
   void _writeFiles(FileSystemTestData testData) {
+    final fileMap = testData.files;
+    final fileDataList = fileMap.values.toList();
+    fileDataList.sortBy((fileData) => fileData.file.path);
+
+    // Ask ID for every file in the sorted order, so that IDs are nice.
+    for (final fileData in fileDataList) {
+      final current = fileSystemState.getExisting(fileData.file);
+      if (current != null) {
+        fileStateIdProvider[current];
+      }
+    }
+
     _writelnWithIndent('files');
     _withIndent(() {
-      final fileMap = testData.files;
-      final fileDataList = fileMap.values.toList();
-      fileDataList.sortBy((fileData) => fileData.file.path);
-
       for (final fileData in fileDataList) {
         final file = fileData.file;
         _writelnWithIndent(_posixPath(file));
         _withIndent(() {
-          final current = fileSystemState.getExistingFileForResource(file);
+          final current = fileSystemState.getExisting(file);
           if (current != null) {
             _writelnWithIndent('current');
-            _withIndent(() {
-              final unlinkedShort = keyShorter.shortKey(current.unlinkedKey);
-              _writelnWithIndent('unlinkedKey: $unlinkedShort');
-            });
+            _writeFile(current);
           }
 
           final shortGets = keyShorter.shortKeys(fileData.unlinkedKeyGet);
           final shortPuts = keyShorter.shortKeys(fileData.unlinkedKeyPut);
           _writelnWithIndent('unlinkedGet: $shortGets');
           _writelnWithIndent('unlinkedPut: $shortPuts');
+
+          _writelnWithIndent('uri: ${fileData.uri}');
         });
       }
     });
   }
 
+  void _writeFileUnlinkedKey(FileState file) {
+    final unlinkedShort = keyShorter.shortKey(file.unlinkedKey);
+    _writelnWithIndent('unlinkedKey: $unlinkedShort');
+  }
+
   void _writeLibraryContext(LibraryContextTestData testData) {
     _writelnWithIndent('libraryCycles');
     _withIndent(() {
@@ -149,6 +205,11 @@ class AnalyzerStatePrinter {
             _withIndent(() {
               final short = keyShorter.shortKey(current.resolutionKey!);
               _writelnWithIndent('key: $short');
+
+              final fileIdList = current.libraries
+                  .map((fileState) => fileStateIdProvider[fileState])
+                  .toList();
+              _writelnWithIndent('libraries: ${fileIdList.join(' ')}');
             });
           }
 
@@ -180,6 +241,14 @@ class AnalyzerStatePrinter {
   }
 }
 
+class FileStateIdProvider {
+  final Map<FileState, String> _map = Map.identity();
+
+  String operator [](FileState file) {
+    return _map[file] ??= 'file_${_map.length}';
+  }
+}
+
 /// Keys in the byte store are long hashes, which are hard to read.
 /// So, we generate short unique versions for them.
 class KeyShorter {

pkg/analyzer/test/src/dart/micro/file_resolution.dart

@@ -23,6 +23,7 @@ import 'package:linter/src/rules.dart';
 import 'package:test/test.dart';
 
 import '../analysis/analyzer_state_printer.dart' as printer;
+import '../resolution/node_text_expectations.dart';
 import '../resolution/resolution.dart';
 
 /// [FileResolver] based implementation of [ResolutionTest].
@@ -38,6 +39,8 @@ class FileResolutionTest with ResourceProviderMixin, ResolutionTest {
 
   late FileResolver fileResolver;
 
+  final printer.FileStateIdProvider _fileStateIdProvider =
+      printer.FileStateIdProvider();
   final printer.KeyShorter _keyShorter = printer.KeyShorter();
 
   FileSystemState get fsState => fileResolver.fsState!;
@@ -68,6 +71,7 @@ class FileResolutionTest with ResourceProviderMixin, ResolutionTest {
     final buffer = StringBuffer();
     printer.AnalyzerStatePrinter(
       byteStore: byteStore,
+      fileStateIdProvider: _fileStateIdProvider,
       keyShorter: _keyShorter,
       libraryContext: libraryContext,
       resourceProvider: resourceProvider,
@@ -77,6 +81,7 @@ class FileResolutionTest with ResourceProviderMixin, ResolutionTest {
 
     if (actual != expected) {
       print(actual);
+      NodeTextExpectationsCollector.add(actual);
     }
     expect(actual, expected);
   }