From eafb7a0fcdc9f619716873ce49009c6966a30ca9 Mon Sep 17 00:00:00 2001 From: mrBliss Date: Mon, 25 Apr 2016 10:34:17 +0200 Subject: Properly fix #151 Always check whether we're not in a string or comment when looking for the `where` keyword. Use two helpers for this: `rust-looking-at-where` and `rust-rewind-to-where`. --- rust-mode-tests.el | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'rust-mode-tests.el') diff --git a/rust-mode-tests.el b/rust-mode-tests.el index 1e0207d..1e60768 100644 --- a/rust-mode-tests.el +++ b/rust-mode-tests.el @@ -623,7 +623,7 @@ impl<'a, K, Q: ?Sized, V, S> Index<&'a Q> for HashMap } ")) -(ert-deftest indent-align-where-in-comment () +(ert-deftest indent-align-where-in-comment1 () (test-indent "/// - there must not exist an edge U->V in the graph where: #[derive(Clone, PartialEq, Eq)] @@ -633,6 +633,27 @@ pub struct Region { // <-- this should be flush with left margin! } ")) +(ert-deftest indent-align-where-in-comment2 () + (test-indent + "fn foo(f:F, g:G) + where F:Send, +// where + G:Sized +{ + let body; +} +")) + +(ert-deftest indent-align-where-in-comment3 () + (test-indent + "fn foo(f:F, g:G) + where F:Send, +// where F:ThisIsNotActualCode, + G:Sized +{ + let body; +} +")) (ert-deftest indent-square-bracket-alignment () (test-indent -- cgit v1.2.3