diff options
author | Takashi Kokubun <takashikkbn@gmail.com> | 2019-05-30 15:49:48 +0900 |
---|---|---|
committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-05-30 15:50:21 +0900 |
commit | 70e87d9660af24fb93cac1312b6e1990602c1396 (patch) | |
tree | adef86aa16f9807cad21d4b5c584ec9d67ba8ac2 /lib/irb/workspace.rb | |
parent | 55c34b994b40db4d9fdbc29d9d8521745a56fdfd (diff) | |
download | ruby-70e87d9660af24fb93cac1312b6e1990602c1396.tar.gz |
Do not rely on IRB.conf[:MAIN_CONTEXT] before initialize
so that we can colorize binding.irb source lines.
Diffstat (limited to 'lib/irb/workspace.rb')
-rw-r--r-- | lib/irb/workspace.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb index 9337c172fd..2bbd5cf9ec 100644 --- a/lib/irb/workspace.rb +++ b/lib/irb/workspace.rb @@ -131,7 +131,10 @@ EOF return end end - if IRB.conf&.fetch(:MAIN_CONTEXT, nil)&.use_colorize? + + # NOT using #use_colorize? of IRB.conf[:MAIN_CONTEXT] because this method may be called before IRB::Irb#run + use_colorize = IRB.conf.fetch(:USE_COLORIZE, true) + if use_colorize lines = Color.colorize_code(code).lines else lines = code.lines @@ -141,7 +144,7 @@ EOF start_pos = [pos - 5, 0].max end_pos = [pos + 5, lines.size - 1].min - if IRB.conf&.fetch(:MAIN_CONTEXT, nil)&.use_colorize? + if use_colorize fmt = " %2s #{Color.colorize("%#{end_pos.to_s.length}d", [:BLUE, :BOLD])}: %s" else fmt = " %2s %#{end_pos.to_s.length}d: %s" |