Merge pull request #46 from joshuafontany/v2.0.6

V2.0.6

Author: joshuafontany

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to the "tw5-syntax" extension will be documented in this fil
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## 2.0.6
+- Allow all pragmas to have leading whitespace (allows nested and indented named pragmas of macros, procedures, and widgets).
+
 ## 2.0.5
 - Cannot inject wikitext parsing into `<style>` tags. Closed as won't-fix. //Style tags do not parse wikitext #42
 - Add a `constributes/languages` object for 'json', maps `".info", ".files"` extensions to Json language features as "Tiddlywiki5 Json".

package.json

@@ -2,7 +2,7 @@
     "name": "tw5-syntax",
     "displayName": "TiddlyWiki5 Syntax",
     "description": "TiddlyWiki5 v5.3.4 Textmate compatible Syntax / Grammar",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "icon": "tw5.png",
     "engines": {
         "vscode": "^1.43.0"

syntaxes/tiddlywiki5.json

@@ -162,7 +162,7 @@
 		]
 		},
 		"define": {
-			"begin": "^(\\\\)(define)\\s+([^\\s\\$\\(]+)(?=\\s*\\()",
+			"begin": "^\\s*(\\\\)(define)\\s+([^\\s\\$\\(]+)(?=\\s*\\()",
 			"end": "^",
 			"name": "meta.directive.variable.macro.tiddlywiki5",
 			"beginCaptures": {
@@ -218,7 +218,7 @@
 		"patterns": [
 			{
 			"comment": "Single and Multi-line function definition",
-			"begin": "^(\\\\)(function)\\s+([^\\s\\$\\(]+)(?=\\s*\\()",
+			"begin": "^\\s*(\\\\)(function)\\s+([^\\s\\$\\(]+)(?=\\s*\\()",
 			"end": "^",
 			"name": "meta.directive.variable.function.tiddlywiki5",
 			"beginCaptures": {
@@ -261,7 +261,7 @@
 		]
 		},
 		"import": {
-		"match": "^(\\\\)(import)\\s+(.*)$",
+		"match": "^\\s*(\\\\)(import)\\s+(.*)$",
 		"name": "meta.directive.import.tiddlywiki5",
 		"captures": {
 			"1": { "name": "punctuation.definition.directive.tiddlywiki5" },
@@ -273,7 +273,7 @@
 		}
 		},
 		"parameters": {
-		"begin": "^(\\\\)(parameters)\\s*(\\()",
+		"begin": "^\\s*(\\\\)(parameters)\\s*(\\()",
 		"beginCaptures": {
 			"1": { "name": "punctuation.definition.directive.tiddlywiki5" },
 			"2": { "name": "keyword.control.directive.parameters.tiddlywiki5" },
@@ -311,7 +311,7 @@
 		"patterns": [
 			{
 			"comment": "Single and Multi-line procedure definition",
-			"begin": "^(\\\\)(procedure)\\s+([^\\s\\$\\(]+)(?=\\s*\\()",
+			"begin": "^\\s*(\\\\)(procedure)\\s+([^\\s\\$\\(]+)(?=\\s*\\()",
 			"end": "^",
 			"name": "meta.directive.variable.procedure.tiddlywiki5",
 			"beginCaptures": {
@@ -366,7 +366,7 @@
 		]
 		},
 		"rules": {
-		"match": "^(\\\\)(rules)\\s+(only|except)?(.*)$",
+		"match": "^\\s*(\\\\)(rules)\\s+(only|except)?(.*)$",
 		"name": "meta.directive.rules.tiddlywiki5",
 		"captures": {
 			"1": { "name": "punctuation.definition.directive.tiddlywiki5" },
@@ -378,7 +378,7 @@
 		}
 		},
 		"whitespace": {
-		"match": "^(\\\\)(whitespace)\\s+(trim|notrim)?$",
+		"match": "^\\s*(\\\\)(whitespace)\\s+(trim|notrim)?$",
 		"name": "meta.directive.whitespace.tiddlywiki5",
 		"captures": {
 			"1": { "name": "punctuation.definition.directive.tiddlywiki5" },
@@ -390,7 +390,7 @@
 		"patterns": [
 			{
 			"comment": "Single and Multi-line widget definition",
-			"begin": "^(\\\\)(widget)\\s+((\\$)(?!:\\/)[^\\s\\(]+)(?=\\s*\\()",
+			"begin": "^\\s*(\\\\)(widget)\\s+((\\$)(?!:\\/)[^\\s\\(]+)(?=\\s*\\()",
 			"end": "^",
 			"name": "meta.directive.variable.widget.tiddlywiki5",
 			"beginCaptures": {

tests/samples/tiddlywiki5.pragma.tw

@@ -1,4 +1,30 @@
 <!-- tiddlywiki5 -->
+\procedure saveNewWikiActions()
+    \procedure saveNewWikiCallback()
+        \procedure failureHandler()
+        <$action-log status="error saving new wiki to the server"/>
+        <$action-setfield $tiddler={{{ [[$:/temp/webdav/error/]addsuffix<now [UTC]YYYY0MM0DD0hh0mm0ssXXX]>] }}} text={{{ [[There was an error creating the new wiki. ]addsuffix<error>] }}} component="WebDAV save new wiki" tags="$:/tags/Alert"/>
+        \end failureHandler
+    <$list filter="201 204 :intersection[<status>]" variable="null" emptyMessage=<<saveNewWikiCallbackFailure>> >
+        <$action-sendmessage $message="tm-notify" $param="$:/plugins/sq/webdav-utils/ui/templates/wiki-created" path=<<destinationURL>> />
+        <$action-deletetiddler $filter="$:/temp/sq/fs/new-wiki-template-url $:/temp/sq/fs/new-wiki-name"/>
+        <$action-sendmessage $message="tm-webdav-ls" $param={{{ [<destinationURL>split[/]butlast[]join[/]trim[/]!is[blank]addsuffix[/]addprefix[/]] :else[[/]] }}} />
+    </$list>
+    \end saveNewWikiCallback
+<$wikify name="myplugins" text={{$:/plugins/sq/webdav-utils/templates/new-wiki-plugins}}>
+    <$action-sendmessage
+        $message="tm-http-request"
+        method="PUT"
+        bind-status="$:/state/webdav/http-status"
+        oncompletion=<<saveNewWikiCallback>>
+        url=<<destinationURL>>
+        body={{{ [<data>addprefix<myplugins>] }}}
+        var-destinationURL=<<destinationURL>>
+        >
+</$wikify>
+\end saveNewWikiActions
+
+
 \import [[test]]
 \define myMacro1(param:test, param:"""Test""", param: [[Test]]) test $test$ $(fnord)$