From 8bacbb765277a1a45e5ca313663bb7f01be35bec Mon Sep 17 00:00:00 2001
From: Javier Chavarri <javier.chavarri@gmail.com>
Date: Wed, 30 Nov 2022 15:07:38 +0000
Subject: [PATCH] merlin: pass all flags at once

Signed-off-by: Javier Chavarri <javier.chavarri@gmail.com>
---
 src/dune_rules/merlin.ml                        |  5 +----
 test/blackbox-tests/test-cases/melange/merlin.t | 10 +++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/dune_rules/merlin.ml b/src/dune_rules/merlin.ml
index c2101dfb686..d7c45918c92 100644
--- a/src/dune_rules/merlin.ml
+++ b/src/dune_rules/merlin.ml
@@ -454,10 +454,7 @@ module Unprocessed = struct
           | Error _ -> []
           | Ok path ->
             [ Processed.Pp_kind.to_flag Ppx
-            ; Processed.serialize_path path
-            ; "-as-ppx"
-            ; "-bs-jsx"
-            ; "3"
+            ; Processed.serialize_path path ^ " -as-ppx -bs-jsx 3"
             ])
       in
       { Processed.stdlib_dir
diff --git a/test/blackbox-tests/test-cases/melange/merlin.t b/test/blackbox-tests/test-cases/melange/merlin.t
index ab0fc641d3e..292c63e2ed0 100644
--- a/test/blackbox-tests/test-cases/melange/merlin.t
+++ b/test/blackbox-tests/test-cases/melange/merlin.t
@@ -33,9 +33,9 @@
 All 3 entries (Foo, Foo__ and Bar) contain a ppx directive
 
   $ dune ocaml merlin dump-config $PWD | grep -i "ppx"
-   (FLG (-ppx /MELC_COMPILER -as-ppx -bs-jsx 3))
-   (FLG (-ppx /MELC_COMPILER -as-ppx -bs-jsx 3))
-   (FLG (-ppx /MELC_COMPILER -as-ppx -bs-jsx 3))
+   (FLG (-ppx "/MELC_COMPILER -as-ppx -bs-jsx 3"))
+   (FLG (-ppx "/MELC_COMPILER -as-ppx -bs-jsx 3"))
+   (FLG (-ppx "/MELC_COMPILER -as-ppx -bs-jsx 3"))
 
   $ target=output
   $ cat >dune <<EOF
@@ -53,13 +53,13 @@ All 3 entries (Foo, Foo__ and Bar) contain a ppx directive
 The melange.emit entry contains a ppx directive
 
   $ dune ocaml merlin dump-config $PWD | grep -i "ppx"
-   (FLG (-ppx /MELC_COMPILER -as-ppx -bs-jsx 3))
+   (FLG (-ppx "/MELC_COMPILER -as-ppx -bs-jsx 3"))
 
   $ dune ocaml dump-dot-merlin $PWD
   EXCLUDE_QUERY_DIR
   STDLIB /MELC_WHERE
   B $TESTCASE_ROOT/_build/default/.output.mobjs/melange
   S $TESTCASE_ROOT
-  # FLG -ppx /MELC_COMPILER -as-ppx -bs-jsx 3
+  # FLG -ppx '/MELC_COMPILER -as-ppx -bs-jsx 3'
   # FLG -w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs