From 53161dd26cd6ead0f7fac58b4ba16e354b78c07a Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Tue, 10 May 2022 00:08:42 +0000
Subject: [PATCH] [deps] rev package:file

Change-Id: I5f8118a0ada53498c7e9309111523c99ff848e8b
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/244043
Reviewed-by: Nate Bosch <nbosch@google.com>
Reviewed-by: Kevin Moore <kevmoo@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
---
 DEPS                                     |  2 +-
 tools/addlatexhash.dart                  |  7 +++----
 tools/generate_package_config.dart       | 24 ++++++++++++++++++++++++
 tools/package_deps/bin/package_deps.dart | 10 +++++++++-
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/DEPS b/DEPS
index 57d0d22994d..1aceb3cecca 100644
--- a/DEPS
+++ b/DEPS
@@ -110,7 +110,7 @@ vars = {
   "dartdoc_rev": "334072b0cad436c05f6bcecf8a1a59f2f0809b84",
   "devtools_rev": "3c16b8d73120e46958982d94215d499793b972eb",
   "ffi_rev": "4dd32429880a57b64edaf54c9d5af8a9fa9a4ffb",
-  "file_rev": "1ebc38852ffed24b564910317982298b56c2cedd",
+  "file_rev": "0132eeedea2933513bf230513a766a8baeab0c4f",
   "fixnum_rev": "3bfc2ed1eea7e7acb79ad4f17392f92c816fc5ce",
   "glob_rev": "e10eb2407c58427144004458ef85c9bbf7286e56",
   "html_rev": "f108bce59d136c584969fd24a5006914796cf213",
diff --git a/tools/addlatexhash.dart b/tools/addlatexhash.dart
index de161edb274..c2693684189 100755
--- a/tools/addlatexhash.dart
+++ b/tools/addlatexhash.dart
@@ -514,8 +514,7 @@ addHashMarks(lines, hashEvents, listSink) {
       var start = hashEvent.startLineNumber;
       var end = hashEvent.endLineNumber;
       final hashValue = computeHashString(lines, start + 1, end, listSink);
-      lines[start] =
-          lines[start].replaceAll(latexArgumentRE, "{" + hashValue + "}");
+      lines[start] = lines[start].replaceAll(latexArgumentRE, "{$hashValue}");
       listSink.write("  $hashValue\n");
     } else if (hashEvent is HashLabelEvent) {
       listSink.write("${hashEvent.labelText}\n");
@@ -553,9 +552,9 @@ main([args]) {
       inDartCode = false;
     }
     if (inDartCode) {
-      normalizedLines.add(sispNormalize(line + "\n"));
+      normalizedLines.add(sispNormalize("$line\n"));
     } else {
-      normalizedLines.add(normalize(line + "\n"));
+      normalizedLines.add(normalize("$line\n"));
     }
   }
 
diff --git a/tools/generate_package_config.dart b/tools/generate_package_config.dart
index df62eb36b81..b147a285cb7 100644
--- a/tools/generate_package_config.dart
+++ b/tools/generate_package_config.dart
@@ -33,6 +33,9 @@ void main(List<String> args) {
     platform('tools/package_deps'),
   ];
 
+  // Remove the package at the top-level of the package:file monorepo.
+  packageDirs.remove(platform('third_party/pkg/file'));
+
   var cfePackageDirs = [
     platform('pkg/front_end/testcases'),
   ];
@@ -73,6 +76,27 @@ void main(List<String> args) {
   ];
   packages.sort((a, b) => a.name.compareTo(b.name));
 
+  // Remove any packages with identical names.
+  final uniqueNames = packages.map((p) => p.name).toSet();
+
+  var hasDuplicatePackages = false;
+
+  for (var name in uniqueNames) {
+    var matches = packages.where((p) => p.name == name).toList();
+    if (matches.length > 1) {
+      print('Duplicates found for package:$name');
+      for (var package in matches) {
+        print('  ${package.rootUri}');
+      }
+
+      hasDuplicatePackages = true;
+    }
+  }
+
+  if (hasDuplicatePackages) {
+    exit(1);
+  }
+
   var configFile = File(join(repoRoot, '.dart_tool', 'package_config.json'));
   var packageConfig = PackageConfig(
     packages,
diff --git a/tools/package_deps/bin/package_deps.dart b/tools/package_deps/bin/package_deps.dart
index ce47f51dc53..8814aa7c487 100644
--- a/tools/package_deps/bin/package_deps.dart
+++ b/tools/package_deps/bin/package_deps.dart
@@ -288,7 +288,13 @@ class Package implements Comparable<Package> {
         continue;
       }
 
-      ResolvedDep resolvedDep = sdkDeps.resolve(dep.name)!;
+      ResolvedDep? resolvedDep = sdkDeps.resolve(dep.name);
+      if (resolvedDep == null) {
+        out('  Unresolved reference: package:${dep.name}');
+        fail = true;
+        continue;
+      }
+
       if (resolvedDep.isMonoRepoPackage) {
         continue;
       }
@@ -478,6 +484,8 @@ class SdkDeps {
     _findPackages(Directory('pkg'));
     _findPackages(Directory(path.join('third_party', 'devtools')));
     _findPackages(Directory(path.join('third_party', 'pkg')));
+    _findPackages(
+        Directory(path.join('third_party', 'pkg', 'file', 'packages')));
     _findPackages(Directory(path.join('third_party', 'pkg_tested')));
 
     if (verbose) {