mirror of
https://github.com/TiddlyWiki/TiddlyWiki5.git
synced 2026-05-03 17:07:52 +00:00
Allows whitespace-only macro/procedure to be closed by \end (#7911)
* Added some passing macro definition parsing tests * Added two failing tests to illustrate bug #3460 * Allow \end to end an whitespace only/empty macro definition. Fixes #3460 * Added some passing procedure definition tests * Added two failing procedure tests to illustrate bug #3460 * Allow \end to end a whitespace only/empty procedure/function/widget definition. Fixes #3640 * Fixed wording of comment
This commit is contained in:
16
editions/test/tiddlers/tests/data/macros/EndInBody.tid
Normal file
16
editions/test/tiddlers/tests/data/macros/EndInBody.tid
Normal file
@@ -0,0 +1,16 @@
|
||||
title: Macros/EndInBody
|
||||
description: \end line starting with non-whitespace is part of macro body
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\define hello()
|
||||
hello \end
|
||||
\end
|
||||
|
||||
Out: <<hello>>
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>Out: hello \end</p>
|
||||
16
editions/test/tiddlers/tests/data/macros/IndentedEnd.tid
Normal file
16
editions/test/tiddlers/tests/data/macros/IndentedEnd.tid
Normal file
@@ -0,0 +1,16 @@
|
||||
title: Macros/IndentedEnd
|
||||
description: \end line starting with whitespace ends a macro body
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\define hello()
|
||||
hello \end
|
||||
\end
|
||||
|
||||
Out: <<hello>>
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>Out: hello \end</p>
|
||||
@@ -0,0 +1,16 @@
|
||||
title: Macros/MismatchedNamedEnd
|
||||
description: Mismatched named end is part of the body
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\define hello()
|
||||
\end goodbye
|
||||
\end
|
||||
|
||||
Out: <<hello>>
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>Out: \end goodbye</p>
|
||||
@@ -0,0 +1,18 @@
|
||||
title: Macros/WhitespaceOnlyWithEnd
|
||||
description: The /end should be detected when macro definition contains only whitespace
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\define max()
|
||||
\end
|
||||
Nothing
|
||||
\end
|
||||
|
||||
Out: <<max>>
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>Nothing
|
||||
\end</p><p>Out: </p>
|
||||
@@ -0,0 +1,15 @@
|
||||
title: Macros/WhitespaceOnlyWithEnd2
|
||||
description: Line with \end can start with whitespace
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\define empty()
|
||||
\end
|
||||
|
||||
Out: <<empty>>
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>Out: </p>
|
||||
16
editions/test/tiddlers/tests/data/procedures/EndInBody.tid
Normal file
16
editions/test/tiddlers/tests/data/procedures/EndInBody.tid
Normal file
@@ -0,0 +1,16 @@
|
||||
title: Procedures/EndInBody
|
||||
description: \end line starting with non-whitespace is part of procedure body
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\procedure hello()
|
||||
hello \end
|
||||
\end
|
||||
|
||||
Out: <<hello>>
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>Out: hello \end</p>
|
||||
16
editions/test/tiddlers/tests/data/procedures/IndentedEnd.tid
Normal file
16
editions/test/tiddlers/tests/data/procedures/IndentedEnd.tid
Normal file
@@ -0,0 +1,16 @@
|
||||
title: Procedures/IndentedEnd
|
||||
description: \end line starting with whitespace ends a procedure body
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\procedure hello()
|
||||
hello \end
|
||||
\end
|
||||
|
||||
Out: <<hello>>
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>Out: hello \end</p>
|
||||
@@ -0,0 +1,16 @@
|
||||
title: Procedures/MismatchedNamedEnd
|
||||
description: Mismatched named end is part of the body
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\procedure hello()
|
||||
\end goodbye
|
||||
\end
|
||||
|
||||
Out: <<hello>>
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>Out: \end goodbye</p>
|
||||
@@ -0,0 +1,18 @@
|
||||
title: Procedures/WhitespaceOnlyWithEnd
|
||||
description: The /end should be detected when procedure definition contains only whitespace
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\procedure max()
|
||||
\end
|
||||
Nothing
|
||||
\end
|
||||
|
||||
Out: <<max>>
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>Nothing
|
||||
\end</p><p>Out: </p>
|
||||
@@ -0,0 +1,15 @@
|
||||
title: Procedures/WhitespaceOnlyWithEnd2
|
||||
description: Line with \end can start with whitespace
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\procedure empty()
|
||||
\end
|
||||
|
||||
Out: <<empty>>
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>Out: </p>
|
||||
Reference in New Issue
Block a user