minor runtime and styling fixes

lloiser · Apr 17, 2018 · d01a91d · d01a91d
1 parent 99c8535
commit d01a91d
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 29 deletions.
diff --git a/lib/debugger.js b/lib/debugger.js
@@ -114,11 +114,9 @@ export default class Debugger {
     bp = getBreakpoint(this._store, file, line)
 
     const fileAndLine = location(bp)
-    this._addOutputMessage(`Adding breakpoint @ ${fileAndLine}\n`)
 
     return this._addBreakpoint(bp)
       .then(({ id }) => {
-        this._addOutputMessage(`Added breakpoint @ ${fileAndLine}\n`)
         this._store.dispatch({ type: 'EDIT_BREAKPOINT', bp: { name: bp.name, id, state: 'valid' } })
       })
       .catch((err) => {
@@ -150,12 +148,10 @@ export default class Debugger {
     }
 
     const fileAndLine = location(bp)
-    this._addOutputMessage(`Removing breakpoint @ ${fileAndLine}\n`)
 
     this._store.dispatch({ type: 'EDIT_BREAKPOINT', bp: { name, state: 'busy' } })
 
     return this._removeBreakpoint(bp)
-      .then(() => this._addOutputMessage(`Removed breakpoint @ ${fileAndLine}\n`))
       .then(done)
       .catch((err) => {
         this._addOutputMessage(`Removing breakpoint @ ${fileAndLine} failed!\r\n  Error: ${err}\n`)
@@ -258,6 +254,10 @@ export default class Debugger {
       return Promise.resolve()
     }
 
+    if (fn !== 'halt' && this.isBusy()) {
+      return Promise.resolve()
+    }
+
     // clear the existing stacktrace and goroutines if the next delve
     // request takes too long.
     const id = setTimeout(() => {
@@ -266,10 +266,19 @@ export default class Debugger {
     }, 500)
 
     return this._updateState(
-      () => this._session[fn](),
+      () => this._session[fn]().catch((err) => {
+        this._addOutputMessage(`Failed to ${fn}!\r\n  Error: ${err}\n`)
+        return null
+      }),
       'running'
     ).then((newState) => {
       clearTimeout(id)
+      if (!newState) {
+        return
+      }
+      if (newState.error) {
+        this._addOutputMessage(`Failed to ${fn}!\r\n  Error: ${newState.error}\n`)
+      }
       if (newState.exited) {
         return this.stop()
       }

diff --git a/lib/delve-configuration.js b/lib/delve-configuration.js
@@ -47,7 +47,8 @@ export default class DelveConfiguration {
         file: '',
         configs: [
           { name: 'Debug', mode: 'debug' },
-          { name: 'Test', mode: 'test' }
+          { name: 'Test', mode: 'test' },
+          { name: 'Attach', mode: 'attach' }
         ]
       }
     ]

diff --git a/lib/delve-session.js b/lib/delve-session.js
@@ -116,20 +116,33 @@ export default class DelveSession {
       // stopping a running program which is not halted at the moment
       // (so waiting for further debug commands like 'continue' or 'step')
       // ends up here too, so simply return that it already has stopped
-      const exited = this._stopPromise ? true : !!State.exited
-      let goroutineID = -1
-      if (!exited) {
-        goroutineID = State.currentGoroutine ? State.currentGoroutine.id : -1
-        if (goroutineID === -1) {
-          goroutineID = State.currentThread ? State.currentThread.goroutineID : -1
-        }
-      }
-      return {
-        exited,
-        goroutineID
-      }
+      return this._stateToDebuggerState(State)
+    }).catch((err) => {
+      return this.getState().then(state => {
+        state.error = err
+        return state
+      })
+    })
+  }
+  getState () {
+    return this._call('State', {}).then(({ State }) => {
+      return this._stateToDebuggerState(State)
     })
   }
+  _stateToDebuggerState (state, error) {
+    const exited = this._stopPromise ? true : !!state.exited
+    let goroutineID = -1
+    if (!exited) {
+      goroutineID = (state.currentGoroutine && state.currentGoroutine.id) || -1
+      if (goroutineID === -1) {
+        goroutineID = (state.currentThread && state.currentThread.goroutineID) || -1
+      }
+    }
+    return {
+      exited,
+      goroutineID
+    }
+  }
 
    // restart the delve session
   restart () {
@@ -141,6 +154,10 @@ export default class DelveSession {
     return Promise.resolve()
   }
   getStacktrace ({ goroutineID }) {
+    if (goroutineID === -1) {
+      return Promise.resolve([])
+    }
+
     const args = {
       id: goroutineID,
       depth: 20
@@ -167,12 +184,13 @@ export default class DelveSession {
       .then(this._prepareGoroutines.bind(this))
   }
   _prepareGoroutines ({ Goroutines: goroutines }) {
-    return goroutines.map(({ id, userCurrentLoc }) => {
+    return goroutines.map(({ id, userCurrentLoc, goStatementLoc }) => {
+      const loc = userCurrentLoc.file ? userCurrentLoc : goStatementLoc
       return {
         id,
-        file: userCurrentLoc.file,
-        line: userCurrentLoc.line - 1, // dlv = 1 indexed line / atom = 0 indexed line
-        func: userCurrentLoc.function.name.split('/').pop()
+        file: loc.file,
+        line: loc.line - 1, // dlv = 1 indexed line / atom = 0 indexed line
+        func: loc.function.name.split('/').pop()
       }
     })
   }

diff --git a/lib/delve-variables.js b/lib/delve-variables.js
@@ -22,7 +22,7 @@ export function create (rawVariables) {
   }
 
   rawVariables.forEach((variable) => {
-    const v = factory.variable(variable)
+    const v = factory.variable(variable, true)
     v.path = v.name = variable.name
     addVariable('', v)
   })
@@ -48,13 +48,13 @@ function pathJoin (...items) {
 }
 
 const factory = {
-  variable (variable) {
+  variable (variable, top) {
     let kind = KINDS[variable.kind]
     if (variable.unreadable !== '') {
       return { value: `(unreadable ${variable.unreadable})`, kind }
     }
 
-    if (!variable.value && variable.addr === 0) {
+    if (!variable.value && variable.addr === 0 && !top) {
       return { value: [shortType(variable.type), nil()], kind }
     }
 

diff --git a/lib/store.js b/lib/store.js
@@ -27,7 +27,7 @@ function stacktrace (state = [], action) {
     case 'UPDATE_STACKTRACE':
       // attempt to copy the variables over to the new stacktrace
       return action.stacktrace.map((stack) => {
-        const existingStack = state.find((st) => st.id === stack.id)
+        const existingStack = state.find((st, i) => i > 0 && st.id === stack.id)
         if (!stack.variables && existingStack) {
           stack.variables = existingStack.variables
         }

diff --git a/styles/go-debug.less b/styles/go-debug.less
@@ -50,7 +50,6 @@ atom-text-editor {
   flex-direction: column;
   flex: 1;
   position: relative;
-  background-color: @base-background-color;
 }
 
 .go-debug-panel-resizer {
@@ -76,7 +75,7 @@ atom-text-editor {
   }
 
   select {
-    background: @base-background-color;
+    background: @tool-panel-background-color;
     flex: 1;
     border: 0;
     cursor: pointer;
@@ -235,7 +234,6 @@ atom-text-editor {
 
 .go-debug-expandable-header.panel-heading {
   padding: @component-padding / 2;
-  background-color: @tool-panel-background-color;
   border-bottom: 1px solid @base-border-color;
   cursor: pointer;
   font-size: inherit;