diff --git a/core/modules/parsers/wikiparser/wikiparser.js b/core/modules/parsers/wikiparser/wikiparser.js index 1606d982d..527e39eba 100644 --- a/core/modules/parsers/wikiparser/wikiparser.js +++ b/core/modules/parsers/wikiparser/wikiparser.js @@ -216,6 +216,8 @@ WikiParser.prototype.parsePragmas = function() { subTree[0].children = []; currentTreeBranch = subTree[0].children; } + // Skip whitespace after the pragma + this.skipWhitespace(); } return currentTreeBranch; }; diff --git a/editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid b/editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid new file mode 100644 index 000000000..34b7b12ff --- /dev/null +++ b/editions/test/tiddlers/tests/data/pragmas/WhitespaceAfterPragma.tid @@ -0,0 +1,64 @@ +title: Pragmas/WhitespaceAfterPragma +description: parsermode pragma +type: text/vnd.tiddlywiki-multiple +tags: [[$:/tags/wiki-test-spec]] + +title: Output + +<$wikify name="parsetree" text={{Text}} mode="inline" output="parsetree"> +<$text text=<>/> + ++ +title: Text + +\procedure this-is-a-definition() Something + + + + +Now! + ++ +title: ExpectedResult + +

+[ + { + "type": "set", + "attributes": { + "name": { + "name": "name", + "type": "string", + "value": "this-is-a-definition" + }, + "value": { + "name": "value", + "type": "string", + "value": "Something" + } + }, + "children": [ + { + "type": "text", + "text": "Now!\n", + "start": 48, + "end": 53 + } + ], + "params": [], + "orderedAttributes": [ + { + "name": "name", + "type": "string", + "value": "this-is-a-definition" + }, + { + "name": "value", + "type": "string", + "value": "Something" + } + ], + "isProcedureDefinition": true + } +] +

\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/pragmas/WhitespaceNoPragma.tid b/editions/test/tiddlers/tests/data/pragmas/WhitespaceNoPragma.tid new file mode 100644 index 000000000..2a7041750 --- /dev/null +++ b/editions/test/tiddlers/tests/data/pragmas/WhitespaceNoPragma.tid @@ -0,0 +1,32 @@ +title: Pragmas/WhitespaceNoPragma +description: parsermode pragma +type: text/vnd.tiddlywiki-multiple +tags: [[$:/tags/wiki-test-spec]] + +title: Output + +<$wikify name="parsetree" text={{Text}} mode="inline" output="parsetree"> +<$text text=<>/> + ++ +title: Text + + + + + +Now! + ++ +title: ExpectedResult + +

+[ + { + "type": "text", + "text": "\n\n\n\nNow!\n", + "start": 0, + "end": 9 + } +] +

\ No newline at end of file