Skip to content

Commit

Permalink
wip rejiggering
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredly committed Apr 4, 2019
1 parent 89d759c commit 4d3c946
Show file tree
Hide file tree
Showing 53 changed files with 2,707 additions and 640 deletions.
8 changes: 8 additions & 0 deletions bin/Diagnose.re
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Printexc.record_backtrace(true);

switch (Sys.argv) {
| [|_, merlinFile|] =>
let modules = Util.MerlinFile.getModulesFromMerlin(Filename.dirname(merlinFile), Util.Files.readFileExn(merlinFile))
print_endline("Ok")
| _ => failwith("bad args")
}
8 changes: 8 additions & 0 deletions bin/dune
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
(name Bin)
(public_name Bin)
(libraries Lsp)
(modules Bin)
(flags :standard -w -9)
(preprocess (pps Belt_ppx Ppx_monads))
)

(executable
(public_name diagnose)
(modules Diagnose)
(libraries Lsp Analyze)
(flags :standard -w -9)
(preprocess (pps Belt_ppx Ppx_monads))
)
6 changes: 5 additions & 1 deletion dune
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
(ignored_subdirs (
examples
node_modules
))
))

(env
(dev
(flags (:standard -warn-error -A))))
1 change: 1 addition & 0 deletions examples/dune-complex/both/A.re
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
let x = 1
1 change: 1 addition & 0 deletions examples/dune-complex/both/B.re
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
let x = 1
2 changes: 2 additions & 0 deletions examples/dune-complex/both/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
(executable (name A) (libraries B))
(library (name B))
Empty file.
2 changes: 2 additions & 0 deletions examples/dune-complex/dune-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
(lang dune 1.8)
(name dune-complex)
12 changes: 12 additions & 0 deletions examples/dune-complex/esy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "dune-complex",
"esy": {
"build": "dune build -p #{self.name}",
"buildsInSource": "_build"
},
"dependencies": {
"@opam/dune": "*",
"rex-json": "jaredly/rex-json#esy",
"@esy-ocaml/reason": "*"
}
}
3 changes: 3 additions & 0 deletions examples/dune-complex/esy.lock/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

# Set eol to LF so files aren't converted to CRLF-eol on Windows.
* text eol=lf
3 changes: 3 additions & 0 deletions examples/dune-complex/esy.lock/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

# Reset any possible .gitignore, we want all esy.lock to be un-ignored.
!*
Loading

0 comments on commit 4d3c946

Please sign in to comment.