Resolve aliases in 'brew edit'.

2 files changed, 9 insertions, 8 deletions

diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index d39df7d7f..61268fda3 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -102,12 +102,6 @@ module HomebrewArgvExtension
     EOS
   end
 
-  private
-
-  def downcased_unique_named
-    @downcased_unique_named ||= named.map(&:downcase).uniq
-  end
-
   def resolve_alias name
     aka = HOMEBREW_REPOSITORY+"Library/Aliases/#{name}"
     if aka.file?
@@ -116,4 +110,10 @@ module HomebrewArgvExtension
       name
     end
   end
+
+  private
+
+  def downcased_unique_named
+    @downcased_unique_named ||= named.map(&:downcase).uniq
+  end
 end
diff --git a/bin/brew b/bin/brew
index 93854270d..135332d32 100755
--- a/bin/brew
+++ b/bin/brew
@@ -152,9 +152,10 @@ begin
                           "#{HOMEBREW_REPOSITORY}/bin/brew"<<
                           "#{HOMEBREW_REPOSITORY}/README.md"
       else
-        # we don't use ARGV.formulae as that will throw if the file doesn't parse
+        # Don't use ARGV.formulae as that will throw if the file doesn't parse
         paths = ARGV.named.collect do |name|
-          unless File.exist? path = "#{HOMEBREW_REPOSITORY}/Library/Formula/#{name}.rb"
+          path = "#{HOMEBREW_REPOSITORY}/Library/Formula/#{ARGV.resolve_alias(name)}.rb"
+          unless File.exist? path
             require 'formula'
             raise FormulaUnavailableError, name
           else