Allow suppressing message extraction warnings, providing a prefix for generated files, and format w…

pkg/intl/test/data_directory.dart

 // Copyright (c) 2012, 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.
 
 /**
  * A utility function for test and tools that compensates (at least for very
  * simple cases) for file-dependent programs being run from different
  * directories. The important cases are
  *   -running in the directory that contains the test itself, i.e.
  *    pkg/intl/test or a sub-directory.
  *   -running in pkg/intl, which is where the editor will run things by default
  *   -running in the top-level dart directory, where the build tests run
  */
 library data_directory;
 
 import "dart:io";
 import "package:pathos/path.dart" as path;
 
 String get dataDirectory {
-  return path.join(intlDirectory, datesRelativeToIntl);
+  return path.join(intlDirectory(), datesRelativeToIntl);
 }
 
-String get intlDirectory {
+String intlDirectory() {
   var components = path.split(path.current);
   var foundIntlDir = false;
 
-  /**
-   * A helper function that returns false (indicating we should stop iterating)
-   * if the argument to the previous call was 'intl' and also sets
-   * the outer scope [foundIntl].
-   */
-  bool checkForIntlDir(String each) {
-    if (foundIntlDir) return false;
-    foundIntlDir = (each == 'intl') ? true : false;
-    return true;
+  List findPathUpToIntl() {
+    var result = [];
+    for (var each in components) {

[Siggi Cherem (dart-lang), 2013/04/23 02:12:51]

nit: 'each' => 'segment' or 'component'?

(generally, I think a noun describing what each thing is makes the body the loop
easier to understand.)

[Emily Fortuna, 2013/04/23 17:24:48]

+1

[Alan Knight, 2013/04/23 17:59:56]

This is moot, because this file's changes were because of a change to takeWhile
that made the previous version fail. That change broke lots of other stuff and
has been reverted, so reverting this file to the initial version.

[Siggi Cherem (dart-lang), 2013/04/23 18:56:37]

sure - I noticed that the original code is also using 'each' as a function
argument, can you make the change there instead?

[Alan Knight, 2013/04/23 21:37:19]

Done.

+      if (each == 'intl') {
+        foundIntlDir = true;
+        result.add(each);
+        return result;
+      } else {
+        result.add(each);
+      }
+    }
+    return result;
   }
 
-  var pathUpToIntl = components.takeWhile(checkForIntlDir).toList();
+  var pathUpToIntl = findPathUpToIntl();
   // We assume that if we're not somewhere underneath the intl hierarchy
   // that we are in the dart root.
   if (foundIntlDir) {
     return path.joinAll(pathUpToIntl);
   } else {
     if (new Directory(path.join(path.current, 'pkg', 'intl')).existsSync()) {
       return path.join(path.current, 'pkg', 'intl');
     }
     if (new Directory(
         path.join(path.current, '..', 'pkg', 'intl')).existsSync()) {
       return path.join(path.current, '..', 'pkg', 'intl');
     }
   }
   throw new UnsupportedError(
       'Cannot find ${path.join('pkg','intl')} directory.');
 }
 
 String get datesRelativeToIntl => path.join('lib', 'src', 'data', 'dates');