Skip to content

LSP can now eval top level expressions with main included #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sfultong merged 1 commit into from
Jan 15, 2026
Merged

LSP can now eval top level expressions with main included #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Telomare/Eval.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ eval2IExpr extraModuleBindings str =
Right x -> case toTelomare x of
Just ie -> pure ie
_ -> Left $ "eval2IExpr conversion error back to iexpr:\n" <> prettyPrint x
aux = (\str -> Left (DummyLoc :< ImportQualifiedUPF str str)) . fst <$> extraModuleBindings
aux = (\str -> Left (DummyLoc :< ImportUPF str)) . fst <$> extraModuleBindings
resolved = resolveAllImports extraModuleBindings aux

tagIExprWithEval :: IExpr -> Cofree IExprF (Int, IExpr)
Expand Down
4 changes: 2 additions & 2 deletions src/Telomare/Resolver.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,8 +640,8 @@ resolveAllImports' modules x =
then resolved
else resolveAllImports' modules resolved

resolveAllImports :: [(String, [Either AnnotatedUPT (String, AnnotatedUPT)])]
-> [Either AnnotatedUPT (String, AnnotatedUPT)]
resolveAllImports :: [(String, [Either AnnotatedUPT (String, AnnotatedUPT)])] -- ^All the modules
-> [Either AnnotatedUPT (String, AnnotatedUPT)] -- ^Module to be resolved (i.e. list of either Import_UPT or top level definitions)
-> [(String, AnnotatedUPT)]
resolveAllImports x y = removeRights <$> resolveAllImports' x y
where
Expand Down
Loading