balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix comment )-truncation

Browse Source
This commit is contained in:
Kirill Andreev 2020-05-09 11:57:10 +04:00
parent e1a3903e18
commit c8b4c2bd35
No known key found for this signature in database
GPG Key ID: CF7DA79DE4785A47
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/lsp/squirrel/src/AST/Types.hs
View File

@ -217,7 +217,12 @@ c :: HasComments i => i -> Doc -> Doc
c i d = c i d =
case getComments i of case getComments i of
[] -> d [] -> d
cc -> block (map Text.init cc) $$ d cc -> block (map removeSlashN cc) $$ d
where
removeSlashN txt =
if "\n" `Text.isSuffixOf` txt
then Text.init txt
else txt
instance HasComments i => Pretty (Contract i) where instance HasComments i => Pretty (Contract i) where
pp = \case pp = \case
@ -272,7 +277,7 @@ instance HasComments i => Pretty (Mutable i) where
instance HasComments i => Pretty (Type i) where instance HasComments i => Pretty (Type i) where
pp = \case pp = \case
TArrow i dom codom -> c i $ parens (pp dom `indent` "->" <+> pp codom) TArrow i dom codom -> c i $ parens (pp dom `indent` "->" <+> pp codom)
TRecord i fields -> c i $ "record" <+> list fields TRecord i fields -> c i $ "record [" `indent` block fields `above` "]"
TVar i name -> c i $ pp name TVar i name -> c i $ pp name
TSum i variants -> c i $ block variants TSum i variants -> c i $ block variants
TProduct i elements -> c i $ train " *" elements TProduct i elements -> c i $ train " *" elements
@ -358,7 +363,7 @@ instance HasComments i => Pretty (QualifiedName i) where
instance HasComments i => Pretty (Pattern i) where instance HasComments i => Pretty (Pattern i) where
pp = \case pp = \case
IsConstr i ctor arg -> c i $ pp ctor <> maybe empty pp arg IsConstr i ctor arg -> c i $ pp ctor <+> maybe empty pp arg
IsConstant i z -> c i $ pp z IsConstant i z -> c i $ pp z
IsVar i name -> c i $ pp name IsVar i name -> c i $ pp name
IsCons i h t -> c i $ pp h <+> ("#" <+> pp t) IsCons i h t -> c i $ pp h <+> ("#" <+> pp t)