Merge pull request #26 from garyb/bump

Update dependencies for new Aff

.gitignore

@@ -7,3 +7,4 @@ node_modules/
 output/
 example/example.js
 example/.*
+package-lock.json

bower.json

@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "purescript-ace": "^4.0.0",
-    "purescript-halogen": "^2.0.0",
+    "purescript-halogen": "^3.1.1",
     "purescript-now": "^3.0.0",
     "purescript-random": "^3.0.0",
     "purescript-refs": "^3.0.0"

package.json

@@ -6,10 +6,10 @@
     "example": "bower link && cd example && bower link purescript-ace-halogen && npm run -s build"
   },
   "devDependencies": {
-    "eslint": "^3.19.0",
-    "pulp": "^11.0.0",
-    "purescript": "^0.11.4",
-    "purescript-psa": "^0.5.1",
-    "rimraf": "^2.6.1"
+    "eslint": "^4.16.0",
+    "pulp": "^12.0.1",
+    "purescript": "^0.11.7",
+    "purescript-psa": "^0.6.0",
+    "rimraf": "^2.6.2"
   }
 }

src/Ace/Halogen/Component.purs

@@ -9,31 +9,28 @@ module Ace.Halogen.Component
 
 import Prelude
 
+import Ace as Ace
+import Ace.EditSession as Session
+import Ace.Editor as Editor
+import Ace.Ext.LanguageTools as LanguageTools
+import Ace.Ext.LanguageTools.Completer as Completer
+import Ace.Types (Editor, Completion, Position, EditSession, ACE)
 import Control.Monad.Aff (Aff, runAff)
 import Control.Monad.Aff.AVar (AVAR)
-import Control.Monad.Eff (Eff)
 import Control.Monad.Aff.Class (class MonadAff)
+import Control.Monad.Eff (Eff)
 import Control.Monad.Eff.Now (NOW, now)
 import Control.Monad.Eff.Random (random, RANDOM)
 import Control.Monad.Eff.Ref (Ref, REF, readRef, writeRef, modifyRef)
-
+import DOM (DOM)
+import DOM.HTML.Types (HTMLElement)
 import Data.DateTime.Instant (unInstant)
+import Data.Either (either)
 import Data.Foldable (traverse_)
 import Data.Maybe (Maybe(..), maybe)
 import Data.Newtype (unwrap)
 import Data.StrMap (StrMap)
 import Data.StrMap as Sm
-
-import Ace as Ace
-import Ace.Editor as Editor
-import Ace.EditSession as Session
-import Ace.Ext.LanguageTools as LanguageTools
-import Ace.Ext.LanguageTools.Completer as Completer
-import Ace.Types (Editor, Completion, Position, EditSession, ACE)
-
-import DOM (DOM)
-import DOM.HTML.Types (HTMLElement)
-
 import Halogen as H
 import Halogen.HTML as HH
 import Halogen.HTML.Properties as HP
@@ -91,9 +88,9 @@ enableAutocomplete = do
   where
   globalCompleteFn editor session position prefix cb = do
     fn ← completeFnFocused
-    void $
-      runAff (const $ cb Nothing) (cb <<< Just) $
-        fn editor session position prefix
+    void
+      $ runAff (either (const (pure unit)) (cb <<< Just))
+      $ fn editor session position prefix
 
 -- | Generate unique key for component
 genKey ∷ ∀ eff. Eff (now ∷ NOW, random ∷ RANDOM | eff) String