From 0788e77920b9924c3073eb034e179fb62f2c7059 Mon Sep 17 00:00:00 2001 From: yui-knk Date: Tue, 6 May 2014 18:56:57 +0900 Subject: [PATCH] Reform config hash to not require re-aligning. Change to not require to re-aline, whenever we add a long key. see https://github.com/pry/pry/pull/1218. Thanks to kyrylo. --- lib/pry/config/default.rb | 142 ++++++++++++++++++++++++++++---------- 1 file changed, 106 insertions(+), 36 deletions(-) diff --git a/lib/pry/config/default.rb b/lib/pry/config/default.rb index 5cc56758..587e27de 100644 --- a/lib/pry/config/default.rb +++ b/lib/pry/config/default.rb @@ -2,42 +2,112 @@ class Pry::Config::Default include Pry::Config::Behavior default = { - :input => proc { lazy_readline }, - :output => proc { $stdout }, - :commands => proc { Pry::Commands }, - :prompt_name => proc { Pry::DEFAULT_PROMPT_NAME }, - :prompt => proc { Pry::DEFAULT_PROMPT }, - :prompt_safe_objects => proc { Pry::DEFAULT_PROMPT_SAFE_OBJECTS }, - :print => proc { Pry::DEFAULT_PRINT }, - :quiet => proc { false }, - :exception_handler => proc { Pry::DEFAULT_EXCEPTION_HANDLER }, - :exception_whitelist => proc { Pry::DEFAULT_EXCEPTION_WHITELIST }, - :hooks => proc { Pry::DEFAULT_HOOKS }, - :pager => proc { true }, - :system => proc { Pry::DEFAULT_SYSTEM }, - :color => proc { Pry::Helpers::BaseHelpers.use_ansi_codes? }, - :default_window_size => proc { 5 }, - :editor => proc { Pry.default_editor_for_platform }, # TODO: Pry::Platform.editor - :should_load_rc => proc { true }, - :should_load_local_rc => proc { true }, - :should_trap_interrupts => proc { Pry::Helpers::BaseHelpers.jruby? }, # TODO: Pry::Platform.jruby? - :disable_auto_reload => proc { false }, - :command_prefix => proc { "" }, - :auto_indent => proc { Pry::Helpers::BaseHelpers.use_ansi_codes? }, - :correct_indent => proc { true }, - :collision_warning => proc { false }, - :output_prefix => proc { "=> "}, - :requires => proc { [] }, - :should_load_requires => proc { true }, - :should_load_plugins => proc { true }, - :windows_console_warning => proc { true }, - :control_d_handler => proc { Pry::DEFAULT_CONTROL_D_HANDLER }, - :memory_size => proc { 100 }, - :extra_sticky_locals => proc { {} }, - :command_completions => proc { proc { commands.keys } }, - :file_completions => proc { proc { Dir["."] } }, - :ls => proc { Pry::Config.from_hash(Pry::Command::Ls::DEFAULT_OPTIONS) }, - :completer => proc { + input: proc { + lazy_readline + }, + output: proc { + $stdout + }, + commands: proc { + Pry::Commands + }, + prompt_name: proc { + Pry::DEFAULT_PROMPT_NAME + }, + prompt: proc { + Pry::DEFAULT_PROMPT + }, + prompt_safe_objects: proc { + Pry::DEFAULT_PROMPT_SAFE_OBJECTS + }, + print: proc { + Pry::DEFAULT_PRINT + }, + quiet: proc { + false + }, + exception_handler: proc { + Pry::DEFAULT_EXCEPTION_HANDLER + }, + exception_whitelist: proc { + Pry::DEFAULT_EXCEPTION_WHITELIST + }, + hooks: proc { + Pry::DEFAULT_HOOKS + }, + pager: proc { + true + }, + system: proc { + Pry::DEFAULT_SYSTEM + }, + color: proc { + Pry::Helpers::BaseHelpers.use_ansi_codes? + }, + default_window_size: proc { + 5 + }, + editor: proc { + Pry.default_editor_for_platform + }, # TODO: Pry::Platform.editor + should_load_rc: proc { + true + }, + should_load_local_rc: proc { + true + }, + should_trap_interrupts: proc { + Pry::Helpers::BaseHelpers.jruby? + }, # TODO: Pry::Platform.jruby? + disable_auto_reload: proc { + false + }, + command_prefix: proc { + "" + }, + auto_indent: proc { + Pry::Helpers::BaseHelpers.use_ansi_codes? + }, + correct_indent: proc { + true + }, + collision_warning: proc { + false + }, + output_prefix: proc { + "=> " + }, + requires: proc { + [] + }, + should_load_requires: proc { + true + }, + should_load_plugins: proc { + true + }, + windows_console_warning: proc { + true + }, + control_d_handler: proc { + Pry::DEFAULT_CONTROL_D_HANDLER + }, + memory_size: proc { + 100 + }, + extra_sticky_locals: proc { + {} + }, + command_completions: proc { + proc { commands.keys } + }, + file_completions: proc { + proc { Dir["."] } + }, + ls: proc { + Pry::Config.from_hash(Pry::Command::Ls::DEFAULT_OPTIONS) + }, + completer: proc { require "pry/input_completer" Pry::InputCompleter }