Skip to content

use map.split for semtokens range queries #13

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
ailrst merged 1 commit into from
Jul 3, 2025
Merged

use map.split for semtokens range queries #13

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
19 changes: 10 additions & 9 deletions bin/lsp/main.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,18 +236,19 @@ class lsp_server =
| Linol_lsp.Client_request.SemanticTokensRange
{ partialResultToken; range; textDocument; workDoneToken } ->
log "semantic token range";
let begin_range = LineCol.of_position range.start in
let end_range = LineCol.of_position range.end_ in
let begin_range : Token.t =
(LineCol.of_position range.start, 0)
in
let end_range : Token.t = (LineCol.of_position range.end_, -1) in
let m =
(match (Hashtbl.find buffers textDocument.uri).ast with
| Ast (p, syms) -> Some syms
| Ast (p, syms) -> Some syms.all_tokens
| _ -> None)
|> Option.map Processor.get_semantic_token_map
|> Option.map
(TokenMap.filter (fun i _ ->
let pos = fst i in
LineCol.compare pos begin_range > 0
&& LineCol.compare pos end_range < 0))
|> Option.map (fun m ->
match TokenMap.split begin_range m with
| l, data, r -> r)
|> Option.map (fun m ->
match TokenMap.split end_range m with l, data, r -> l)
|> Option.map SemanticTokensProcessor.to_semantic_tokens_full
in
Lwt.return m
Expand Down
39 changes: 25 additions & 14 deletions lib/lsp/process_doc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module Processor = struct
all_tokens : SemanticTokensProcessor.t;
}

let get_semantic_token_map (s : symbs) =
let semantic_tokens_from_symbs (s : symbs) =
SemanticTokensProcessor.empty
|> SemanticTokensProcessor.add (StringMap.to_seq s.proc_defs)
(fun (_, di) ->
Expand All @@ -47,11 +47,9 @@ module Processor = struct
{ token_type = "method"; token_modifiers = [] }
|> SemanticTokensProcessor.add_tokmap s.proc_refs
{ token_type = "class"; token_modifiers = [] }
|> TokenMap.union (fun i a b -> Some a) s.all_tokens

let to_semantic_highlight_data (s : symbs) =
SemanticTokensProcessor.to_semantic_tokens_full
(get_semantic_token_map s)
SemanticTokensProcessor.to_semantic_tokens_full s.all_tokens

let get_syms (s : symbs) : Linol_lwt.DocumentSymbol.t list =
let block_sym (blockname : string) (def : def_info) =
Expand Down Expand Up @@ -197,15 +195,28 @@ module Processor = struct

let process_cast (linebreaks : linebreaks) (p : moduleT) : symbs =
let vis = new getBlocks linebreaks in

let stokens =
Semantic_tokens.SemanticTokensFromAST.get_semtokens_of_cast linebreaks
p
in

let _ = visit_prog vis p in
{
proc_defs = vis#get_proc_defs;
proc_children = vis#get_proc_children;
block_defs = vis#get_block_defs;
proc_refs = vis#get_proc_refs;
block_refs = vis#get_block_refs;
all_tokens =
Semantic_tokens.SemanticTokensFromAST.get_semtokens_of_cast
linebreaks p;
}
let sym0 =
{
proc_defs = vis#get_proc_defs;
proc_children = vis#get_proc_children;
block_defs = vis#get_block_defs;
proc_refs = vis#get_proc_refs;
block_refs = vis#get_block_refs;
all_tokens = SemanticTokensProcessor.empty;
}
in
let all_tokens =
TokenMap.union
(fun i a b -> Some a)
stokens
(semantic_tokens_from_symbs sym0)
in
{ sym0 with all_tokens }
end