Add a space when completing command names and long options

4 files changed, 4 insertions, 4 deletions

diff --git a/lib/pry/command.rb b/lib/pry/command.rb
index 27d78a8a..b10b6147 100644
--- a/lib/pry/command.rb
+++ b/lib/pry/command.rb
@@ -513,7 +513,7 @@ class Pry
     # @return [Array<String>]  the words to complete
     def complete(search)
       slop.map do |opt|
-        [opt.long && "--#{opt.long}" || opt.short && "-#{opt.short}"]
+        [opt.long && "--#{opt.long} " || opt.short && "-#{opt.short}"]
       end.flatten(1).compact + super
     end
 
diff --git a/lib/pry/command_set.rb b/lib/pry/command_set.rb
index 231b761c..49d9fb63 100644
--- a/lib/pry/command_set.rb
+++ b/lib/pry/command_set.rb
@@ -365,7 +365,7 @@ class Pry
       else
         commands.keys.select do |x|
           String === x && x.start_with?(search)
-        end + Bond::DefaultMission.completions
+        end.map{ |command| command + " " } + Bond::DefaultMission.completions
       end
     end
 
diff --git a/test/test_command.rb b/test/test_command.rb
index 3e5e72e0..7c037e74 100644
--- a/test/test_command.rb
+++ b/test/test_command.rb
@@ -666,7 +666,7 @@ describe "Pry::Command" do
           end
         end
 
-        @set.complete('torrid ').should.include('--test')
+        @set.complete('torrid ').should.include('--test ')
       end
     end
   end
diff --git a/test/test_command_set.rb b/test/test_command_set.rb
index 5cf4b406..15fd7be8 100644
--- a/test/test_command_set.rb
+++ b/test/test_command_set.rb
@@ -615,7 +615,7 @@ describe Pry::CommandSet do
     describe '.complete' do
       it "should list all command names" do
         @set.create_command('susan'){ }
-        @set.complete('sus').should.include 'susan'
+        @set.complete('sus').should.include 'susan '
       end
 
       it "should delegate to commands" do