Merge branch 'master' into roy_dev

Author: Roy Ward

INSTALL.sh

@@ -601,7 +601,9 @@ check_metalog_in_path() {
 }
 
 # Call the function to check and update PATH
+#set -x  # before line 600
 check_metalog_in_path
+#set +x  # after line 610
 
 if [ -f ./scripts/lsp_server_prolog_install.sh ]; then
     # Ensure the script is executable

examples/games/TicTakToe.metta

@@ -203,16 +203,20 @@
 ;; Sanity tests (for development use only)
 ;; ----------------------------------------
 
-!(display-board (X X X 4 5 6 O O O)) ;; Should show X win on top row
-!(random-atom (1 2 3 4 5 6 7 8 9))   ;; Random move demo
-!(assertEqualToResult (random-atom (1)) (1)) ;; Edge case: only one option
-!(assertEqualToResult (random-atom ()) ())   ;; Edge case: no options
-!(assertEqualToResult (winner (O O 3 4 5 6 X X X)) (X)) ;; X wins in bottom row
-!(assertEqualToResult (available-moves (O O 3 4 5 6 X X X)) ((3 4 5 6)))
-!(assertEqualToResult (move-choices (O O 3 4 5 6 X X X)) (6 5 4 3)) ;; Should list in reverse
-!(assertEqualToResult (winning-move (O O 3 4 5 6 7 8 9) O) (3))     ;; O can win
-!(assertEqualToResult (winning-move (O O 3 4 5 6 7 8 9) X) ())      ;; X cannot win
-!(assertEqualToResult (winning-move (O O 3 4 5 6 7 X X) X) (7))     ;; X can win with 7
+
+(= (my-tests)
+  (
+(display-board (X X X 4 5 6 O O O)) ;; Should show X win on top row
+(random-atom (1 2 3 4 5 6 7 8 9))   ;; Random move demo
+(assertEqualToResult (random-atom (1)) (1)) ;; Edge case: only one option
+(assertEqualToResult (random-atom ()) ())   ;; Edge case: no options
+(assertEqualToResult (winner (O O 3 4 5 6 X X X)) (X)) ;; X wins in bottom row
+(assertEqualToResult (available-moves (O O 3 4 5 6 X X X)) ((3 4 5 6)))
+(assertEqualToResult (move-choices (O O 3 4 5 6 X X X)) (6 5 4 3)) ;; Should list in reverse
+(assertEqualToResult (winning-move (O O 3 4 5 6 7 8 9) O) (3))     ;; O can win
+(assertEqualToResult (winning-move (O O 3 4 5 6 7 8 9) X) ())      ;; X cannot win
+(assertEqualToResult (winning-move (O O 3 4 5 6 7 X X) X) (7))     ;; X can win with 7
+))
 
 ;; ----------------------------------------
 ;; Entry point: starts AI vs AI by default
@@ -225,4 +229,4 @@
 ;; (is-human O)
 
 !(play-now)
-
+!(repl!)

libraries/lsp_server_metta/prolog/lsp_metta_completion.pl

@@ -1,4 +1,4 @@
-:- module(lsp_metta_completion, [completions_at/3]).
+:- module(lsp_metta_completion, [completions_at/3,completion_context/3]).
 /** <module> LSP Completion
 
 This module implements code completion, based on defined predicates in

libraries/lsp_server_metta/prolog/lsp_metta_hover.pl

@@ -31,6 +31,8 @@
 hover_at_position(Path, Line0, Char0, S) :-
     Loc = line_char(Line0, Char0), thread_signal(main,make),
     clause_with_arity_in_file_at_position(Term, Arity, Path, Loc),
+    %assume_mode(markdown),
+    assume_mode(markdown),
     findall(S, lsp_hooks:hover_string(Path, Loc, Term, Arity, S), SS),
     combine_hover(SS, S).
 
@@ -231,9 +233,24 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-in_markdown(G) :- format("~N", []), call(G).
+in_markdown(G) :- in_mode(markdown,call(G)).
+in_textual(G) :- in_mode(textual,call(G)).
+in_mode(X,G):- enter_mode(X),call(G),format("~N", []).
+
+inside_mode(X):-nb_current(md_mode,M),M==X.
+
+enter_mode(X):- inside_mode(X),!.
+enter_mode(X):- assume_mode(X),start_mode(X),!.
+assume_mode(X):- nb_setval(md_mode,X),!.
+start_mode(textual):- write('\n```no-wrap\n').
+start_mode(markdown):- write('\n```\n').
+start_mode(_).
+
 banner_for(Type, Target):- in_markdown(format('***~n ## ~w: ~w', [Type, Target])).
 lsp_separator :- in_markdown(format('~N***~n',[])).
+linebr:- inside_mode(pre),!, lsp_separator.
+linebr:- nl,write(' -'),nl.
+
 
 show_checked(Name, Value, Caption) :- fail,
   format("[~w](file:command:myExtension.toggleValue?{\"name\":\"~w\", \"value\":\"~w\"}) ~w ", [Value, Name, Value, Caption]).
@@ -278,12 +295,16 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 lsp_hooks:hover_print(_Path,_Loc, Target, _) :- use_vitalys_help,
     lsp_separator,
-    % Don't redirect so we can capture output of this predicate
-    locally(nb_setval('$dont_redirect_output', true),
-            xref_call(eval(['help!', Target], _))),
+    in_textual_eval(['help!', Target]),
     lsp_separator.  % Evaluate the help command for the term.
 
 
+% Eval capturing output of this code
+in_textual_eval(MeTTa):-
+    locally(nb_setval('$dont_redirect_output', true),
+            % Don't redirect so we can capture output of this predicate
+            forall(in_textual(xref_call(eval(MeTTa, _))),true)).
+
 lsp_hooks:hover_print(_Path,_Loc, Term, Arity):- fail, % this isn't very helpful
   lsp_separator,
    (((some_arities(Term,Arity, Try, _TryArity),
@@ -308,8 +329,21 @@
 lsp_hooks:hover_print(_Path,_Loc, Target, _) :-
   lsp_separator,
   each_type_at_sorted(Target, Term, AtPath, AtLoc, Type),
+  lsp_separator,
   write_src_xref(Term, Type, AtPath, AtLoc).  % Write the source cross-reference for the atom.
 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Compiled predicate Help
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+lsp_hooks:hover_print(_Path,_Loc, Target, _) :-
+    lsp_separator,
+    %in_textual_eval(writeq(['sinfo!', Target])),
+    in_textual(catch_ignore(compiled_info(Target))),
+    lsp_separator.  % Evaluate the help command for the term.
+
+
+
 get_code_at_range_type(term).
 get_code_at_range_type(expression).
 get_code_at_range_type(toplevel).
@@ -420,10 +454,10 @@
 write_src_xref(Src):-
   write_src_woi(Src).  % Otherwise, write the source content without additional information.
 
-
 write_src_xref(Term, Type, Path, Loc):-
-   catch_skip((write_src_xref(Term),
-   in_markdown(ignore(write_file_link(Type, Path, Loc))))).
+   catch_skip((
+      in_textual(write_src_xref(Term)),
+      in_markdown(ignore(write_file_link(Type, Path, Loc))))).
 
 write_src_xref(Term, Path, Loc):-
    catch_skip((write_src_xref(Term),
@@ -456,7 +490,7 @@
 
 %   ~n```~n*~w*~n```lisp~n
 write_file_link(Type, Path, Position):-
-  write_file_link(Path, Position), format(' _(~w)_', [Type]).
+  in_markdown((write_file_link(Path, Position), format(' _(~w)_', [Type]))).
 
 write_file_link(Path, Position):- is_in_emacs, !,
     must_succeed1(position_line(Position, Line0)), succ(Line0, Line1),

libraries/lsp_server_metta/prolog/lsp_metta_utils.pl

@@ -4,7 +4,6 @@
                            ]).
 
 :- use_module(library(debug), [debug/3]).
-:- use_module(lsp_metta_xref).
 :- use_module(lsp_metta_changes, [handle_doc_changes_d4/2]).
 :- use_module(lsp_metta_parser, [annotated_read_sexpr_list/4]).
 :- use_module(lsp_metta_split, [

libraries/lsp_server_metta/prolog/lsp_metta_workspace.pl

@@ -12,7 +12,8 @@
                                  xref_metta_source/1,
                                  xref_reload_source/1,
                                  xref_source_expired/1,
-                                 maybe_doc_path/2
+                                 maybe_doc_path/2,
+                                 xref_source_now/1
                                ]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%