Change which annotations we use for formatting and folding ranges

Author: ChrisPenner

parser-typechecker/src/Unison/UnisonFile/Type.hs

@@ -17,7 +17,7 @@ import Unison.WatchKind (WatchKind)
 data UnisonFile v a = UnisonFileId
   { dataDeclarationsId :: Map v (TypeReferenceId, DataDeclaration v a),
     effectDeclarationsId :: Map v (TypeReferenceId, EffectDeclaration v a),
-    terms :: Map v (a {- ann for whole binding -}, Term v a),
+    terms :: Map v (a {- ann for name of the binding -}, Term v a),
     watches :: Map WatchKind [(v, a {- ann for whole watch -}, Term v a)]
   }
   deriving stock (Generic, Show)

unison-cli/src/Unison/Codebase/Editor/HandleInput/FormatFile.hs

@@ -82,8 +82,8 @@ formatFile makePPEDForFile formattingWidth currentPath inputParsedFile inputType
             & over _2 Pretty.syntaxToColor
   formattedTerms <-
     (FileSummary.termsBySymbol fileSummary)
-      & Map.filter (\(tldAnn, _, trm, _) -> shouldFormatTerm tldAnn trm)
-      & itraverse \sym (tldAnn, mayRefId, trm, _typ) -> do
+      & Map.filter (\(_bindingAnn, _, trm, _) -> shouldFormatTerm (ABT.annotation trm) trm)
+      & itraverse \sym (_bindingAnn, mayRefId, trm, _typ) -> do
         symName <- hoistMaybe (Name.parseVar sym)
         let defNameSegments = NEL.appendr (Path.toList (Path.unabsolute currentPath)) (Name.segments symName)
         let defName = Name.fromSegments defNameSegments
@@ -102,7 +102,7 @@ formatFile makePPEDForFile formattingWidth currentPath inputParsedFile inputType
         --             Pretty.syntaxToColor $ Pretty.string wk <> "> " <> TermPrinter.prettyBindingWithoutTypeSignature definitionPPE hqName (stripTypeAnnotation trm)
         --           (Just wk, _) -> Pretty.string wk <> "> " <> TermPrinter.prettyBlock False definitionPPE (stripTypeAnnotation trm)
         --           (Nothing, _) -> "> " <> TermPrinter.prettyBlock False definitionPPE (stripTypeAnnotation trm)
-        pure (tldAnn, formattedTerm)
+        pure (ABT.annotation trm, formattedTerm)
 
   -- Only keep definitions which are _actually_ in the file, skipping generated accessors
   -- and such.

unison-cli/src/Unison/LSP/FoldingRange.hs

@@ -12,6 +12,7 @@ import Data.Text qualified as Text
 import Language.LSP.Protocol.Lens hiding (id, to)
 import Language.LSP.Protocol.Message qualified as Msg
 import Language.LSP.Protocol.Types
+import Unison.ABT qualified as ABT
 import Unison.DataDeclaration qualified as DD
 import Unison.LSP.Conversions (annToRange)
 import Unison.LSP.FileAnalysis (getFileAnalysis)
@@ -44,7 +45,11 @@ foldingRangesForFile UnisonFileId {dataDeclarationsId, effectDeclarationsId, ter
         effectDeclarationsId
           & Map.toList
           & map \(sym, (_typ, decl)) -> (Just sym, DD.annotation . DD.toDataDecl $ decl)
-      termFolds = terms & Map.toList & fmap \(sym, (ann, _trm)) -> (Just sym, ann)
+      termFolds =
+        terms
+          & Map.toList
+          <&> \case
+            (sym, (_ann, trm)) -> (Just sym, ABT.annotation trm)
       watchFolds =
         watches
           & fold