Skip to content

Add HOL parse trees to LSP server #1906

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

Open
xrchz wants to merge 2 commits into
base: develop
Choose a base branch
from
+187 −129
Open

Add HOL parse trees to LSP server #1906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2029d56
Add HOL parse trees to LSP server
xrchz Apr 15, 2026
2c4325a
Switch to built trees instead of hol/ml trees
xrchz Apr 15, 2026
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
30 changes: 24 additions & 6 deletions tools-poly/holide.ML
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ datatype props =
| PIdContent of string
| PDeclaredAt of {file: string, startLine: int, endLine: int, startPosition: int, endPosition: int}
| PType of PolyML.NameSpace.Values.typeExpression
| PRefId of FixedInt.int
| PDefId of FixedInt.int
| PStructureAt of string
| PReferences of bool
| POther of PolyML.ptProperties

datatype built = Built of (FixedInt.int * FixedInt.int) * props list * built list
Expand All @@ -42,8 +46,7 @@ val initialize:
progress: int -> unit,
error: error -> unit,
runtimeExn: exn -> unit,
mlParseTree: PolyML.parseTree -> unit,
holParseTree: HOLSourceAST.dec -> unit
builtTree: built -> unit
} -> unit

val moveUp: subtree -> subtree
Expand Down Expand Up @@ -99,6 +102,10 @@ datatype props =
| PIdContent of string
| PDeclaredAt of {file: string, startLine: int, endLine: int, startPosition: int, endPosition: int}
| PType of PolyML.NameSpace.Values.typeExpression
| PRefId of FixedInt.int
| PDefId of FixedInt.int
| PStructureAt of string
| PReferences of bool
| POther of PolyML.ptProperties

datatype built = Built of (FixedInt.int * FixedInt.int) * props list * built list
Expand Down Expand Up @@ -158,6 +165,10 @@ fun trProps [] = []
PDeclaredAt {file = file, startLine = FixedInt.toInt startLine, endLine = FixedInt.toInt endLine,
startPosition = FixedInt.toInt startPosition, endPosition = FixedInt.toInt endPosition} :: trProps ls
| trProps (PolyML.PTtype t :: ls) = PType t :: trProps ls
| trProps (PolyML.PTrefId i :: ls) = PRefId i :: trProps ls
| trProps (PolyML.PTdefId i :: ls) = PDefId i :: trProps ls
| trProps (PolyML.PTstructureAt {file,...} :: ls) = PStructureAt file :: trProps ls
| trProps (PolyML.PTreferences (exp, _) :: ls) = PReferences exp :: trProps ls
| trProps (PolyML.PTparent _ :: ls) = trProps ls
| trProps (PolyML.PTfirstChild _ :: ls) = trProps ls
| trProps (PolyML.PTpreviousSibling _ :: ls) = trProps ls
Expand Down Expand Up @@ -619,7 +630,7 @@ end

fun initialize {
text, filename, parseError, compilerOut, toplevelOut, progress, error,
runtimeExn, mlParseTree, holParseTree
runtimeExn, builtTree
} = let
datatype chunk
= Chunk of string
Expand Down Expand Up @@ -648,7 +659,6 @@ fun initialize {
case parseDec () of
NONE => true
| SOME dec => (
holParseTree dec;
case expandDec dec of
HOLSourceAST.DecExpansion {result = [], ...} => fetchDec ()
| dec => (
Expand Down Expand Up @@ -684,7 +694,7 @@ fun initialize {
else (curToken := toState (); read2 ())
val serial = ref 1
fun ptFn NONE = ()
| ptFn (SOME pt) = (mlParseTree pt; ptRef := moveDown (SOME pt) :: !ptRef)
| ptFn (SOME pt) = ptRef := moveDown (SOME pt) :: !ptRef
fun codeFn NONE () = ()
| codeFn (SOME code) () = let
val {fixes, values, structures, signatures, functors, types} = code ()
Expand Down Expand Up @@ -714,11 +724,19 @@ fun initialize {
case !curToken of
(_, "") => ()
| _ => ((PolyML.compiler (read2, parameters) () handle e => runtimeExn e); finish ()))
fun emitBuilt () = let
val decs = !decsRef
val pts = rev (!ptRef)
val (acc, _) = annotateDecs decs (PTTop pts) []
in app builtTree (rev acc) end
handle _ => () (* annotation can fail if trees are out of sync *)
fun loop () = (
DArray.clear queue;
if fetchDec () then () else (
idx := 0; spans := []; ptRef := []; curToken := toState ();
idx := 0; spans := []; curToken := toState ();
finish ();
emitBuilt ();
ptRef := [];
loop ()))
in loop () end;

Expand Down
Loading
Loading