This is acheived by keeping track of which Strings are open and
re-opening them before giving CodeRay the new line of input.
I considered instead passing the entire input through CodeRay and then
just extracting the last line of tokens, unfortunately this would
exhibit O(n²) behaviour when pasting code into the terminal; and it's
not obvious whether the tokenization would be stable enough to guarantee
an easy way to get the last line of tokens.
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>
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>
Conrad Irwin