add tests

Author: aspeddro

.gitignore

@@ -9,7 +9,9 @@ analysis/tests/.merlin
 
 tools/node_modules
 tools/lib
-tools/**/*.bs.js
+tools/**/*.res.js
+tools/tests/node_modules
+tools/tests/lib
 
 rescript-editor-analysis.exe
 rescript-tools.exe

Makefile

@@ -7,10 +7,12 @@ build:
 
 test:
 	make -C analysis test
+	make -C tools test
 
 clean:
 	dune clean
 	make -C analysis clean
+	make -C tools clean
 
 format:
 	dune build @fmt --auto-promote

analysis.opam

@@ -7,7 +7,6 @@ homepage: "https://github.com/rescript-lang/rescript-vscode"
 bug-reports: "https://github.com/rescript-lang/rescript-vscode/issues"
 depends: [
   "ocaml" {>= "4.10"}
-  "ocamlformat" {= "0.26.1"}
   "cppo" {= "1.6.9"}
   "dune"
 ]

analysis/bin/main.ml

@@ -145,14 +145,6 @@ let main () =
       ~pos:(int_of_string line_start, int_of_string line_end)
       ~maxLength ~debug
   | [_; "codeLens"; path] -> Commands.codeLens ~path ~debug
-  | [_; "extractDocs"; path] -> 
-    let () =
-      match Sys.getenv_opt "FROM_COMPILER" with
-      | Some "true" -> Cfg.isDocGenFromCompiler := true
-      | _ -> ()
-    in
-
-    DocExtraction.extractDocs ~path ~debug
   | [_; "codeAction"; path; startLine; startCol; endLine; endCol; currentFile]
     ->
     Commands.codeAction ~path

analysis/src/Commands.ml

@@ -347,9 +347,6 @@ let test ~path =
             let currentFile = createCurrentFile () in
             signatureHelp ~path ~pos:(line, col) ~currentFile ~debug:true;
             Sys.remove currentFile
-          | "dex" ->
-            print_endline ("Documentation extraction " ^ path);
-            DocExtraction.extractDocs ~path ~debug:true
           | "int" ->
             print_endline ("Create Interface " ^ path);
             let cmiFile =

dune-project

@@ -16,8 +16,6 @@
  (depends
   (ocaml
    (>= 4.10))
-  (ocamlformat
-   (= 0.26.1))
   (cppo
    (= 1.6.9))
   dune))

tools/Makefile

@@ -0,0 +1,17 @@
+SHELL = /bin/bash
+
+node_modules/.bin/rescript:
+	npm install
+
+build: node_modules/.bin/rescript
+	node_modules/.bin/rescript
+
+test: build
+	cd tests && ./test.sh
+
+clean:
+	rm -r node_modules lib
+
+.DEFAULT_GOAL := test
+
+.PHONY: clean test

tools/bin/dune

@@ -4,6 +4,6 @@
  (modes byte exe)
  ; The main module that will become the binary.
  (name main)
- (libraries analysis)
+ (libraries tools)
  (flags
   (-w "+6+26+27+32+33+39")))

tools/bin/main.ml

@@ -38,13 +38,14 @@ let main () =
   | "doc" :: rest -> (
     match rest with
     | ["-h"] | ["--help"] -> logAndExit ~log:docHelp ~code:`Ok
-    | [path] -> (
+    | [path] ->
       (* NOTE: Internal use to generate docs from compiler *)
-      let () = match Sys.getenv_opt "FROM_COMPILER" with
-      | Some("true") -> Analysis.Cfg.isDocGenFromCompiler := true
-      | _ -> () in
-      Analysis.DocExtraction.extractDocs ~path ~debug:false
-    )
+      let () =
+        match Sys.getenv_opt "FROM_COMPILER" with
+        | Some "true" -> Analysis.Cfg.isDocGenFromCompiler := true
+        | _ -> ()
+      in
+      Tools.extractDocs ~path ~debug:false
     | _ -> logAndExit ~log:docHelp ~code:`Error)
   | "reanalyze" :: _ ->
     let len = Array.length Sys.argv in