haskal
/
utop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

depend on new zed and lambda-term

This commit is contained in:
ZAN DoYe 2019-03-30 21:27:48 +08:00
parent 63fb913332
commit 7df33e500a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/uTop.ml
View File

@ -441,7 +441,7 @@ let make_prompt ui profile count size key_sequence (recording, macro_count, macr
txta; txta;
Array.make Array.make
(size.cols - Array.length txta - Array.length txtb) (size.cols - Array.length txta - Array.length txtb)
(UChar.of_int 0x2500, { none with foreground = Some (color lcyan blue); bold = Some bold }); (Zed_char.unsafe_of_uChar (UChar.of_int 0x2500), { none with foreground = Some (color lcyan blue); bold = Some bold });
txtb; txtb;
] ]
) second_line ) second_line
@ -464,12 +464,12 @@ let () =
Hashtbl.add Toploop.directive_table "utop_prompt_simple" Hashtbl.add Toploop.directive_table "utop_prompt_simple"
(Toploop.Directive_none (Toploop.Directive_none
(fun () -> (fun () ->
prompt := S.map (Printf.ksprintf LTerm_text.of_string "utop [%d]: ") count)); prompt := S.map (Printf.ksprintf LTerm_text.of_utf8 "utop [%d]: ") count));
Hashtbl.add Toploop.directive_table "utop_prompt_dummy" Hashtbl.add Toploop.directive_table "utop_prompt_dummy"
(Toploop.Directive_none (Toploop.Directive_none
(fun () -> (fun () ->
prompt := S.const (LTerm_text.of_string "# "))); prompt := S.const (LTerm_text.of_utf8 "# ")));
Hashtbl.add Toploop.directive_table "utop_prompt_fancy_light" Hashtbl.add Toploop.directive_table "utop_prompt_fancy_light"
(Toploop.Directive_none (Toploop.Directive_none

11
src/lib/uTop_main.ml
View File

@ -150,7 +150,7 @@ let is_accept : LTerm_read_line.action -> bool = function
valid phrase (i.e. typable and compilable). It also returns valid phrase (i.e. typable and compilable). It also returns
warnings printed parsing. *) warnings printed parsing. *)
class read_phrase ~term = object(self) class read_phrase ~term = object(self)
inherit [Parsetree.toplevel_phrase UTop.result * string] LTerm_read_line.engine ~history:(LTerm_history.contents UTop.history) () as super inherit [Parsetree.toplevel_phrase UTop.result * string] LTerm_read_line.engine ~history:(LTerm_history.zed_contents UTop.history) () as super
inherit [Parsetree.toplevel_phrase UTop.result * string] LTerm_read_line.term term as super_term inherit [Parsetree.toplevel_phrase UTop.result * string] LTerm_read_line.term term as super_term
method create_temporary_file_for_external_editor = method create_temporary_file_for_external_editor =
@ -180,6 +180,7 @@ class read_phrase ~term = object(self)
is_accept action -> begin is_accept action -> begin
Zed_macro.add self#macro action; Zed_macro.add self#macro action;
let input = Zed_rope.to_string (Zed_edit.text self#edit) in let input = Zed_rope.to_string (Zed_edit.text self#edit) in
let input= Zed_string_UTF8.of_t input in
let input = let input =
if action == UTop.end_and_accept_current_phrase then if action == UTop.end_and_accept_current_phrase then
add_terminator input add_terminator input
@ -223,7 +224,7 @@ class read_phrase ~term = object(self)
styled.(i) <- (ch, LTerm_style.merge token_style style) styled.(i) <- (ch, LTerm_style.merge token_style style)
done done
in in
UTop_styles.stylise stylise (UTop_lexer.lex_string (UTop.get_syntax ()) (LTerm_text.to_string styled)); UTop_styles.stylise stylise (UTop_lexer.lex_string (UTop.get_syntax ()) (Zed_string_UTF8.of_t (LTerm_text.to_string styled)));
if not last then if not last then
(* Parenthesis matching. *) (* Parenthesis matching. *)
@ -250,8 +251,10 @@ class read_phrase ~term = object(self)
UTop_complete.complete UTop_complete.complete
~syntax:(UTop.get_syntax ()) ~syntax:(UTop.get_syntax ())
~phrase_terminator:(UTop.get_phrase_terminator ()) ~phrase_terminator:(UTop.get_phrase_terminator ())
~input:(Zed_rope.to_string self#input_prev) ~input:(Zed_string_UTF8.of_t (Zed_rope.to_string self#input_prev))
in in
let words= words |> List.map (fun (k, v)->
(Zed_string_UTF8.to_t_exn k, Zed_string_UTF8.to_t_exn v)) in
self#set_completion pos words self#set_completion pos words
method! show_box = S.value self#mode <> LTerm_read_line.Edition || UTop.get_show_box () method! show_box = S.value self#mode <> LTerm_read_line.Edition || UTop.get_show_box ()
@ -296,7 +299,7 @@ let render_out_phrase term string =
LTerm.fprint term string LTerm.fprint term string
else begin else begin
let string = fix_string string in let string = fix_string string in
let styled = LTerm_text.of_string string in let styled = LTerm_text.of_utf8 string in
let stylise loc token_style = let stylise loc token_style =
for i = loc.idx1 to loc.idx2 - 1 do for i = loc.idx1 to loc.idx2 - 1 do
let ch, style = styled.(i) in let ch, style = styled.(i) in