Merge branch 'master' into decorate-lines

Conflicts:
	lib/main.coffee
	spec/stacktrace-spec.coffee

Author: smashwilson

README.md

@@ -21,12 +21,12 @@ like to see in place before I mark it 1.0.
 
 - [x] Accept stacktraces pasted into a dialog you call up from the command
   palette.
-- [ ] Present a view that gives you bits of context around each frame of a
-  specific stack. *(...)*
+- [x] Present a view that gives you bits of context around each frame of a
+  specific stack.
 - [x] Pluggable stacktrace recognition and parsing code.
 - [ ] Map parsed frames to source files on the local filesystem.
-- [ ] While a stacktrace is active, highlight individual lines from the trace
+- [x] While a stacktrace is active, highlight individual lines from the trace
   in open editors.
 - [ ] Provide commands for next-frame, previous-frame, and turning it off.
-- [ ] Show a stacktrace navigation view as a bottom panel with next, previous
+- [x] Show a stacktrace navigation view as a bottom panel with next, previous
   and stop buttons.

lib/editor-decorator.coffee

@@ -0,0 +1,20 @@
+# Decorate any lines within an {Editor} that correspond to an active {Stacktrace}.
+
+{Stacktrace} = require './stacktrace'
+
+markers = []
+
+module.exports = (editor) ->
+  m.destroy() for m in markers
+  markers = []
+
+  active = Stacktrace.getActivated()
+  return unless active?
+
+  for frame in active.frames
+    if frame.realPath is editor.getPath()
+      range = editor.getBuffer().rangeForRow frame.bufferLineNumber()
+      marker = editor.markBufferRange range
+      editor.decorateMarker marker, type: 'line', class: 'line-stackframe'
+      editor.decorateMarker marker, type: 'gutter', class: 'gutter-stackframe'
+      markers.push marker

lib/main.coffee

@@ -1,6 +1,8 @@
 EnterDialog = require './enter-dialog'
 {Stacktrace} = require './stacktrace'
 {StacktraceView} = require './stacktrace-view'
+{NavigationView} = require './navigation-view'
+editorDecorator = require './editor-decorator'
 
 module.exports =
 
@@ -13,12 +15,22 @@ module.exports =
       text = (s.getText() for s in (selections or [])).join ''
       atom.emit 'stacktrace:accept-trace', trace: text
 
+    atom.workspace.eachEditor editorDecorator
+    @activeChanged = Stacktrace.on 'active-changed', ->
+      editorDecorator(e) for e in atom.workspace.getEditors()
+
+    @navigationView = new NavigationView
+    atom.workspaceView.appendToBottom @navigationView
+
     StacktraceView.registerIn(atom.workspace)
 
-    atom.on 'stacktrace:accept-trace', ({trace}) =>
+    @acceptTrace = atom.on 'stacktrace:accept-trace', ({trace}) =>
       for trace in Stacktrace.parse(trace)
         trace.register()
         atom.workspace.open trace.getUrl()
 
   deactivate: ->
-    atom.off 'stacktrace:accept-trace'
+    @navigationView.remove()
+
+    @activeChanged.off()
+    @acceptTrace.off()

lib/navigation-view.coffee

@@ -0,0 +1,114 @@
+{View} = require 'atom'
+{Subscriber} = require 'emissary'
+{Stacktrace} = require './stacktrace'
+
+class NavigationView extends View
+
+  Subscriber.includeInto this
+
+  @content: ->
+    activatedClass = if Stacktrace.getActivated()? then '' else 'inactive'
+
+    @div class: "tool-panel panel-bottom padded stacktrace navigation #{activatedClass}", =>
+      @div class: 'inline-block trace-name', =>
+        @h2 class: 'inline-block text-highlight message', outlet: 'message', click: 'backToTrace'
+        @span class: 'inline-block icon icon-x', click: 'deactivateTrace'
+      @div class: 'inline-block current-frame unfocused', outlet: 'frameContainer', =>
+        @span class: 'inline-block icon icon-code'
+        @span class: 'inline-block function', outlet: 'frameFunction', click: 'navigateToLastActive'
+        @span class: 'inline-block index', outlet: 'frameIndex'
+        @span class: 'inline-block divider', '/'
+        @span class: 'inline-block total', outlet: 'frameTotal'
+      @div class: 'pull-right controls', =>
+        @button class: 'inline-block btn', click: 'navigateToCaller', =>
+          @span class: 'icon icon-arrow-up'
+          @text 'Caller'
+        @button class: 'inline-block btn', click: 'navigateToCalled', =>
+          @span class: 'icon icon-arrow-down'
+          @text 'Follow Call'
+
+  initialize: ->
+    @subscribe Stacktrace, 'active-changed', (e) =>
+      if e.newTrace? then @useTrace(e.newTrace) else @noTrace()
+
+    # Subscribe to opening editors. Set the current frame when a cursor is moved over a frame's
+    # line.
+    atom.workspace.eachEditor (e) =>
+      @subscribe e, 'cursors-moved', =>
+        if @trace?
+          pos =
+            position: e.getCursorBufferPosition()
+            path: e.getPath()
+
+          # Allow the already-set @frame a chance to see if it still applies.
+          # This lets the caller and called navigation work properly, even if multiple frames are
+          # on the same line.
+          if @frame? and @frame.isOn(pos)
+            @useFrame(@frame)
+          else
+            # Otherwise, scan the trace for a matching frame.
+            frame = @trace.atEditorPosition(pos)
+            if frame? then @useFrame(frame) else @unfocusFrame()
+
+    if Stacktrace.getActivated? then @hide()
+
+  beforeRemove: ->
+    @unsubscribe Stacktrace
+
+  useTrace: (@trace) ->
+    @removeClass 'inactive'
+    @message.text(trace.message)
+    @noFrame()
+    @show()
+
+  noTrace: ->
+    @addClass 'inactive'
+    @message.text('')
+    @noFrame()
+    @hide()
+
+  useFrame: (@frame) ->
+    @frameContainer.removeClass 'unfocused'
+    @frameFunction.text @frame.functionName
+    @frameFunction.addClass 'highlight-info'
+    @frameIndex.text @frame.humanIndex().toString()
+    @frameTotal.text @trace.frames.length.toString()
+
+  unfocusFrame: ->
+    @frameContainer.addClass 'unfocused'
+    @frameFunction.removeClass 'highlight-info'
+
+  noFrame: ->
+    @unfocusFrame()
+    @frameFunction.text ''
+    @frameIndex.text ''
+    @frameTotal.text ''
+
+  deactivateTrace: ->
+    Stacktrace.getActivated().deactivate()
+
+  backToTrace: ->
+    url = Stacktrace.getActivated()?.getUrl()
+    atom.workspace.open(url) if url
+
+  navigateToCaller: ->
+    return unless @trace? and @frame?
+
+    f = @trace.callerOf(@frame)
+    if f?
+      @frame = f
+      @frame.navigateTo()
+
+  navigateToCalled: ->
+    return unless @trace? and @frame?
+
+    f = @trace.calledFrom(@frame)
+    if f?
+      @frame = f
+      @frame.navigateTo()
+
+  navigateToLastActive: ->
+    return unless @frame?
+    @frame.navigateTo()
+
+module.exports = NavigationView: NavigationView

lib/stacktrace-view.coffee

@@ -12,17 +12,12 @@ class StacktraceView extends View
     @div class: "stacktrace traceview tool-panel padded #{tclass}", =>
       @div class: 'panel padded', =>
         @h2 class: 'error-message', trace.message
-        @p class: 'activate-control', =>
-          @button class: 'btn btn-primary selected inline-block', click: 'activate', 'Activate'
-          @span class: 'inline-block', 'to navigate around this stacktrace.'
-        @p class: 'deactivate-control', =>
-          @button class: 'btn btn-primary inline-block', click: 'deactivate', 'Deactivate'
-          @span class: 'inline-block', 'to close the stacktrace navigation panel.'
       @div class: 'frames', =>
         for frame in trace.frames
           @subview 'frame', new FrameView frame, => trace.activate()
 
   initialize: (@trace) ->
+    @uri = @trace.getUrl()
     @subscribe Stacktrace, 'active-changed', (e) =>
       if e.newTrace is @trace
         @addClass 'activated'
@@ -37,14 +32,6 @@ class StacktraceView extends View
   getTitle: ->
     @trace.message
 
-  # Public: Activate the current {Stacktrace}.
-  #
-  activate: -> @trace.activate()
-
-  # Public: Deactivate the current {Stacktrace}.
-  #
-  deactivate: -> @trace.deactivate()
-
   # Internal: Register an opener function in the workspace to handle URLs
   # generated by a Stacktrace.
   #

lib/stacktrace.coffee

@@ -19,6 +19,10 @@ class Stacktrace
   Emitter.extend this
 
   constructor: (@frames = [], @message = '') ->
+    i = 0
+    for f in @frames
+      f.index = i
+      i += 1
 
   # Internal: Compute the SHA256 checksum of the normalized stacktrace.
   #
@@ -64,6 +68,32 @@ class Stacktrace
       ACTIVE = null
       Stacktrace.emit 'active-changed', oldTrace: this, newTrace: null
 
+  # Public: Return the Frame corresponding to an Editor position, if any, along with its position
+  # within the trace.
+  #
+  # object - "position" should be a Point corresponding to a cursor position, and "path" the full
+  #          path of an Editor.
+  #
+  atEditorPosition: (editorPosition) ->
+    [index, total] = [1, @frames.length]
+    for frame in @frames
+      return frame if frame.isOn editorPosition
+      index += 1
+    return null
+
+  # Public: Return the Frame that called the given Frame, or undefined if given the top of the stack.
+  #
+  # frame - The current Frame to use as a reference point.
+  #
+  callerOf: (frame) -> @frames[frame.index + 1]
+
+  # Public: Return the Frame that a given Frame called into, or undefined if given the bottom of the
+  # stack.
+  #
+  # frame - The current Frame to use as a reference point.
+  #
+  calledFrom: (frame) -> @frames[frame.index - 1]
+
   # Public: Parse zero to many Stacktrace instances from a corpus of text.
   #
   # text - A raw blob of text.
@@ -74,10 +104,12 @@ class Stacktrace
 
   # Internal: Return a registered trace, or null if none match the provided
   # URL.
+  #
   @forUrl: (url) ->
     REGISTRY[url]
 
   # Internal: Clear the global trace registry.
+  #
   @clearRegistry: ->
     REGISTRY = {}
 
@@ -90,8 +122,17 @@ class Stacktrace
 class Frame
 
   constructor: (@rawLine, @rawPath, @lineNumber, @functionName) ->
+    @index = null
     @realPath = @rawPath
 
+  # Public: Return the zero-indexed line number.
+  #
+  bufferLineNumber: -> @lineNumber - 1
+
+  # Public: Return the one-based frame index.
+  #
+  humanIndex: -> @index + 1
+
   # Public: Asynchronously collect n lines of context around the specified line number in this
   # frame's source file.
   #
@@ -129,6 +170,11 @@ class Frame
       if editorView?
         editorView.scrollToBufferPosition position, center: true
 
+  # Public: Return true if the buffer position and path correspond to this Frame's line.
+  #
+  isOn: ({position, path}) ->
+    path is @realPath and position.row is @bufferLineNumber()
+
 
 module.exports =
   PREFIX: PREFIX

package.json

@@ -15,6 +15,6 @@
   "dependencies": {
     "emissary": "^1.2.1",
     "jssha": "^1.5.0",
-    "line-chomper": "git+https://github.com/smashwilson/line-chomper.git#optional-trim"
+    "line-chomper": "^0.4.5"
   }
 }

spec/editor-marker-spec.coffee

@@ -0,0 +1,64 @@
+path = require 'path'
+{Editor, WorkspaceView} = require 'atom'
+
+{Stacktrace, Frame} = require '../lib/stacktrace'
+editorDecorator = require '../lib/editor-decorator'
+
+framePath = (fname) -> path.join __dirname, 'fixtures', fname
+
+frames = [
+  new Frame('raw0', framePath('bottom.rb'), 12, 'botfunc')
+  new Frame('raw1', framePath('middle.rb'), 42, 'midfunc')
+  new Frame('raw2', framePath('top.rb'), 37, 'topfunc')
+  new Frame('raw3', framePath('middle.rb'), 5, 'otherfunc')
+]
+trace = new Stacktrace(frames, 'Boom')
+
+describe 'editorDecorator', ->
+  [editor, editorView] = []
+
+  beforeEach ->
+    atom.workspaceView = new WorkspaceView
+
+  afterEach ->
+    Stacktrace.getActivated()?.deactivate()
+
+  withEditorOn = (fname, callback) ->
+    waitsForPromise ->
+      atom.workspace.open(framePath fname)
+
+    runs ->
+      atom.workspaceView.attachToDom()
+      editorView = atom.workspaceView.getActiveView()
+      editor = editorView.getEditor()
+      callback()
+
+  it 'does nothing if there is no active trace', ->
+    expect(Stacktrace.getActivated()).toBeNull()
+
+    withEditorOn 'bottom.rb', ->
+      editorDecorator(editor)
+      expect(editorView.find '.line.line-stackframe').toHaveLength 0
+
+  describe 'with an active trace', ->
+
+    beforeEach -> trace.activate()
+
+    it "does nothing if the file doesn't appear in the active trace", ->
+      withEditorOn 'context.txt', ->
+        editorDecorator(editor)
+        expect(editorView.find '.line.line-stackframe').toHaveLength 0
+
+    it 'decorates stackframe lines in applicable editors', ->
+      withEditorOn 'bottom.rb', ->
+        editorDecorator(editor)
+        decorated = editorView.find '.line.line-stackframe'
+        expect(decorated).toHaveLength 1
+        expect(decorated.text()).toEqual("  puts 'this is the stack line'")
+
+    it 'removes prior decorations when deactivated', ->
+      withEditorOn 'bottom.rb', ->
+        editorDecorator(editor)
+        trace.deactivate()
+        editorDecorator(editor)
+        expect(editorView.find '.line.line-stackframe').toHaveLength 0

spec/fixtures/bottom.rb

@@ -0,0 +1,14 @@
+# This isn't a real Ruby file. It's a test fixture I can reference in other places.
+
+
+
+
+
+
+
+
+def botfunc
+  before = true
+  puts 'this is the stack line'
+  after = false
+end