Merge pull request #12 from nwolverson/nate-add-qualified-imp

add qualified import, fix versions

Author: nwolverson

.gitignore

@@ -2,5 +2,5 @@
 /node_modules/
 /.pulp-cache/
 /output/
-/.psci*
+/.psc*
 /src/.webpack.js

bower.json

@@ -13,11 +13,13 @@
     "purescript-console": "^3.0.0",
     "purescript-maybe": "^3.0.0",
     "purescript-either": "^3.0.0",
+    "purescript-errors": "^3.0.0",
     "purescript-arrays": "^4.0.1",
     "purescript-aff": "^3.0.0",
+    "purescript-affjax": "^4.0.0",
     "purescript-argonaut": "^3.0.0",
     "purescript-strings": "^3.0.0",
-    "purescript-psc-ide": "^10.0.0",
+    "purescript-psc-ide": "^10.1.0",
     "purescript-refs": "^3.0.0",
     "purescript-nullable": "^3.0.0",
     "purescript-node-fs": "^4.0.0",

src/IdePurescript/Modules.purs

@@ -11,6 +11,7 @@ module IdePurescript.Modules (
   , findImportInsertPos
   , addModuleImport
   , addExplicitImport
+  , addQualifiedImport
   , ImportResult(..)
   ) where
 
@@ -197,3 +198,13 @@ addExplicitImport state port fileName text moduleName qualifier identifier =
     shouldAddMatch mn (Module { moduleName: moduleName', qualifier: Nothing, importType: Hiding idents })
       | moduleName' == mn = identifier `elem` idents
     shouldAddMatch _ _ = true
+
+addQualifiedImport :: forall eff. State -> Int -> String -> String -> String -> String
+  -> Aff (net :: P.NET, fs :: FS | eff) { state :: State, result :: ImportResult }
+addQualifiedImport state port fileName text moduleName qualifier =
+  if not isThisModule
+    then { state, result: _ } <$> withTempFile fileName text addImport
+    else pure { state, result: FailedImport }
+  where
+    addImport tmpFile = P.qualifiedImport port tmpFile (Just tmpFile) moduleName qualifier
+    isThisModule = Just moduleName == state.main

src/IdePurescript/PscIde.purs

@@ -10,7 +10,7 @@ import Control.Monad.Aff (Aff)
 import Control.Monad.Error.Class (throwError)
 import Data.Argonaut.Decode (class DecodeJson, decodeJson)
 import Data.Argonaut.Decode.Combinators ((.?))
-import Data.Array (head)
+import Data.Array (head, null)
 import Data.Either (Either(Right, Left))
 import Data.Maybe (maybe, Maybe(..))
 import Data.Nullable (toNullable, Nullable)
@@ -87,7 +87,8 @@ getCompletion' :: forall eff. Maybe C.Matcher -> Array C.Filter -> Int -> Maybe
 getCompletion' matcher mainFilter port currentModule modulePrefix unqualModules getQualifiedModule opts =
   eitherToErr $ P.complete port (mainFilter <> moduleFilters) matcher currentModule opts
   where
-  moduleFilters = [ C.ModuleFilter $ maybe unqualModules getQualifiedModule modulePrefix ]
+  modules = maybe unqualModules getQualifiedModule modulePrefix
+  moduleFilters = [ C.ModuleFilter $ if null modules then unqualModules else modules ]
 
 loadDeps :: forall eff. Int -> String
   -> Aff (net :: P.NET | eff) String