From 1f6ed67bd958359d6d300cb297e4953c2e553cdd Mon Sep 17 00:00:00 2001
From: Ian Hickson <ian@hixie.ch>
Date: Sat, 16 Jan 2016 13:25:41 -0800
Subject: [PATCH] Make 'flutter analyze' support analyzing arbitrary files

Before we didn't know how to find the packages of random files. Now we do.
---
 .../lib/src/commands/analyze.dart             | 23 +++++++++++++++----
 .../src/runner/flutter_command_runner.dart    |  4 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/flutter_tools/lib/src/commands/analyze.dart b/packages/flutter_tools/lib/src/commands/analyze.dart
index f82f4e61942..4a127ae379c 100644
--- a/packages/flutter_tools/lib/src/commands/analyze.dart
+++ b/packages/flutter_tools/lib/src/commands/analyze.dart
@@ -34,9 +34,24 @@ class AnalyzeCommand extends FlutterCommand {
     Set<String> pubSpecDirectories = new Set<String>();
     List<String> dartFiles = argResults.rest.toList();
 
+    bool foundAnyInCurrentDirectory = false;
+    bool foundAnyInFlutterRepo = false;
+
     for (String file in dartFiles) {
-      // TODO(ianh): figure out how dartanalyzer decides which .packages file to use when given a random file
-      pubSpecDirectories.add(path.dirname(file));
+      file = path.normalize(path.absolute(file));
+      String root = path.rootPrefix(file);
+      while (file != root) {
+        file = path.dirname(file);
+        if (FileSystemEntity.isFileSync(path.join(file, 'pubspec.yaml'))) {
+          pubSpecDirectories.add(file);
+          if (file == path.normalize(path.absolute(ArtifactStore.flutterRoot))) {
+            foundAnyInFlutterRepo = true;
+          } else if (file == path.normalize(path.absolute(path.current))) {
+            foundAnyInCurrentDirectory = true;
+          }
+          break;
+        }
+      }
     }
 
     if (argResults['flutter-repo']) {
@@ -129,8 +144,6 @@ class AnalyzeCommand extends FlutterCommand {
       }
     }
 
-    bool foundAnyInCurrentDirectory = false;
-
     if (argResults['current-directory']) {
       // ./*.dart
       Directory currentDirectory = new Directory('.');
@@ -204,7 +217,7 @@ class AnalyzeCommand extends FlutterCommand {
       }
     }
     if (hadInconsistentRequirements) {
-      if (argResults['flutter-repo'])
+      if (foundAnyInFlutterRepo)
         logging.warning('You may need to run "dart ${path.normalize(path.relative(path.join(ArtifactStore.flutterRoot, 'dev/update_packages.dart')))} --upgrade".');
       if (foundAnyInCurrentDirectory)
         logging.warning('You may need to run "pub upgrade".');
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
index f36e51f0cdb..9429786e86a 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
@@ -147,9 +147,9 @@ class FlutterCommandRunner extends CommandRunner {
       Logger.root.level = Level.FINE;
 
     _globalResults = globalResults;
-    ArtifactStore.flutterRoot = globalResults['flutter-root'];
+    ArtifactStore.flutterRoot = path.normalize(path.absolute(globalResults['flutter-root']));
     if (globalResults.wasParsed('package-root'))
-      ArtifactStore.packageRoot = globalResults['package-root'];
+      ArtifactStore.packageRoot = path.normalize(path.absolute(globalResults['package-root']));
 
     if (globalResults['version']) {
       print(getVersion(ArtifactStore.flutterRoot));