c6f1061 · Idris-dev · git.iko.soy

src/Idris/Completion.hs−2

compare with master

unifiedsplit

@@ -39,8 +39,6 @@ tactics = map fst tacticArgs

39-- | Convert a name into a string usable for completion. Filters out names

40-- that users probably don't want to see.

41nameString :: Name -> Maybe String

42−nameString (UN nm)

43− | not (tnull nm) && (thead nm == '@' || thead nm == '#') = Nothing

44nameString (UN n) = Just (str n)

42nameString (UN n) = Just (str n)

45nameString (NS n _) = nameString n

43nameString (NS n _) = nameString n

46nameString _ = Nothing

44nameString _ = Nothing

src/Idris/Core/TT.hs+1−2

@@ -598,8 +598,7 @@ mapCtxt = fmap . fmap

598

599-- |Return True if the argument 'Name' should be interpreted as the name of a

600-- typeclass.

601−tcname (UN xs) | T.null xs = False

601+tcname (UN xs) = False

602− | otherwise = T.head xs == '@'

603tcname (NS n _) = tcname n

602tcname (NS n _) = tcname n

604tcname (SN (InstanceN _ _)) = True

603tcname (SN (InstanceN _ _)) = True

605tcname (SN (MethodN _)) = True

604tcname (SN (MethodN _)) = True

src/Idris/Elab/Clause.hs+1−4

@@ -791,12 +791,9 @@ elabClause info opts (cnum, PClause fc fname lhs_in_as withs rhs_in_as wherebloc

791 mkLHSapp t = t

792

793 decorate (NS x ns)

794− = NS (SN (WhereN cnum fname x)) ns -- ++ [show cnum])

794+ = NS (SN (WhereN cnum fname x)) ns

795−-- = NS (UN ('#':show x)) (ns ++ [show cnum, show fname])

796 decorate x

795 decorate x

797 = SN (WhereN cnum fname x)

796 = SN (WhereN cnum fname x)

798−-- = NS (SN (WhereN cnum fname x)) [show cnum]

799−-- = NS (UN ('#':show x)) [show cnum, show fname]

800

797

801 sepBlocks bs = sepBlocks' [] bs where

798 sepBlocks bs = sepBlocks' [] bs where

802 sepBlocks' ns (d@(PTy _ _ _ _ _ n _ t) : bs)

799 sepBlocks' ns (d@(PTy _ _ _ _ _ n _ t) : bs)