Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix-mode
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4016a1c89b1c
Choose a base ref
...
head repository: NixOS/nix-mode
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a33ccd4fd78b
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Jun 14, 2019

  1. Copy the full SHA
    a33ccd4 View commit details
Showing with 40 additions and 0 deletions.
  1. +12 −0 tests/nix-mode-tests.el
  2. +10 −0 tests/testcases/issue-43.nix
  3. +6 −0 tests/testcases/issue-74.nix
  4. +7 −0 tests/testcases/issue-77.nix
  5. +5 −0 tests/testcases/issue-78.nix
12 changes: 12 additions & 0 deletions tests/nix-mode-tests.el
Original file line number Diff line number Diff line change
@@ -176,5 +176,17 @@ Related issue: https://github.com/NixOS/nix-mode/issues/72"
"Proper indentation of strings in a multi-line string."
(with-nix-mode-test ("all-packages.nix" :indent 'smie-indent-line)))

(ert-deftest nix-mode-test-indent-issue-74-smie ()
"Proper indentation of strings in a multi-line string."
(with-nix-mode-test ("issue-74.nix" :indent 'smie-indent-line)))

(ert-deftest nix-mode-test-indent-issue-77-smie ()
"Proper indentation of strings in a multi-line string."
(with-nix-mode-test ("issue-77.nix" :indent 'smie-indent-line)))

(ert-deftest nix-mode-test-indent-issue-78-smie ()
"Proper indentation of strings in a multi-line string."
(with-nix-mode-test ("issue-78.nix" :indent 'smie-indent-line)))

(provide 'nix-mode-tests)
;;; nix-mode-tests.el ends here
10 changes: 10 additions & 0 deletions tests/testcases/issue-43.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
let
x = if a
then if b
then c
else d
else if e
then f
else g;
in
x
6 changes: 6 additions & 0 deletions tests/testcases/issue-74.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
home.file.".emacs.d/init.el".source =
toString ../../.emacs.d/init.el;
home.file.".emacs.d/early-init.el".source =
toString ../../.emacs.d/early-init.el;
home.file.".emacs.d/straight/versions/default.el".source =
toString ../../.emacs.d/straight/versions/default.el;
7 changes: 7 additions & 0 deletions tests/testcases/issue-77.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
foo = ''
bar
baz
tux
'';
}
5 changes: 5 additions & 0 deletions tests/testcases/issue-78.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
# Enable zero-configuration networking with service discorvery.
services.avahi.enable = true;
services.avahi.nssmdns = true;
}