Move global key bindings to RubyJard.config

Author: 0x2c7

lib/ruby_jard.rb

@@ -9,8 +9,8 @@
 require 'ruby_jard/path_classifier'
 require 'ruby_jard/path_filter'
 require 'ruby_jard/control_flow'
-require 'ruby_jard/config'
 require 'ruby_jard/keys'
+require 'ruby_jard/config'
 require 'ruby_jard/key_binding'
 require 'ruby_jard/key_bindings'
 require 'ruby_jard/repl_processor'
@@ -81,16 +81,6 @@ def self.error(exception)
     # Ignore
   end
 
-  def self.global_key_bindings
-    return @global_key_bindings if defined?(@global_key_bindings)
-
-    @global_key_bindings = RubyJard::KeyBindings.new
-    RubyJard::Keys::DEFAULT_KEY_BINDINGS.each do |sequence, action|
-      @global_key_bindings.push(sequence, action)
-    end
-    @global_key_bindings
-  end
-
   def self.config
     @config ||= RubyJard::Config.smart_load
   end

lib/ruby_jard/config.rb

@@ -38,7 +38,7 @@ def load_config(config, path)
       end
     end
 
-    attr_accessor :color_scheme, :alias_to_debugger, :layout
+    attr_accessor :color_scheme, :alias_to_debugger, :layout, :key_bindings
     attr_reader :enabled_screens, :filter_version, :filter, :filter_included, :filter_excluded
 
     CONFIG_FILE_NAME = '.jardrc'
@@ -48,7 +48,19 @@ def load_config(config, path)
       DEFAULT_LAYOUT = nil, # Pick layout automatically
       DEFAULT_FILTER = RubyJard::PathFilter::FILTER_APPLICATION,
       DEFAULT_FILTER_INCLUDED = [].freeze,
-      DEFAULT_FILTER_EXCLUDED = [].freeze
+      DEFAULT_FILTER_EXCLUDED = [].freeze,
+      DEFAULT_KEY_BINDINGS = {
+        RubyJard::Keys::F2       => 'jard filter switch',
+        RubyJard::Keys::F5       => 'list',
+        RubyJard::Keys::F6       => 'up',
+        RubyJard::Keys::SHIFT_F6 => 'down',
+        RubyJard::Keys::F7       => 'step',
+        RubyJard::Keys::SHIFT_F7 => 'step-out',
+        RubyJard::Keys::F8       => 'next',
+        RubyJard::Keys::F9       => 'continue',
+        RubyJard::Keys::CTRL_D   => 'continue',
+        RubyJard::Keys::CTRL_C   => 'interrupt'
+      }.freeze
     ].freeze
 
     def initialize
@@ -62,6 +74,8 @@ def initialize
       @alias_to_debugger = DEFAULT_ALIAS_TO_DEBUGGER.freeze
       @layout = DEFAULT_LAYOUT.freeze
       @enabled_screens = RubyJard::Screens.names.dup.freeze
+
+      @key_bindings = RubyJard::KeyBindings.new(DEFAULT_KEY_BINDINGS)
     end
 
     def config

lib/ruby_jard/key_bindings.rb

@@ -10,9 +10,12 @@ module RubyJard
   class KeyBindings
     attr_reader :indexes
 
-    def initialize
+    def initialize(sequences)
       @key_bindings = []
       @indexes = {}
+      sequences.each do |sequence, action|
+        push(sequence, action)
+      end
     end
 
     def to_a

lib/ruby_jard/keys.rb

@@ -34,16 +34,5 @@ class Keys
     SHIFT_F10 = "\e[21;2~"
     SHIFT_F11 = "\e[23;2~"
     SHIFT_F12 = "\e[24;2~"
-    DEFAULT_KEY_BINDINGS = {
-      F2       => (ACTION_FILTER   = 'jard filter switch'),
-      F5       => (ACTION_LIST     = 'list'),
-      F6       => (ACTION_UP       = 'up'),
-      SHIFT_F6 => (ACTION_DOWN     = 'down'),
-      F7       => (ACTION_STEP     = 'step'),
-      SHIFT_F7 => (ACTION_STEP_OUT = 'step-out'),
-      F8       => (ACTION_NEXT     = 'next'),
-      F9       => (ACTION_CONTINUE = 'continue'),
-      CTRL_D   => ACTION_CONTINUE
-    }.freeze
   end
 end

lib/ruby_jard/repl_interceptor.rb

@@ -46,21 +46,13 @@ module RubyJard
   #
   # As a result, Jard may support key-binding customization without breaking pry functionalities.
   class ReplInterceptor
-    INTERNAL_KEY_BINDINGS = {
-      RubyJard::Keys::CTRL_C => (KEY_BINDING_INTERRUPT = :interrupt)
-    }.freeze
-
     KEY_READ_TIMEOUT = 0.2    # 200ms
     OUTPUT_TICK = 1.to_f / 60 # 60hz
 
-    def initialize(state, console, key_bindings)
+    def initialize(state, console)
       @state = state
       @console = console
-
-      @key_bindings = key_bindings || RubyJard::KeyBindings.new
-      INTERNAL_KEY_BINDINGS.each do |sequence, action|
-        @key_bindings.push(sequence, action)
-      end
+      @key_bindings = RubyJard.config.key_bindings
 
       reopen_streams
       start_output_bridge
@@ -209,7 +201,7 @@ def listen_key_press
 
     def handle_key_binding(key_binding)
       case key_binding.action
-      when KEY_BINDING_INTERRUPT
+      when 'interrupt'
         handle_interrupt_command
       else
         @state.check(:ready?) do

lib/ruby_jard/repl_manager.rb

@@ -9,10 +9,10 @@ module RubyJard
   class ReplManager
     OUTPUT_TICK = 1.to_f / 60 # 60hz
 
-    def initialize(console:, key_bindings: nil)
+    def initialize(console:)
       @console = console
       @state = RubyJard::ReplState.new
-      @interceptor = RubyJard::ReplInterceptor.new(@state, @console, key_bindings)
+      @interceptor = RubyJard::ReplInterceptor.new(@state, @console)
 
       Signal.trap('SIGWINCH') { start_resizing }
     end

lib/ruby_jard/session.rb

@@ -36,8 +36,7 @@ def attach(location)
     def initialize
       @screen_manager = RubyJard::ScreenManager.new
       @repl_manager = RubyJard::ReplManager.new(
-        console: @screen_manager.console,
-        key_bindings: RubyJard.global_key_bindings
+        console: @screen_manager.console
       )
       @path_filter = RubyJard::PathFilter.new
       @started = false