Skip to content

Commit

Permalink
Merge pull request #623 from keram/issue-622-idris-start-project-ipkg
Browse files Browse the repository at this point in the history
Add quotes around sourcedir value in generated .ipkg file
  • Loading branch information
jfdm committed Apr 23, 2024
2 parents 37c6b81 + 658229f commit aa580b6
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
2 changes: 1 addition & 1 deletion idris-commands.el
Expand Up @@ -1275,7 +1275,7 @@ of the term to replace."
(newline)
(insert "opts = \"\"")
(newline)
(when src-dir (insert "sourcedir = " src-dir) (newline))
(when src-dir (insert "sourcedir = \"" src-dir "\"") (newline))
(insert "modules = ")
(insert first-mod)
(newline)
Expand Down
33 changes: 33 additions & 0 deletions test/idris-commands-test.el
Expand Up @@ -280,6 +280,39 @@ myReverse xs = revAcc [] xs where
(kill-buffer buffer)
(idris-quit)))))

(ert-deftest idris-test-idris-start-project ()
"Test generating valid .ipkg file."
(let ((mock-project-name "TestProject")
(mock-package-file-name "test-project.ipkg")
(mock-source-directory "src")
(mock-first-module "TestModule")
(mock-directory-name "test-start-project"))
(unwind-protect
(cl-letf (((symbol-function 'read-string)
(lambda (prompt &rest _)
(cond ((string-prefix-p "Project name:" prompt)
mock-project-name)
((string-prefix-p "Package file name" prompt)
mock-package-file-name)
((string-prefix-p "Source directory" prompt)
mock-source-directory)
((string-prefix-p "First module name" prompt)
mock-first-module))))
((symbol-function 'read-directory-name)
(lambda (&rest _) mock-directory-name)))
(idris-start-project)
(with-current-buffer mock-package-file-name
(goto-char (point-min))
(should (search-forward "package test-project"))
(should (search-forward "opts = \"\""))
(should (search-forward "sourcedir = \"src\""))
(should (search-forward "modules = TestModule"))
(kill-buffer)))
(if (get-buffer (concat mock-first-module ".idr"))
(kill-buffer (concat mock-first-module ".idr")))
(delete-directory mock-directory-name t)
(idris-quit))))

;; Tests by Yasuhiko Watanabe
;; https://github.com/idris-hackers/idris-mode/pull/537/files
(idris-ert-command-action "test-data/CaseSplit.idr" idris-case-split idris-test-eq-buffer)
Expand Down

0 comments on commit aa580b6

Please sign in to comment.