Merge pull request #3649 from rgrinberg/fix-3624

Fix #3624

CHANGES.md

@@ -46,6 +46,9 @@ next
 - Use `{dev}` rather than `{pinned}` in the generated `.opam` file. (#3647,
   @kit-ty-kate)
 
+- Insert correct extension name when editing `dune-project` files. Previously,
+  dune would just insert the stanza name. (#3649, fixes #3624, @rgrinberg)
+
 2.6.1 (02/07/2020)
 ------------------
 

src/dune/dune_project.ml

@@ -433,7 +433,8 @@ module Extension = struct
                             ( Project_file_edit.append project_file
                                 (List
                                    [ Dune_lang.atom "using"
-                                   ; Dune_lang.atom name
+                                   ; Dune_lang.atom
+                                       (Dune_lang.Syntax.name e.syntax)
                                    ; Dune_lang.atom
                                        (Dune_lang.Syntax.Version.to_string
                                           version)

test/blackbox-tests/dune.inc

@@ -206,6 +206,17 @@
    test-cases/coq/extract.t
    (progn (run dune-cram run run.t) (diff? run.t run.t.corrected)))))
 
+(rule
+ (alias coq-github3624)
+ (deps
+  (package dune)
+  (source_tree test-cases/coq/github3624.t)
+  (alias test-deps))
+ (action
+  (chdir
+   test-cases/coq/github3624.t
+   (progn (run dune-cram run run.t) (diff? run.t run.t.corrected)))))
+
 (rule
  (alias coq-main)
  (deps (package dune) (source_tree test-cases/coq/main.t) (alias test-deps))
@@ -3197,6 +3208,7 @@
   (alias contents-depends-on-glob)
   (alias copy-files-non-sub-dir-error)
   (alias copy_files)
+  (alias coq-github3624)
   (alias corrections)
   (alias cross-compilation)
   (alias custom-build-dir)
@@ -3504,6 +3516,7 @@
   (alias contents-depends-on-glob)
   (alias copy-files-non-sub-dir-error)
   (alias copy_files)
+  (alias coq-github3624)
   (alias corrections)
   (alias custom-build-dir)
   (alias custom-cross-compilation)

test/blackbox-tests/test-cases/coq/github3624.t/run.t

@@ -0,0 +1,8 @@
+In github #3624, dune created a dune-project with an incorrect using line.
+
+  $ cat >dune <<EOF
+  > (coq.theory
+  >  (name foo))
+  > EOF
+  $ dune build 2>&1 | grep using
+  Info: Appending this line to dune-project: (using coq 0.2)