@@ -10,6 +10,8 @@
<string>(<(php|html|file|nowiki)>|<code(\s*.*)?>)|/\*\*|\{\s*$</string>
<key>foldingStopMarker</key>
<string>(</(code|php|html|file|nowiki)>)|\*\*/|^\s*\}</string>
+ <key>keyEquivalent</key>
+ <string>^~D</string>
<key>name</key>
<string>DokuWiki</string>
<key>patterns</key>
@@ -188,11 +190,21 @@
<string>(\<)(file|nowiki)(\>)</string>
<key>captures</key>
<dict>
+ <key>0</key>
+ <dict>
+ <key>name</key>
+ <string>meta.tag.template.dokuwiki</string>
+ </dict>
<key>1</key>
<dict>
<key>name</key>
<string>punctuation.definition.tag.dokuwiki</string>
</dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>entity.name.tag.dokuwiki</string>
+ </dict>
<key>3</key>
<dict>
<key>name</key>
@@ -222,9 +234,14 @@
</dict>
<dict>
<key>begin</key>
- <string>(<)html(>)</string>
+ <string>(<)(html)(>)</string>
<key>captures</key>
<dict>
+ <key>0</key>
+ <dict>
+ <key>name</key>
+ <string>meta.tag.template.block.dokuwiki</string>
+ </dict>
<key>1</key>
<dict>
<key>name</key>
@@ -233,11 +250,16 @@
<key>2</key>
<dict>
<key>name</key>
+ <string>entity.name.tag.dokuwiki</string>
+ </dict>
+ <key>3</key>
+ <dict>
+ <key>name</key>
<string>punctuation.definition.tag.dokuwiki</string>
</dict>
</dict>
<key>end</key>
- <string>(</)html(>)</string>
+ <string>(</)(html)(>)</string>
<key>patterns</key>
<array>
<dict>
@@ -257,11 +279,21 @@
<string>(\<)(sub|sup|del)(\>)</string>
<key>captures</key>
<dict>
+ <key>0</key>
+ <dict>
+ <key>name</key>
+ <string>meta.tag.template.dokuwiki</string>
+ </dict>
<key>1</key>
<dict>
<key>name</key>
<string>punctuation.definition.tag.dokuwiki</string>
</dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>entity.name.tag.dokuwiki</string>
+ </dict>
<key>3</key>
<dict>
<key>name</key>
@@ -282,9 +314,14 @@
</dict>
<dict>
<key>begin</key>
- <string>(<)code(?:\s+[^>]*)?(>)</string>
+ <string>(<)(code)(?:\s+[^>]*)?(>)</string>
<key>captures</key>
<dict>
+ <key>0</key>
+ <dict>
+ <key>name</key>
+ <string>meta.tag.template.code.dokuwiki</string>
+ </dict>
<key>1</key>
<dict>
<key>name</key>
@@ -293,11 +330,16 @@
<key>2</key>
<dict>
<key>name</key>
+ <string>entity.name.tag.dokuwiki</string>
+ </dict>
+ <key>3</key>
+ <dict>
+ <key>name</key>
<string>punctuation.definition.tag.dokuwiki</string>
</dict>
</dict>
<key>end</key>
- <string>(</)code(>)</string>
+ <string>(</)(code)(>)</string>
<key>name</key>
<string>markup.raw.dokuwiki</string>
</dict>
@@ -490,68 +532,109 @@
<key>patterns</key>
<array>
<dict>
- <key>applyEndPatternLast</key>
- <integer>1</integer>
- <key>begin</key>
- <string>(?:^\s*)(?=<\?(?i:php|=)?(?!.*\?>))</string>
- <key>comment</key>
- <string>match only multi-line PHP with leading whitespace</string>
- <key>end</key>
- <string>(?<=\?>)(?:\s*$\n)?</string>
- <key>name</key>
- <string>source.php.embedded.dokuwiki</string>
- <key>patterns</key>
- <array>
- <dict>
- <key>include</key>
- <string>source.php</string>
- </dict>
- </array>
- </dict>
- <dict>
- <key>applyEndPatternLast</key>
- <integer>1</integer>
- <key>begin</key>
- <string>(?=<\?(?i:php|=)?)</string>
- <key>end</key>
- <string>(?<=\?>)</string>
- <key>name</key>
- <string>source.php.embedded.dokuwiki</string>
- <key>patterns</key>
- <array>
- <dict>
- <key>include</key>
- <string>source.php</string>
- </dict>
- </array>
+ <key>include</key>
+ <string>source.php</string>
</dict>
<dict>
- <key>applyEndPatternLast</key>
- <integer>1</integer>
<key>begin</key>
- <string>(<)php(>)</string>
- <key>captures</key>
+ <string>(^\s*)?(?=<php>)</string>
+ <key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
- <string>punctuation.definition.tag.dokuwiki</string>
+ <string>punctuation.whitespace.embedded.leading.dokuwiki</string>
</dict>
- <key>2</key>
+ </dict>
+ <key>contentName</key>
+ <string>meta.embedded.php</string>
+ <key>end</key>
+ <string>(?<=</php>)(?!<php>)(\s*$\n?)</string>
+ <key>endCaptures</key>
+ <dict>
+ <key>1</key>
<dict>
<key>name</key>
- <string>punctuation.definition.tag.dokuwiki</string>
+ <string>punctuation.whitespace.embedded.trailing.dokuwiki</string>
</dict>
</dict>
- <key>end</key>
- <string>(</)php(>)</string>
- <key>name</key>
- <string>source.php.embedded.dokuwiki</string>
<key>patterns</key>
<array>
<dict>
- <key>include</key>
+ <key>begin</key>
+ <string>((<)(php)(>))</string>
+ <key>beginCaptures</key>
+ <dict>
+ <key>0</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.embedded.begin.dokuwiki</string>
+ </dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>meta.tag.template.dokuwiki</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.tag.dokuwiki</string>
+ </dict>
+ <key>3</key>
+ <dict>
+ <key>name</key>
+ <string>entity.name.tag.dokuwiki</string>
+ </dict>
+ <key>4</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.tag.dokuwiki</string>
+ </dict>
+ </dict>
+ <key>contentName</key>
<string>source.php</string>
+ <key>end</key>
+ <string>(((</))(php)(>))</string>
+ <key>endCaptures</key>
+ <dict>
+ <key>0</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.embedded.end.dokuwiki</string>
+ </dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>meta.tag.template.dokuwiki</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.tag.dokuwiki</string>
+ </dict>
+ <key>3</key>
+ <dict>
+ <key>name</key>
+ <string>source.php</string>
+ </dict>
+ <key>4</key>
+ <dict>
+ <key>name</key>
+ <string>entity.name.tag.dokuwiki</string>
+ </dict>
+ <key>5</key>
+ <dict>
+ <key>name</key>
+ <string>punctuation.definition.tag.dokuwiki</string>
+ </dict>
+ </dict>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>include</key>
+ <string>source.php</string>
+ </dict>
+ </array>
</dict>
</array>
</dict>
Bundles/DokuWiki.tmbundle/Syntaxes/DokuWiki.tmLanguage
73cfa59723f08906a7c7019a013b5cb8a77e3e15
msheets
msheets@dfb7d73b-c2ec-0310-8fea-fb051d288c6d
http://github.com/kballard/textmate-bundles/commit/424fa288ef94e460f1e2d31af73293d8fc41151c
424fa288ef94e460f1e2d31af73293d8fc41151c
2007-09-24T02:03:38-07:00
2007-09-24T02:03:38-07:00
• Use new meta.tag.template scope on tags.
• Greatly improve tag scoping.
• Remove standard php tag matching, with the restructured PHP language we can now just include it.
• Add new embedded scopes to rewritten <php> tag.
git-svn-id: http://macromates.com/svn/Bundles/trunk@8215 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
05a973228dc7a3799bac5a011511b584ee7e9f4e
msheets
msheets@dfb7d73b-c2ec-0310-8fea-fb051d288c6d