Constant local term definition sites working

Author: ChrisPenner

parser-typechecker/src/Unison/Typechecker/Context.hs

@@ -1243,6 +1243,7 @@ synthesizeWanted (Term.Let1Top' top binding boundVarAnn e) = do
   when (Var.isAction (ABT.variable e)) $
     -- enforce that actions in a block have type ()
     subtype tbinding (DDB.unitType (ABT.annotation binding))
+  Debug.debugM Debug.Temp "Let1Top" (ABT.variable e, v', anythingToString boundVarAnn, tbinding)
   appendContext [Ann v' boundVarAnn tbinding]
   (t, w) <- synthesize (ABT.bindInheritAnnotation e (Term.var () v'))
   t <- applyM t

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

@@ -125,15 +125,6 @@ checkFile doc = runMaybeT do
                   _ -> mempty
                 & pure
 
-            let allVarBindings =
-                  typecheckingNotes
-                    & Foldable.toList
-                    & reverse -- Type notes that come later in typechecking have more information filled in.
-                    & foldMap \case
-                      Result.TypeInfo (Context.VarBinding v loc _typ) -> [(v, loc)]
-                      _ -> mempty
-            Debug.debugM Debug.Temp "allVarBindings" allVarBindings
-
             let allVarMentions =
                   typecheckingNotes
                     & Foldable.toList
@@ -144,16 +135,21 @@ checkFile doc = runMaybeT do
                       _ -> mempty
             Debug.debugM Debug.Temp "allVarMentions" allVarMentions
             Debug.debugM Debug.Temp "symbolTypes" symbolTypes
+            Debug.debugM Debug.Temp "typecheckingNotes" typecheckingNotes
             let localBindings :: (IntervalMap Position (Context.Type Symbol Ann)) =
                   typecheckingNotes
                     & Foldable.toList
                     & reverse -- Type notes that come later in typechecking have more information filled in.
                     & foldMap \case
-                      Result.TypeInfo (Context.VarMention v loc) ->
+                      Result.TypeInfo (Context.VarBinding _v loc typ) -> do
+                        ((annToInterval loc) & foldMap \interval -> (IM.singleton interval typ))
+                      Result.TypeInfo (Context.VarMention v loc) -> do
                         case Map.lookup v symbolTypes of
-                          Just typ -> (annToInterval loc) & foldMap \interval -> (IM.singleton interval typ)
+                          Just typ ->
+                            ((annToInterval loc) & foldMap \interval -> (IM.singleton interval typ))
                           _ -> mempty
                       _ -> mempty
+            Debug.debugM Debug.Temp "localBindings" localBindings
             pure (localBindings, typecheckingNotes, Just parsedFile, maybeTypecheckedFile)
 
   filePPED <- lift $ ppedForFileHelper parsedFile typecheckedFile

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

@@ -28,6 +28,7 @@ import Unison.ConstructorReference (GConstructorReference (..))
 import Unison.ConstructorType qualified as CT
 import Unison.DataDeclaration (Decl)
 import Unison.DataDeclaration qualified as DD
+import Unison.Debug qualified as Debug
 import Unison.HashQualified qualified as HQ
 import Unison.LSP.Conversions (lspToUPos)
 import Unison.LSP.FileAnalysis (getFileSummary, ppedForFile)