Filter exported names in psci autocomplete method purescript#238

purerl · Mar 6, 2014 · 973babe · 973babe
1 parent d21440c
commit 973babe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/docgen/Main.hs b/docgen/Main.hs
@@ -58,7 +58,6 @@ renderModules ms = do
   headerLevel 1 "Module Documentation"
   mapM_ renderModule ms
 
--- TODO: filter everything by exports
 renderModule :: P.Module -> Docs
 renderModule (P.Module moduleName ds exps) =
   let exported = filter (isExported exps) ds

diff --git a/examples/passing/ExportExplicit.purs b/examples/passing/ExportExplicit.purs
@@ -6,6 +6,9 @@ module M1 (X(X), Z(..), foo) where
   foo :: Number  
   foo = 0
 
+  bar :: Number
+  bar = 1
+
 module Main where
 
   import M1

diff --git a/psci/Main.hs b/psci/Main.hs
@@ -172,13 +172,18 @@ completion = completeWord Nothing " \t\n\r" findCompletions
     files <- listFiles str
     let matches = filter (isPrefixOf str) (names ms)
     return $ sortBy sorter $ map simpleCompletion matches ++ files
-  getDeclName :: P.Declaration -> Maybe P.Ident
-  getDeclName (P.ValueDeclaration ident _ _ _) = Just ident
-  getDeclName _ = Nothing
+  getDeclName :: Maybe [P.DeclarationRef] -> P.Declaration -> Maybe P.Ident
+  getDeclName Nothing (P.ValueDeclaration ident _ _ _) = Just ident
+  getDeclName (Just exts) (P.ValueDeclaration ident _ _ _) | isExported = Just ident
+    where
+    isExported = flip any exts $ \e -> case e of
+      P.ValueRef ident' -> ident == ident'
+      _ -> False
+  getDeclName _ _ = Nothing
   names :: [P.Module] -> [String]
   names ms = nub [ show qual
-              | P.Module moduleName ds _ <- ms
-              , ident <- mapMaybe getDeclName ds
+              | P.Module moduleName ds exts <- ms
+              , ident <- mapMaybe (getDeclName exts) ds
               , qual <- [ P.Qualified Nothing ident
                         , P.Qualified (Just moduleName) ident]
               ]