Automatically identify the workspace suffix for READONLY.

pkg/analyzer/lib/src/generated/bazel.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library analyzer.src.generated.bazel;
 
 import 'dart:collection';
 import 'dart:core';
 
 import 'package:analyzer/file_system/file_system.dart';
@@ skipping 88 matching lines @@
 
   /**
    * The absolute workspace root path.
    *
    * It contains the `WORKSPACE` file or its parent contains the `READONLY`
    * folder.
    */
   final String root;
 
   /**
-   * The absolute path to the optional `READONLY` folder if a git-based
-   * workspace, or `null`.
+   * The absolute path to the optional read only workspace root, in the
+   * `READONLY` folder if a git-based workspace, or `null`.
    */
   final String readonly;
 
   /**
    * The absolute path to the `bazel-bin` folder.
    */
   final String bin;
 
   /**
    * The absolute path to the `bazel-genfiles` folder.
@@ skipping 51 matching lines @@
   }
 
   /**
    * Find the Bazel workspace that contains the given [path].
    *
    * Return `null` if a workspace markers, such as the `WORKSPACE` file, or
    * the sibling `READONLY` folder cannot be found.
    *
    * Return `null` if the workspace does not have `bazel-genfiles` or
    * `blaze-genfiles` folders, so we don't know where to search generated files.
+   *
+   * Return `null` if there is a folder 'foo' with the sibling `READONLY`
+   * folder, but there is corresponding folder 'foo' in `READONLY`, i.e. the
+   * corresponding readonly workspace root.
    */
-  static BazelWorkspace find(ResourceProvider provider, String path,
-      {String readonlySuffix}) {
+  static BazelWorkspace find(ResourceProvider provider, String path) {
     Context context = provider.pathContext;
 
     // Ensure that the path is absolute and normalized.
     if (!context.isAbsolute(path)) {
       throw new ArgumentError('not absolute: $path');
     }
     path = context.normalize(path);
 
     Folder folder = provider.getFolder(path);
     while (true) {
       Folder parent = folder.parent;
       if (parent == null) {
         return null;
       }
 
-      // Found the READONLY folder, must be a git-based workspace.
-      if (readonlySuffix != null) {
-        Folder readonlyFolder = parent.getChildAssumingFolder(_READONLY);
-        if (readonlyFolder.exists) {
-          String root = folder.path;
-          String readonly = readonlyFolder.path;
+      // Found the READONLY folder, might be a git-based workspace.
+      Folder readonlyFolder = parent.getChildAssumingFolder(_READONLY);
+      if (readonlyFolder.exists) {
+        String root = folder.path;
+        String readonlyRoot =
+            context.join(readonlyFolder.path, folder.shortName);
+        if (provider.getFolder(readonlyRoot).exists) {
           String symlinkPrefix = _findSymlinkPrefix(provider, root);
-          if (symlinkPrefix == null) {
-            return null;
+          if (symlinkPrefix != null) {
+            return new BazelWorkspace._(
+                provider,
+                root,
+                readonlyRoot,
+                context.join(root, '$symlinkPrefix-bin'),
+                context.join(root, '$symlinkPrefix-genfiles'));
           }
-          return new BazelWorkspace._(
-              provider,
-              root,
-              context.join(readonly, readonlySuffix),
-              context.join(root, '$symlinkPrefix-bin'),
-              context.join(root, '$symlinkPrefix-genfiles'));
         }
       }
 
       // Found the WORKSPACE file, must be a non-git workspace.
       if (folder.getChildAssumingFile(_WORKSPACE).exists) {
         String root = folder.path;
         String symlinkPrefix = _findSymlinkPrefix(provider, root);
         if (symlinkPrefix == null) {
           return null;
         }
@@ skipping 19 matching lines @@
     Context context = provider.pathContext;
     if (provider.getFolder(context.join(root, 'blaze-genfiles')).exists) {
       return 'blaze';
     }
     if (provider.getFolder(context.join(root, 'bazel-genfiles')).exists) {
       return 'bazel';
     }
     return null;
   }
 }