commit 2442c81f094c1d55ed50d10e452a2bf17d56db03
author Konstantin Shcheglov <scheglov@google.com> Fri Jul 08 21:55:39 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Jul 08 21:55:39 2022 +0000
tree 5fb35c537fae35376d4c7f0f502ae85e0f83423f
parent 13f8ddcfed357237d53c4fa1558f1b522fbaf6e8

Revert "Pick the most specific workspace from multiple workspace signals"

This reverts commit 0c72795f692faa01e148126761d9524d19da9bb3.

Reason for revert: https://buganizer.corp.google.com/issues/238011180

Original change's description:
> Pick the most specific workspace from multiple workspace signals
>
> Closes https://github.com/dart-lang/sdk/pull/49237
>
> GitOrigin-RevId: a1db3bebcd4622bc31303781f5c9ba64167a0e6a
> Change-Id: Ief3ef8a5c421ff20e817bf27dac96c1fc37da595
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/248020
> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
> Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>

# Not skipping CQ checks because original CL landed > 1 day ago.

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

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

diff --git a/pkg/analyzer/lib/src/dart/analysis/context_locator.dart b/pkg/analyzer/lib/src/dart/analysis/context_locator.dart
index 4aa5964c..6c92619 100644
--- a/pkg/analyzer/lib/src/dart/analysis/context_locator.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/context_locator.dart
@@ -378,12 +378,10 @@
     Workspace? workspace;
     workspace = BazelWorkspace.find(resourceProvider, rootPath,
         lookForBuildFileSubstitutes: false);
-    workspace = _mostSpecificWorkspace(
-        workspace, GnWorkspace.find(resourceProvider, rootPath));
-    workspace = _mostSpecificWorkspace(workspace,
-        PackageBuildWorkspace.find(resourceProvider, packages, rootPath));
-    workspace = _mostSpecificWorkspace(
-        workspace, PubWorkspace.find(resourceProvider, packages, rootPath));
+    workspace ??= GnWorkspace.find(resourceProvider, rootPath);
+    workspace ??=
+        PackageBuildWorkspace.find(resourceProvider, packages, rootPath);
+    workspace ??= PubWorkspace.find(resourceProvider, packages, rootPath);
     workspace ??= BasicWorkspace.find(resourceProvider, packages, rootPath);
     return workspace;
   }
@@ -557,20 +555,6 @@
 
     return true;
   }
-
-  /// Pick a workspace with the most specific root. If the root of [first] is
-  /// non-null and is within the root of [second], return [second]. If any of
-  /// [first] and [second] is null, return the other one. If the roots aren't
-  /// within each other, return [first].
-  static Workspace? _mostSpecificWorkspace(
-      Workspace? first, Workspace? second) {
-    if (first == null) return second;
-    if (second == null) return first;
-    if (isWithin(first.root, second.root)) {
-      return second;
-    }
-    return first;
-  }
 }
 
 /// The packages [file] found for the [parent].

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

diff --git a/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart b/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart
index 70b8c34..9f757d0 100644
--- a/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart
@@ -290,35 +290,6 @@
     expect(outerRoot.packagesFile, outerPackagesFile);
   }
 
-  void
-      test_locateRoots_multiple_dirAndNestedDir_outerIsBazel_innerConfigurationFiles() {
-    var outerRootFolder = newFolder('/outer');
-    newFile('$outerRootFolder/WORKSPACE', '');
-    newBazelBuildFile('$outerRootFolder', '');
-    var innerRootFolder = newFolder('/outer/examples/inner');
-    var innerOptionsFile = newAnalysisOptionsYamlFile('$innerRootFolder', '');
-    var innerPackagesFile = newPackageConfigJsonFile('$innerRootFolder', '');
-    newPubspecYamlFile('$innerRootFolder', '');
-
-    var roots = contextLocator.locateRoots(
-      includedPaths: [outerRootFolder.path, innerRootFolder.path],
-    );
-    expect(roots, hasLength(2));
-
-    var outerRoot = findRoot(roots, outerRootFolder);
-    expect(outerRoot.includedPaths, unorderedEquals([outerRootFolder.path]));
-    expect(outerRoot.excludedPaths, unorderedEquals([innerRootFolder.path]));
-    expect(outerRoot.optionsFile, isNull);
-    expect(outerRoot.packagesFile, isNull);
-
-    var innerRoot = findRoot(roots, innerRootFolder);
-    expect(innerRoot.workspace.root, equals(innerRootFolder.path));
-    expect(innerRoot.includedPaths, unorderedEquals([innerRootFolder.path]));
-    expect(innerRoot.excludedPaths, isEmpty);
-    expect(innerRoot.optionsFile, innerOptionsFile);
-    expect(innerRoot.packagesFile, innerPackagesFile);
-  }
-
   void test_locateRoots_multiple_dirAndNestedFile_excludedByOptions() {
     var rootPath = convertPath('/home/test');
     var rootFolder = newFolder(rootPath);