Skip to content

Commit

Permalink
Fix overlapping ids (#27)
Browse files Browse the repository at this point in the history
  • Loading branch information
3Rafal authored Jun 28, 2023
1 parent 9a66b90 commit 3b7fc46
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/workflows.ml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ let analyze ~backend:(module Backend : Backend.Data_tables) ~repeats
})
merlins
in
id_counter
id_counter + 1
else
match Samples.generate ~sample_size ~id_counter file query_type with
| None ->
Expand Down
7 changes: 6 additions & 1 deletion test/error_regression.t/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ TODO stderr:
/bin/sh: -c: line 0: syntax error near unexpected token `('
/bin/sh: -c: line 0: `ocamlmerlin server expand-prefix -prefix ( + -position '3:12' -filename /Users/rafal/Projects/Tarides/merl-an/_build/default/test/error_regression.t/test.ml < /Users/rafal/Projects/Tarides/merl-an/_build/default/test/error_regression.t/test.ml'

$ merl-an error-regression -s 1 -p test.ml --data=test-data 2>/dev/null
$ merl-an error-regression -s 1 -p test.ml,test1.ml --data=test-data 2>/dev/null

$ cat test-data/results.json
{"sample_id":13,"merlin_id":0,"cmd":"ocamlmerlin server errors -filename test1.ml < test1.ml","success":true}
{"sample_id":12,"merlin_id":0,"cmd":" ocamlmerlin server locate -look-for ml -position '3:12' -index 0 -filename test1.ml < test1.ml","success":true}
{"sample_id":9,"merlin_id":0,"cmd":"ocamlmerlin server occurrences -identifier-at '3:12' -filename test1.ml < test1.ml","success":true}
{"sample_id":8,"merlin_id":0,"cmd":"ocamlmerlin server type-enclosing -position '1:8' -filename test1.ml < test1.ml","success":true}
{"sample_id":7,"merlin_id":0,"cmd":"ocamlmerlin server case-analysis -start '1:8' -end '1:8' -filename test1.ml < test1.ml","success":true}
{"sample_id":6,"merlin_id":0,"cmd":"ocamlmerlin server errors -filename test.ml < test.ml","success":true}
{"sample_id":5,"merlin_id":0,"cmd":" ocamlmerlin server locate -look-for ml -position '3:12' -index 0 -filename test.ml < test.ml","success":true}
{"sample_id":2,"merlin_id":0,"cmd":"ocamlmerlin server occurrences -identifier-at '3:12' -filename test.ml < test.ml","success":true}
Expand Down
3 changes: 3 additions & 0 deletions test/error_regression.t/test1.ml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
let x = 1

let f y = y + 3

0 comments on commit 3b7fc46

Please sign in to comment.