ruby_jard 0.2.2 → 0.2.3

data/lib/ruby_jard/screens/backtrace_screen.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module RubyJard
-  module Screens
+  class Screens
     ##
     # Backtrace screen implements the content to display current thread's backtrace to the user.
     class BacktraceScreen < RubyJard::Screen
@@ -10,7 +10,7 @@ module RubyJard
       end
 
       def build
-        @rows = @session.backtrace.map.with_index do |frame, frame_id|
+        @rows = @session.current_backtrace.map.with_index do |frame, frame_id|
           RubyJard::Row.new(
             line_limit: 2,
             columns: [
@@ -39,36 +39,35 @@ module RubyJard
         frame_id_label = frame_id.to_s.rjust(frames_count.to_s.length)
         if current_frame?(frame_id)
           RubyJard::Span.new(
-            content: frame_id_label,
+            content: "➠ #{frame_id_label}",
             styles: :frame_id_highlighted
           )
         else
           RubyJard::Span.new(
-            content: frame_id_label,
+            content: "  #{frame_id_label}",
             styles: :frame_id
           )
         end
       end
 
       def span_class_label(frame)
-        object = frame[1]
-        klass = frame[2]
-        klass_label =
-          if klass.nil? || object.class == klass
-            if object.is_a?(Class)
-              object.name
+        class_label =
+          if frame.frame_class.nil? || frame.frame_self.class == frame.frame_class
+            if frame.frame_self.is_a?(Class)
+              frame.frame_self.name
             else
-              object.class.name
+              frame.frame_self.class.name
             end
-          elsif klass.singleton_class?
+          elsif frame.frame_class.singleton_class?
             # No easy way to get the original class of a singleton class
-            object.respond_to?(:name) ? object.name : object.to_s
+            frame.frame_self.respond_to?(:name) ? frame.frame_self.name : frame.frame_self.to_s
           else
-            klass.name
+            frame.frame_class.name
           end
-        c_frame = frame.last.nil? ? '[c] ' : ''
+
+        c_frame = frame.c_frame? ? '[c] ' : ''
         RubyJard::Span.new(
-          content: "#{c_frame}#{klass_label}",
+          content: "#{c_frame}#{class_label}",
           margin_right: 1,
           styles: :constant
         )
@@ -83,12 +82,11 @@ module RubyJard
       end
 
       def span_method_label(frame)
-        location = frame[0]
         method_label =
-          if location.label != location.base_label
-            "#{location.base_label} (#{location.label.split(' ').first})"
+          if frame.frame_location.label != frame.frame_location.base_label
+            "#{frame.frame_location.base_label} (#{frame.frame_location.label.split(' ').first})"
           else
-            location.base_label
+            frame.frame_location.base_label
           end
         RubyJard::Span.new(
           content: method_label,
@@ -98,8 +96,7 @@ module RubyJard
       end
 
       def span_path(frame)
-        location = frame[0]
-        decorated_path = decorate_path(location.absolute_path, location.lineno)
+        decorated_path = decorate_path(frame.frame_location.absolute_path, frame.frame_location.lineno)
 
         path_label =
           if decorated_path.gem?
@@ -118,15 +115,15 @@ module RubyJard
       end
 
       def current_frame
-        if @session.frame.nil?
+        if @session.current_frame.nil?
           0
         else
-          @session.frame.pos.to_i
+          @session.current_frame.pos.to_i
         end
       end
 
       def frames_count
-        @session.backtrace.length
+        @session.current_backtrace.length
       end
 
       def decorate_path(path, lineno)
@@ -136,4 +133,4 @@ module RubyJard
   end
 end
 
-RubyJard::Screens.add_screen(:backtrace, RubyJard::Screens::BacktraceScreen)
+RubyJard::Screens.add_screen('backtrace', RubyJard::Screens::BacktraceScreen)

data/lib/ruby_jard/screens/menu_screen.rb

@@ -1,32 +1,22 @@
 # frozen_string_literal: true
 
 module RubyJard
-  module Screens
+  class Screens
+    ##
+    # Display key binding guidelines and shortcuts.
     class MenuScreen < RubyJard::Screen
       def build
-        span_title = RubyJard::Span.new(
-          content: ' REPL Console ',
-          styles: :title_highlighted
-        )
-        menu_spans = generate_menu_spans
-
-        alignment =
-          @layout.width -
-          span_title.content_length -
-          menu_spans.map(&:content_length).sum
-        span_align = RubyJard::Span.new(
-          content: ' ' * (alignment < 0 ? 0 : alignment),
-          styles: :background
-        )
+        left_spans = generate_left_spans
+        right_spans = generate_right_spans
         @rows = [RubyJard::Row.new(
           line_limit: 1,
-          ellipsis: false,
           columns: [
             RubyJard::Column.new(
+              word_wrap: RubyJard::Column::WORD_WRAP_BREAK_WORD,
               spans: [
-                span_title,
-                span_align,
-                menu_spans
+                left_spans,
+                align(left_spans, right_spans),
+                right_spans
               ].flatten
             )
           ]
@@ -36,7 +26,37 @@ module RubyJard
 
       private
 
-      def generate_menu_spans
+      def generate_left_spans
+        [
+          RubyJard::Span.new(
+            content: ' REPL ',
+            styles: :title_highlighted
+          )
+        ]
+        # [
+        #   RubyJard::Span.new(
+        #     content: ' Mode (F2) ',
+        #     styles: :title_highlighted
+        #   ),
+        #   RubyJard::Span.new(
+        #     margin_left: 1,
+        #     content: 'All gems',
+        #     styles: :menu_mode
+        #   ),
+        #   RubyJard::Span.new(
+        #     margin_left: 1,
+        #     content: '|',
+        #     styles: :menu_tips
+        #   ),
+        #   RubyJard::Span.new(
+        #     margin_left: 1,
+        #     content: 'Application only',
+        #     styles: :menu_tips
+        #   )
+        # ]
+      end
+
+      def generate_right_spans
         [
           'Up (F6)',
           'Down (Shift+F6)',
@@ -48,12 +68,23 @@ module RubyJard
           RubyJard::Span.new(
             content: menu_item,
             margin_left: 3,
-            styles: :control_buttons
+            styles: :menu_tips
           )
         end
       end
+
+      def align(left_spans, right_spans)
+        alignment =
+          @layout.width -
+          right_spans.map(&:content_length).sum -
+          left_spans.map(&:content_length).sum
+        RubyJard::Span.new(
+          content: ' ' * (alignment < 0 ? 0 : alignment),
+          styles: :background
+        )
+      end
     end
   end
 end
 
-RubyJard::Screens.add_screen(:menu, RubyJard::Screens::MenuScreen)
+RubyJard::Screens.add_screen('menu', RubyJard::Screens::MenuScreen)

data/lib/ruby_jard/screens/source_screen.rb

@@ -1,12 +1,18 @@
 # frozen_string_literal: true
 
 module RubyJard
-  module Screens
+  class Screens
+    ##
+    # Display source code of current stopping line and surrounding lines
     class SourceScreen < RubyJard::Screen
+      ANONYMOUS_SIGNATURES = [
+        '(eval)', '-e'
+      ].freeze
+
       def title
-        return 'Source' if RubyJard.current_session.frame.nil?
+        return 'Source' if @session.current_frame.nil?
 
-        decorated_path = path_decorator(current_file, current_line)
+        decorated_path = path_decorator(@session.current_frame.frame_file, @session.current_frame.frame_line)
         if decorated_path.gem?
           ['Source', "#{decorated_path.gem} - #{decorated_path.path}:#{decorated_path.lineno}"]
         else
@@ -15,35 +21,73 @@ module RubyJard
       end
 
       def build
-        return if RubyJard.current_session.frame.nil?
+        return if @session.current_frame.nil?
+
+        if ANONYMOUS_SIGNATURES.include? @session.current_frame.frame_file
+          # (eval) is hard-coded in Ruby source code for in-code evaluation
+          handle_anonymous_evaluation
+        else
+          # TODO: screen now supports window.
+          codes = source_decorator.codes
+          @rows = codes.map.with_index do |loc, index|
+            RubyJard::Row.new(
+              line_limit: 3,
+              columns: [
+                RubyJard::Column.new(
+                  spans: [
+                    span_mark(index),
+                    span_lineno(index)
+                  ]
+                ),
+                RubyJard::Column.new(
+                  word_wrap: RubyJard::Column::WORD_WRAP_BREAK_WORD,
+                  spans: loc_spans(loc)
+                )
+              ]
+            )
+          end
+        end
+        @selected = 0
+      end
+
+      private
 
-        # TODO: screen now supports window.
-        codes = source_decorator.codes
-        @rows = codes.map.with_index do |loc, index|
+      def handle_anonymous_evaluation
+        @rows = [
           RubyJard::Row.new(
             line_limit: 3,
             columns: [
               RubyJard::Column.new(
                 spans: [
-                  span_mark(index),
-                  span_lineno(index)
+                  RubyJard::Span.new(
+                    content: 'This section is anonymous!',
+                    styles: :normal_token
+                  )
                 ]
-              ),
+              )
+            ]
+          ),
+          RubyJard::Row.new(
+            line_limit: 3,
+            columns: [
               RubyJard::Column.new(
-                word_wrap: RubyJard::Column::WORD_WRAP_BREAK_WORD,
-                spans: loc_spans(loc)
+                spans: [
+                  RubyJard::Span.new(
+                    content: 'Maybe it is dynamically evaluated, or called via ruby-e, without file information.',
+                    styles: :source_lineno
+                  )
+                ]
               )
             ]
           )
-        end
-        @selected = 0
+        ]
       end
 
       def span_mark(index)
         lineno = source_lineno(index)
         RubyJard::Span.new(
           margin_right: 1,
-          content: current_line == lineno ? '➠' : ' ',
+          content: @session.current_frame.frame_line == lineno ? '➠' : ' ',
           styles: :source_line_mark
         )
       end
@@ -52,39 +96,23 @@ module RubyJard
         lineno = source_lineno(index).to_s.rjust(source_decorator.window_end.to_s.length)
         RubyJard::Span.new(
           content: lineno,
-          styles: current_line == lineno ? :source_line_mark : :source_lineno
+          styles: @session.current_frame.frame_line == lineno ? :source_line_mark : :source_lineno
         )
       end
 
       def loc_spans(loc)
-        spans, _tokens = loc_decorator.decorate(loc, current_file)
+        spans, _tokens = loc_decorator.decorate(loc, @session.current_frame.frame_file)
         spans
       end
 
-      private
-
-      def current_binding
-        RubyJard.current_session.frame._binding
-      end
-
-      def current_frame_scope
-        RubyJard.current_session.backtrace[RubyJard.current_session.frame.pos][1]
-      end
-
-      def current_file
-        RubyJard.current_session.frame.file
-      end
-
-      def current_line
-        RubyJard.current_session.frame.line
-      end
-
       def path_decorator(path, lineno)
         @path_decorator ||= RubyJard::Decorators::PathDecorator.new(path, lineno)
       end
 
       def source_decorator
-        @source_decorator ||= RubyJard::Decorators::SourceDecorator.new(current_file, current_line, @layout.height)
+        @source_decorator ||= RubyJard::Decorators::SourceDecorator.new(
+          @session.current_frame.frame_file, @session.current_frame.frame_line, @layout.height
+        )
       end
 
       def loc_decorator
@@ -98,4 +126,4 @@ module RubyJard
   end
 end
 
-RubyJard::Screens.add_screen(:source, RubyJard::Screens::SourceScreen)
+RubyJard::Screens.add_screen('source', RubyJard::Screens::SourceScreen)

data/lib/ruby_jard/screens/threads_screen.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
 module RubyJard
-  module Screens
+  class Screens
+    ##
+    # Display all current alive threads, excluding internal threads
     class ThreadsScreen < RubyJard::Screen
       def title
-        ['Threads', "#{RubyJard.current_session.contexts.length} threads"]
+        ['Threads', "#{@session.threads.length} threads"]
       end
 
       def build
-        contexts = RubyJard.current_session.contexts.select { |c| c.thread.alive? }
+        contexts = @session.threads.select { |c| c.thread.alive? }
         contexts = sort_contexts(contexts)
         @rows = contexts.map do |context|
           RubyJard::Row.new(
@@ -40,10 +42,11 @@ module RubyJard
       private
 
       def span_mark(context)
+        style = thread_status_style(context.thread)
         RubyJard::Span.new(
           margin_right: 1,
-          content: '•',
-          styles: thread_status_style(context.thread)
+          content: style == :thread_status_run ? '►' : '•',
+          styles: style
         )
       end
 
@@ -72,11 +75,11 @@ module RubyJard
       def span_thread_location(context)
         return unknown_thread_location if
           context.thread.backtrace_locations.nil? ||
-          RubyJard.current_session.backtrace[0].nil?
+          @session.current_frame.frame_location.nil?
 
         last_backtrace =
           if current_thread?(context)
-            RubyJard.current_session.backtrace[0].first
+            @session.current_frame.frame_location
           else
             context.thread.backtrace_locations[1]
           end
@@ -112,14 +115,10 @@ module RubyJard
         contexts.sort do |a, b|
           [
             bool_to_int(current_thread?(a)),
-            bool_to_int(b.ignored?),
-            bool_to_int(b.suspended?),
             bool_to_int(b.thread.name.nil?),
             a.thread.object_id
           ] <=> [
             bool_to_int(current_thread?(b)),
-            bool_to_int(a.ignored?),
-            bool_to_int(a.suspended?),
             bool_to_int(a.thread.name.nil?),
             b.thread.object_id
           ]
@@ -139,9 +138,10 @@ module RubyJard
       end
 
       def thread_status_style(thread)
-        if thread.status == 'run'
+        case thread.status
+        when 'run'
           :thread_status_run
-        elsif thread.status == 'sleep'
+        when 'sleep'
           :thread_status_sleep
         else
           :thread_status_other
@@ -151,4 +151,4 @@ module RubyJard
   end
 end
 
-RubyJard::Screens.add_screen(:threads, RubyJard::Screens::ThreadsScreen)
+RubyJard::Screens.add_screen('threads', RubyJard::Screens::ThreadsScreen)