mirror of
https://github.com/TiddlyWiki/TiddlyWiki5.git
synced 2026-04-30 15:57:03 +00:00
Fix transclude inefficiency (#7647)
* Refactor parse mode out of getTransclusionTarget * Refactor missing transclusion target * Add a test to avoid regressions on the handling of macros vs procedures * Refactor condition logic * Preparing to split getTransclusionTarget into two separate functions * Split getTransclusionTarget into getTransclusionTargetIncludingParseTreeNodes * Resolve another inefficiency The transclusion target was sometimes being parsed twice when transcluding as text/plain Associated test results are also made more consistent * Simplify method naming * Neatening up
This commit is contained in:
@@ -0,0 +1,26 @@
|
||||
title: Procedures/Double/Underscore
|
||||
description: Checking that procedures don't expose parameters as variables wrapped in double underscores
|
||||
type: text/vnd.tiddlywiki-multiple
|
||||
tags: [[$:/tags/wiki-test-spec]]
|
||||
|
||||
title: Output
|
||||
|
||||
\whitespace trim
|
||||
\procedure mamacro(one:"red",two:"green")
|
||||
It is $one$ and $two$<<__one__>><<__two__>>.
|
||||
\end
|
||||
|
||||
<$macrocall $name="mamacro"/>
|
||||
|
||||
<$transclude $variable="mamacro"/>
|
||||
|
||||
<$transclude $variable="mamacro" one="orange"/>
|
||||
|
||||
<$transclude $variable="mamacro" 0="pink"/>
|
||||
|
||||
<$transclude $variable="mamacro" one="purple" 1="pink"/>
|
||||
|
||||
+
|
||||
title: ExpectedResult
|
||||
|
||||
<p>It is $one$ and $two$.</p><p>It is $one$ and $two$.</p><p>It is $one$ and $two$.</p><p>It is $one$ and $two$.</p><p>It is $one$ and $two$.</p>
|
||||
Reference in New Issue
Block a user