From 153860bacb4453cde402e2652641fe589895c9ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schmelzer?= Date: Tue, 12 Mar 2019 22:14:15 +0100 Subject: [PATCH] improved indentation for ref-groups --- plantuml-mode.el | 2 +- test/plantuml-indentation-sequence-test.el | 23 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/plantuml-mode.el b/plantuml-mode.el index 3335c18..4b85dfd 100644 --- a/plantuml-mode.el +++ b/plantuml-mode.el @@ -358,7 +358,7 @@ Two variants for groups: keyword is either followed by whitespace and some text or it is followed by line end.") (defvar plantuml-indent-regexp-activate-start "^\s*activate\s+.+$") (defvar plantuml-indent-regexp-box-start "^\s*box\s+.+$") - (defvar plantuml-indent-regexp-ref-start "^\s*ref\s+over\s+\\w+\s*$") + (defvar plantuml-indent-regexp-ref-start "^ref +over +[^:]+?$") (defvar plantuml-indent-regexp-title-start "^\s*title$") (defvar plantuml-indent-regexp-header-start "^\s*\\(?:\\(?:center\\|left\\|right\\)\s+header\\|header\\)$") (defvar plantuml-indent-regexp-footer-start "^\s*\\(?:\\(?:center\\|left\\|right\\)\s+footer\\|footer\\)$") diff --git a/test/plantuml-indentation-sequence-test.el b/test/plantuml-indentation-sequence-test.el index 839a97c..d317942 100644 --- a/test/plantuml-indentation-sequence-test.el +++ b/test/plantuml-indentation-sequence-test.el @@ -33,28 +33,47 @@ end box " participant Alice actor Bob +participant \"Great Cesar\" ref over Alice, Bob : init Alice -> Bob : hello -ref over Bob +ref over Bob, \"Great Cesar\" This can be on several lines end ref + +ref over Bob +This is a ref over Bob +end ref + +ref over \"Great Cesar\" +This is a ref over \"Great Cesar\" +end ref " + " participant Alice actor Bob +participant \"Great Cesar\" ref over Alice, Bob : init Alice -> Bob : hello -ref over Bob +ref over Bob, \"Great Cesar\" This can be on several lines end ref + +ref over Bob + This is a ref over Bob +end ref + +ref over \"Great Cesar\" + This is a ref over \"Great Cesar\" +end ref " ))