Skip to content

Commit

Permalink
Merge pull request #21 from lepht/master
Browse files Browse the repository at this point in the history
Fix spelling of "immediate" in various places
  • Loading branch information
shuky19 committed Apr 16, 2014
2 parents 98ccf44 + 39c7ca0 commit 959412e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ is to [install](#installation) Debugger plugin and press on
## Features
* Local debugging Ruby and RoR applications.
* Stepping up, down ,over and into while debugging (jumps and goto also available).
* Add watch expression and run immidiate code using the current program context.
* Add watch expression and run immediate code using the current program context.
* Monitoring on stack, threads, output and local variables in the program.
* Builtin rails support.
* Breakpoints, conditional breakpoints and temporary breakpoints (goto) support.
Expand Down
2 changes: 1 addition & 1 deletion debug_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def on_input_entered(self, input_string):

def on_expression_entered(self, expression):
self.debugger.run_result_command(DebuggerModel.COMMAND_GET_EXPRESSION, expression, expression)
ViewHelper.move_to_front(self.window, self.debug_views[DebuggerModel.DATA_IMMIDIATE])
ViewHelper.move_to_front(self.window, self.debug_views[DebuggerModel.DATA_IMMEDIATE])

def on_watch_entered(self, expression):
self.debugger_model.add_watch(expression)
Expand Down
8 changes: 4 additions & 4 deletions debugger/interfaces/debugger_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class DebuggerModel(object):

# Debugging data types
DATA_WATCH = "Watch"
DATA_IMMIDIATE = "Immidiate"
DATA_IMMEDIATE = "Immediate"
DATA_OUTPUT = "Output"
DATA_BREAKPOINTS = "Breakpoints"
DATA_LOCALS = "Locals"
Expand Down Expand Up @@ -48,7 +48,7 @@ class DebuggerModel(object):

REFRESHABLE_COMMANDS = [COMMAND_GET_THREADS, COMMAND_GET_STACKTRACE, COMMAND_GET_LOCALS, COMMAND_GET_BREAKPOINTS]

APPENDABLE_DATA = [DATA_IMMIDIATE, DATA_OUTPUT]
APPENDABLE_DATA = [DATA_IMMEDIATE, DATA_OUTPUT]

STARTERS_COMMANDS = [COMMAND_DEBUG_LAYOUT, COMMAND_RESET_LAYOUT, COMMAND_START_RAILS, COMMAND_START, COMMAND_START_CURRENT_FILE]
COMMANDS = [COMMAND_DEBUG_LAYOUT, COMMAND_RESET_LAYOUT, COMMAND_START_RAILS, COMMAND_INTERRUPT, COMMAND_START_CURRENT_FILE, COMMAND_GO_TO, COMMAND_ADD_WATCH, COMMAND_GET_WATCH, COMMAND_START, COMMAND_STOP, COMMAND_SEND_INPUT, COMMAND_STEP_OVER, COMMAND_STEP_INTO, COMMAND_STEP_UP, COMMAND_STEP_DOWN, COMMAND_CONTINUTE, COMMAND_JUMP, COMMAND_GET_LOCATION, COMMAND_GET_STACKTRACE, COMMAND_GET_LOCALS, COMMAND_GET_THREADS, COMMAND_GET_EXPRESSION, COMMAND_GET_BREAKPOINTS, COMMAND_SET_BREAKPOINT, COMMAND_CLEAR_BREAKPOINTS]
Expand All @@ -60,7 +60,7 @@ def __init__(self, debugger):
self.debugger = debugger
self.data = {}
self.data[DebuggerModel.DATA_WATCH] = []
self.data[DebuggerModel.DATA_IMMIDIATE] = ""
self.data[DebuggerModel.DATA_IMMEDIATE] = ""
self.data[DebuggerModel.DATA_OUTPUT] = ""
self.data[DebuggerModel.DATA_BREAKPOINTS] = ""
self.data[DebuggerModel.DATA_LOCALS] = ""
Expand Down Expand Up @@ -100,7 +100,7 @@ def update_data(self, data_type, new_value):
if data_type == DebuggerModel.DATA_WATCH:
self.update_watch_expression(new_value[0], new_value[1])
return self.watch_to_str(), line_to_show, should_append
elif data_type == DebuggerModel.DATA_IMMIDIATE:
elif data_type == DebuggerModel.DATA_IMMEDIATE:
self.data[data_type] += new_value[0]+" => "+ new_value[1] + '\n'
self.referesh_data()
elif data_type in DebuggerModel.APPENDABLE_DATA:
Expand Down
4 changes: 2 additions & 2 deletions debugger/ruby_imp/ruby_debugger.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ class RubyDebugger(Debugger):
DebuggerModel.COMMAND_GET_STACKTRACE:RubyDebugCommand("where", DebuggerModel.DATA_STACK, True),
DebuggerModel.COMMAND_GET_LOCALS:RubyDebugCommand("info local", DebuggerModel.DATA_LOCALS, True),
DebuggerModel.COMMAND_GET_THREADS:RubyDebugCommand("thread l", DebuggerModel.DATA_THREADS, True),
DebuggerModel.COMMAND_GET_EXPRESSION:RubyDebugCommand("eval", DebuggerModel.DATA_IMMIDIATE, True),
DebuggerModel.COMMAND_GET_EXPRESSION:RubyDebugCommand("eval", DebuggerModel.DATA_IMMEDIATE, True),
DebuggerModel.COMMAND_GET_BREAKPOINTS:RubyDebugCommand("info break", DebuggerModel.DATA_BREAKPOINTS, True),

DebuggerModel.COMMAND_SEND_INPUT:RubyCustomDebugCommand(lambda debugger_constroller, *args: debugger_constroller.send_input(*args)),
DebuggerModel.COMMAND_START:RubyCustomDebugCommand(lambda debugger_constroller, *args: debugger_constroller.start(*args)),
DebuggerModel.COMMAND_STOP:RubyCustomDebugCommand(lambda debugger_constroller, *args: debugger_constroller.stop()),

DebuggerModel.COMMAND_GET_WATCH:RubyCustomDebugCommand(lambda debugger_constroller, prefix, expression: debugger_constroller.send_with_result("eval " + expression, DebuggerModel.DATA_WATCH, prefix)),
DebuggerModel.COMMAND_GET_EXPRESSION:RubyCustomDebugCommand(lambda debugger_constroller, prefix, expression: debugger_constroller.send_with_result("eval " + expression, DebuggerModel.DATA_IMMIDIATE, prefix)),
DebuggerModel.COMMAND_GET_EXPRESSION:RubyCustomDebugCommand(lambda debugger_constroller, prefix, expression: debugger_constroller.send_with_result("eval " + expression, DebuggerModel.DATA_IMMEDIATE, prefix)),

DebuggerModel.COMMAND_SET_BREAKPOINT:RubyCustomDebugCommand(lambda debugger_constroller, location: debugger_constroller.send_control_command("b " + location)),
DebuggerModel.COMMAND_CLEAR_BREAKPOINTS:RubyCustomDebugCommand(lambda debugger_constroller: debugger_constroller.send_control_command("delete")),
Expand Down

0 comments on commit 959412e

Please sign in to comment.