Skip to content

Commit 32514de

Browse files
authored
Merge pull request #26 from garyb/bump
Update dependencies for new Aff
2 parents 691982f + f6674b0 commit 32514de

File tree

4 files changed

+20
-22
lines changed

4 files changed

+20
-22
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ node_modules/
77
output/
88
example/example.js
99
example/.*
10+
package-lock.json

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
],
2929
"dependencies": {
3030
"purescript-ace": "^4.0.0",
31-
"purescript-halogen": "^2.0.0",
31+
"purescript-halogen": "^3.1.1",
3232
"purescript-now": "^3.0.0",
3333
"purescript-random": "^3.0.0",
3434
"purescript-refs": "^3.0.0"

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"example": "bower link && cd example && bower link purescript-ace-halogen && npm run -s build"
77
},
88
"devDependencies": {
9-
"eslint": "^3.19.0",
10-
"pulp": "^11.0.0",
11-
"purescript": "^0.11.4",
12-
"purescript-psa": "^0.5.1",
13-
"rimraf": "^2.6.1"
9+
"eslint": "^4.16.0",
10+
"pulp": "^12.0.1",
11+
"purescript": "^0.11.7",
12+
"purescript-psa": "^0.6.0",
13+
"rimraf": "^2.6.2"
1414
}
1515
}

src/Ace/Halogen/Component.purs

+13-16
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,28 @@ module Ace.Halogen.Component
99

1010
import Prelude
1111

12+
import Ace as Ace
13+
import Ace.EditSession as Session
14+
import Ace.Editor as Editor
15+
import Ace.Ext.LanguageTools as LanguageTools
16+
import Ace.Ext.LanguageTools.Completer as Completer
17+
import Ace.Types (Editor, Completion, Position, EditSession, ACE)
1218
import Control.Monad.Aff (Aff, runAff)
1319
import Control.Monad.Aff.AVar (AVAR)
14-
import Control.Monad.Eff (Eff)
1520
import Control.Monad.Aff.Class (class MonadAff)
21+
import Control.Monad.Eff (Eff)
1622
import Control.Monad.Eff.Now (NOW, now)
1723
import Control.Monad.Eff.Random (random, RANDOM)
1824
import Control.Monad.Eff.Ref (Ref, REF, readRef, writeRef, modifyRef)
19-
25+
import DOM (DOM)
26+
import DOM.HTML.Types (HTMLElement)
2027
import Data.DateTime.Instant (unInstant)
28+
import Data.Either (either)
2129
import Data.Foldable (traverse_)
2230
import Data.Maybe (Maybe(..), maybe)
2331
import Data.Newtype (unwrap)
2432
import Data.StrMap (StrMap)
2533
import Data.StrMap as Sm
26-
27-
import Ace as Ace
28-
import Ace.Editor as Editor
29-
import Ace.EditSession as Session
30-
import Ace.Ext.LanguageTools as LanguageTools
31-
import Ace.Ext.LanguageTools.Completer as Completer
32-
import Ace.Types (Editor, Completion, Position, EditSession, ACE)
33-
34-
import DOM (DOM)
35-
import DOM.HTML.Types (HTMLElement)
36-
3734
import Halogen as H
3835
import Halogen.HTML as HH
3936
import Halogen.HTML.Properties as HP
@@ -91,9 +88,9 @@ enableAutocomplete = do
9188
where
9289
globalCompleteFn editor session position prefix cb = do
9390
fn ← completeFnFocused
94-
void $
95-
runAff (const $ cb Nothing) (cb <<< Just) $
96-
fn editor session position prefix
91+
void
92+
$ runAff (either (const (pure unit)) (cb <<< Just))
93+
$ fn editor session position prefix
9794

9895
-- | Generate unique key for component
9996
genKey eff. Eff (now NOW, random RANDOM | eff) String

0 commit comments

Comments
 (0)