Merge branch 'master' of github.com:idris-hackers/atom-language-idris

idris-hackers · Jun 3, 2016 · 10e7022 · 10e7022
2 parents 9526baa + 7dec2aa
commit 10e7022
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/lib/idris-controller.coffee b/lib/idris-controller.coffee
@@ -114,6 +114,7 @@ class IdrisController
 
   getDocsForWord: ({ target }) =>
     word = Symbol.serializeWord @getWordUnderCursor(target)
+    uri = target.model.getURI()
 
     successHandler = ({ responseType, msg }) =>
       [type, highlightingInfo] = msg
@@ -128,7 +129,10 @@ class IdrisController
       @messages.add informationView
 
     @model
-      .docsFor word
+      .load uri
+      .filter ({ responseType }) -> responseType == 'return'
+      .flatMap => @model.docsFor word
+      .catch (e) => @model.docsFor word
       .subscribe successHandler, @displayErrors
 
   getTypeForWord: ({ target }) =>
@@ -348,6 +352,7 @@ class IdrisController
 
   printDefinition: ({ target }) =>
     word = Symbol.serializeWord @getWordUnderCursor(target)
+    uri = target.model.getURI()
 
     successHandler = ({ responseType, msg }) =>
       [type, highlightingInfo] = msg
@@ -362,7 +367,10 @@ class IdrisController
       @messages.add informationView
 
     @model
-      .printDefinition word
+      .load uri
+      .filter ({ responseType }) -> responseType == 'return'
+      .flatMap => @model.printDefinition word
+      .catch (e) => @model.printDefinition word
       .subscribe successHandler, @displayErrors
 
   openREPL: ({ target }) =>

diff --git a/lib/idris-model.coffee b/lib/idris-model.coffee
@@ -13,7 +13,11 @@ class IdrisModel
   oldCompilerOptions: { }
 
   ideMode: (compilerOptions) ->
-    if !@ideModeRef || !JS.objectEqual(@oldCompilerOptions, compilerOptions)
+    if @ideModeRef && !JS.objectEqual(@oldCompilerOptions, compilerOptions)
+      @ideModeRef.process.removeAllListeners()
+      @ideModeRef.stop()
+      @ideModeRef = null
+    if !@ideModeRef
       @ideModeRef = new IdrisIdeMode
       @ideModeRef.on 'message', @handleCommand
       @ideModeRef.start compilerOptions