Skip to content

Complete type identifiers following '::' in REPL #3239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kritzcreek merged 5 commits into from
Apr 14, 2018
Merged

Complete type identifiers following '::' in REPL #3239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
affadb7
Improvments to REPL tab-completion
rndnoise Jan 31, 2018
cfa0739
Complete type identifiers following '::' in REPL
rndnoise Feb 2, 2018
81278f7
Merge branch 'master' of https://github.com/purescript/purescript int…
rndnoise Feb 2, 2018
27e2213
Merge remote-tracking branch 'upstream/master' into completion-for-ty…
rndnoise Feb 17, 2018
ef021a1
Merge remote-tracking branch 'upstream/master' into pr-3239
rndnoise Mar 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/Language/PureScript/Interactive/Completion.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Protolude (ordNub)
import Control.Monad.IO.Class (MonadIO(..))
import Control.Monad.State.Class (MonadState(..))
import Control.Monad.Trans.Reader (asks, runReaderT, ReaderT)
import Data.List (nub, isPrefixOf, sortBy, stripPrefix)
import Data.List (nub, isPrefixOf, isInfixOf, isSuffixOf, sortBy, stripPrefix)
import Data.Map (keys)
import Data.Maybe (mapMaybe)
import qualified Data.Text as T
Expand Down Expand Up @@ -63,7 +63,7 @@ findCompletions prev word = do
CtxFilePath f -> map Right <$> listFiles f
CtxModule -> map Left <$> getModuleNames
CtxIdentifier -> map Left <$> ((++) <$> getIdentNames <*> getDctorNames)
CtxType -> map Left <$> getTypeNames
CtxType pre -> map (Left . (pre ++)) <$> getTypeNames
CtxFixed str -> return [Left str]
CtxDirective d -> return (map Left (completeDirectives d))

Expand Down Expand Up @@ -96,7 +96,7 @@ data CompletionContext
| CtxFilePath String
| CtxModule
| CtxIdentifier
| CtxType
| CtxType String
| CtxFixed String
deriving (Show)

Expand All @@ -105,11 +105,21 @@ data CompletionContext
-- a list of complete words (to the left of the cursor) as the first argument,
-- and the current word as the second argument.
completionContext :: [String] -> String -> [CompletionContext]
completionContext _ w | "::" `isInfixOf` w = [CtxType (w `endingWith` "::")]
completionContext ws _ | lastSatisfies ("::" `isSuffixOf`) ws = [CtxType ""]
completionContext [] _ = [CtxDirective "", CtxIdentifier, CtxFixed "import"]
completionContext ws w | headSatisfies (":" `isPrefixOf`) ws = completeDirective ws w
completionContext ws w | headSatisfies (== "import") ws = completeImport ws w
completionContext _ _ = [CtxIdentifier]

endingWith :: String -> String -> String
endingWith str stop = aux "" str
where
aux acc s@(x:xs)
| stop `isPrefixOf` s = reverse (stop ++ acc)
| otherwise = aux (x:acc) xs
aux acc [] = reverse (stop ++ acc)

completeDirective :: [String] -> String -> [CompletionContext]
completeDirective ws w =
case ws of
Expand All @@ -123,7 +133,7 @@ directiveArg :: [String] -> Directive -> [CompletionContext]
directiveArg [] Browse = [CtxModule] -- only complete very next term
directiveArg [] Show = map CtxFixed replQueryStrings -- only complete very next term
directiveArg _ Type = [CtxIdentifier]
directiveArg _ Kind = [CtxType]
directiveArg _ Kind = [CtxType ""]
directiveArg _ _ = []

completeImport :: [String] -> String -> [CompletionContext]
Expand All @@ -138,6 +148,10 @@ headSatisfies p str =
(c:_) -> p c
_ -> False

lastSatisfies :: (a -> Bool) -> [a] -> Bool
lastSatisfies _ [] = False
lastSatisfies p xs = p (last xs)

getLoadedModules :: CompletionM [P.Module]
getLoadedModules = asks (map fst . psciLoadedExterns)

Expand Down
7 changes: 7 additions & 0 deletions tests/TestPsci/CompletionTest.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,13 @@ completionTestData supportModuleNames =
, ("voi", []) -- import Prelude hiding (void)
, ("Control.Monad.Eff.Class.", [])

-- complete first name after type annotation symbol
, ("1 :: I", ["1 :: Int"])
, ("1 ::I", ["1 ::Int"])
, ("1:: I", ["1:: Int"])
, ("1::I", ["1::Int"])
, ("(1::Int) uni", ["(1::Int) unit"]) -- back to completing values

-- Parens and brackets aren't considered part of the current identifier
, ("map id [uni", ["map id [unit"])
, ("map (cons", ["map (const"])
Expand Down