fix pattern printing

juvix-mode/juvix-mode.el

@@ -69,7 +69,7 @@
         )
     (with-temp-buffer
       (let ((
-             cmd-str (concat "juvix " (if juvix-disable-embedded-stdlib "--no-stdlib " "") "dev scope "
+             cmd-str (concat "juvix " (if juvix-disable-embedded-stdlib "--no-stdlib " "") "dev scope --with-comments "
                              buff-name)
              ))
         (if (zerop (call-process-shell-command

src/Juvix/Compiler/Concrete/Print/Base.hs

@@ -254,13 +254,19 @@ instance PrettyPrint (FunctionClause 'Scoped) where
     let clauseFun' = ppCode _clauseOwnerFunction
         clausePatterns' = case nonEmpty _clausePatterns of
           Nothing -> Nothing
-          Just ne -> Just (hsep (ppCode <$> ne))
+          Just ne -> Just (hsep (ppPatternAtom <$> ne))
         clauseBody' = ppCode _clauseBody
     clauseFun'
       <+?> clausePatterns'
       <+> noLoc P.kwAssign
       <+> nest clauseBody'
 
+ppPatternAtom :: forall r. (Members '[Reader Options, ExactPrint] r) => PatternArg -> Sem r ()
+ppPatternAtom pat =
+  case pat ^. patternArgPattern of
+    PatternVariable s | s ^. S.nameVerbatim == "=" -> parens (ppAtom pat)
+    _ -> ppAtom pat
+
 instance PrettyPrint (InductiveParameter 'Scoped) where
   ppCode InductiveParameter {..} = do
     let name' = region (P.annDef _inductiveParameterName) (ppCode _inductiveParameterName)

src/Juvix/Compiler/Concrete/Translation/FromSource.hs

@@ -253,7 +253,7 @@ builtinStatement = do
 
 compileBlock :: forall r. Members '[InfoTableBuilder, JudocStash, NameIdGen] r => ParsecS r (Compile 'Parsed)
 compileBlock = do
-  kw kwCompile
+  _compileKw <- kw kwCompile
   _compileName <- symbol
   _compileBackendItems <- backends
   return Compile {..}

src/Juvix/Data/Comment.hs

@@ -60,6 +60,9 @@ mkComments cs = Comments {..}
             let _fileCommentsSorted = sortOn (^. commentInterval) (toList filecomments)
         ]
 
+emptyComments :: Comments
+emptyComments = Comments mempty
+
 emptyFileComments :: Path Abs File -> FileComments
 emptyFileComments _fileCommentsFile =
   FileComments

src/Juvix/Data/Keyword.hs

@@ -29,7 +29,7 @@ makeLenses ''Keyword
 makeLenses ''KeywordRef
 
 instance Eq KeywordRef where
-  a == b = (a ^. keywordRefKeyword, a ^. keywordRefUnicode) == (b ^. keywordRefKeyword, b ^. keywordRefUnicode)
+  a == b = a ^. keywordRefKeyword == b ^. keywordRefKeyword
 
 instance Ord KeywordRef where
   compare a b = compare (a ^. keywordRefKeyword, a ^. keywordRefUnicode) (b ^. keywordRefKeyword, b ^. keywordRefUnicode)

test/Scope/Positive.hs

@@ -13,6 +13,7 @@ import Juvix.Compiler.Concrete.Translation.FromParsed.Analysis.Scoping qualified
 import Juvix.Compiler.Concrete.Translation.FromSource qualified as Parser
 import Juvix.Compiler.Pipeline
 import Juvix.Compiler.Pipeline.Setup
+import Juvix.Data.Comment
 import Juvix.Prelude.Aeson
 import Juvix.Prelude.Pretty
 
@@ -30,8 +31,8 @@ root = relToProject $(mkRelDir "tests/positive")
 renderCode2 :: M.PrettyCode c => c -> Text
 renderCode2 = prettyText . M.ppOutDefault
 
-renderCode :: P.PrettyPrint c => c -> Text
-renderCode = prettyText . P.ppOutDefault
+renderCode :: (HasLoc c, P.PrettyPrint c) => c -> Text
+renderCode = prettyText . P.ppOutDefault emptyComments
 
 type Pipe =
   '[ PathResolver,
@@ -95,7 +96,7 @@ testDescr PosTest {..} =
                       <> yamlFiles
 
             let scopedPretty = renderCode s2
-                parsedPretty = renderCode p2
+                parsedPretty = renderCode2 p2
                 onlyMainFile :: Text -> HashMap (Path Abs File) Text
                 onlyMainFile t = HashMap.fromList $ (file', t) : yamlFiles
 

tests/positive/Imports/A.juvix

@@ -7,7 +7,7 @@ module A;
   end ;
   infix 2 +;
   axiom + : Type → Type → Type;
-  end ;
+  end;
   import M;
   f : M.N.T;
   f (_ M.N.t _) := Type M.+ Type;