[psc-ide] Return qualifier from explicit/hiding imports (purescript#2317)

nwolverson · paf31 · commit a84f7f36ee32 · 2016-09-22T21:21:24.000-07:00
diff --git a/psc-ide-server/PROTOCOL.md b/psc-ide-server/PROTOCOL.md
@@ -68,7 +68,7 @@ The `complete` command looks up possible completions/corrections.
 
   If no matcher is given every candidate, that passes the filters, is returned
   in no particular order.
-  
+
 ```json
 {
   "command": "complete",
@@ -106,7 +106,7 @@ couldn't be extracted from a source file.
 ```
 
 
-### CaseSplit 
+### CaseSplit
 
 The CaseSplit command takes a line of source code, an area in that line of code
 and replaces it with all patterns for a given type. The parameter `annotations`
@@ -250,9 +250,9 @@ Example:
     "importCommand": {
       "importCommand": "addImport",
       "identifier": "bind"
-    } 
+    }
   }
-} 
+}
 ```
 
 ### Rebuild
@@ -381,7 +381,7 @@ The list commmand can also list the imports for a given file.
 
 The list import command returns a list of imports where imports are of the following form:
 
-Implicit Import(`import Data.Array`):
+Implicit Import (`import Data.Array`):
 ```json
 [
   {
@@ -391,7 +391,7 @@ Implicit Import(`import Data.Array`):
 ]
 ```
 
-Implicit qualified Import(`import qualified Data.Array as A`):
+Implicit qualified Import (`import Data.Array as A`):
 ```json
 [
   {
@@ -402,7 +402,7 @@ Implicit qualified Import(`import qualified Data.Array as A`):
 ]
 ```
 
-Explicit Import(`import Data.Array (filter, filterM, join)`):
+Explicit Import (`import Data.Array (filter, filterM, join)`):
 ```json
 [
   {
@@ -413,7 +413,19 @@ Explicit Import(`import Data.Array (filter, filterM, join)`):
 ]
 ```
 
-Hiding Import(`import Data.Array hiding (filter, filterM, join)`):
+Explicit qualified Import (`import Data.Array (filter, filterM, join) as A`):
+```json
+[
+  {
+  "module": "Data.Array",
+  "importType": "explicit",
+  "identifiers": ["filter", "filterM", "join"],
+  "qualifier": "A"
+  }
+]
+```
+
+Hiding Import (`import Data.Array hiding (filter, filterM, join)`):
 ```json
 [
   {
@@ -423,6 +435,19 @@ Hiding Import(`import Data.Array hiding (filter, filterM, join)`):
   }
 ]
 ```
+
+Qualified Hiding Import (`import Data.Array hiding (filter, filterM, join) as A`):
+```json
+[
+  {
+  "module": "Data.Array",
+  "importType": "hiding",
+  "identifiers": ["filter", "filterM", "join"],
+  "qualifier": "A"
+  }
+]
+```
+
 ### Cwd/Quit/Reset
 `cwd` returns the working directory of the server(should be your project root).
 
diff --git a/src/Language/PureScript/Ide/Types.hs b/src/Language/PureScript/Ide/Types.hs
@@ -21,7 +21,7 @@ import           Protolude
 
 import           Control.Concurrent.STM
 import           Data.Aeson
-import           Data.Map.Lazy                        as M
+import qualified Data.Map.Lazy                        as M
 import qualified Language.PureScript.Errors.JSON      as P
 import qualified Language.PureScript as P
 import           Language.PureScript.Ide.Conversions
@@ -146,17 +146,17 @@ instance ToJSON ModuleImport where
   toJSON (ModuleImport mn P.Implicit qualifier) =
     object $ [ "module" .= mn
              , "importType" .= ("implicit" :: Text)
-             ] ++ fmap (\x -> "qualifier" .= x) (maybeToList qualifier)
-  toJSON (ModuleImport mn (P.Explicit refs) _) =
-    object [ "module" .= mn
-           , "importType" .= ("explicit" :: Text)
-           , "identifiers" .= (identifierFromDeclarationRef <$> refs)
-           ]
-  toJSON (ModuleImport mn (P.Hiding refs) _) =
-    object [ "module" .= mn
-           , "importType" .= ("hiding" :: Text)
-           , "identifiers" .= (identifierFromDeclarationRef <$> refs)
-           ]
+             ] ++ map (\x -> "qualifier" .= x) (maybeToList qualifier)
+  toJSON (ModuleImport mn (P.Explicit refs) qualifier) =
+    object $ [ "module" .= mn
+             , "importType" .= ("explicit" :: Text)
+             , "identifiers" .= (identifierFromDeclarationRef <$> refs)
+             ] ++ map (\x -> "qualifier" .= x) (maybeToList qualifier)
+  toJSON (ModuleImport mn (P.Hiding refs) qualifier) =
+    object $ [ "module" .= mn
+             , "importType" .= ("hiding" :: Text)
+             , "identifiers" .= (identifierFromDeclarationRef <$> refs)
+             ] ++ map (\x -> "qualifier" .= x) (maybeToList qualifier)
 
 identifierFromDeclarationRef :: P.DeclarationRef -> Text
 identifierFromDeclarationRef (P.TypeRef name _) = runProperNameT name
