Commit Graph

8 Commits

Author SHA1 Message Date
John Mair 3ea75bb026 added Pry::Indent#indent_level method as as short-hand for stack[-1] 2011-10-09 06:48:17 +13:00
John Mair a73529bacf added Pry::Indent#reset method to clear out indentation levels and reset the stack 2011-10-09 06:21:26 +13:00
Yorick Peterse dc95ff8cc9 Removed a useless line of code
Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
2011-10-08 15:35:56 +02:00
Yorick Peterse e2db26574f Pry::Indent now handles single line statements.
Previously certain lines of code would break the indentation process. For
example, the following code would result in incorrect indentation:

    def hello; end
    puts "Hello world"

This would result in the following:

    def hello; end
      puts "Hello world"

I've worked around this issue by adding a new method
(Pry::Indent#skip_indentation?) that does a lookahead on the list of tokens to
determine if a line should be indented or not. It's probably not the most
efficient way of doing it but it makes it quite easy to add more tokens to the
list without adding a lot more complexity.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
2011-10-08 15:32:49 +02:00
John Mair 971223d94a move code to correct indentation into a method on Pry::Indent 2011-10-09 01:40:39 +13:00
John Mair 8ca04c22df fixed some style issues; renamed Pry.config.indent to Pry.config.auto_indent 2011-10-09 00:40:55 +13:00
Yorick Peterse 42e943733b Compatibility with 1.8 and friends.
Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
2011-10-06 11:17:08 +02:00
Yorick Peterse e9c2f383eb Pry now indents code similar to IRB.
Code is indented using the class Pry::Indent. This class uses an internal stack
that contains the indentation levels for each line of code. Certain keywords
such as "class" or "def" will add data to this stack so that the next line is
indented, other keywords such as "end" or "}" will remove data from the stack,
causing the next line to be un-indented.

Pry::Indent is hooked into Pry#retrieve_line as well as Pry#readline. This means
that both input strings as well as the ones displayed by "show-method" are
indented. Sadly due to the way Readline works input strings are indented similar
to IRB. This means that instead of the following:

    > class User
    >   def initialize
    >   end
    > end

You'll get the following:

    > class User
    >   def initialize
    >     end
    >   end

While annoying there doesn't seem to be a way to work around this issue. Luckily
the "show-method" command indents your code properly.

By default indentation is turned on. This can be turned off (or back on) using
the configuration item Pry.config.indent. However, if you turn this option off
after a method is defined "show-method" will still show it with indentation as
indentation happens on input rather than only when code is displayed.

For more information see Pry::Indent#indent in lib/pry/indent.rb.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
2011-10-05 19:04:44 +02:00