Menu
▾
▴
colorer-commits
|
From: <laz...@us...> - 2013-05-06 14:25:44
|
Revision: 1959
http://sourceforge.net/p/colorer/svn/1959
Author: lazyeugene
Date: 2013-05-06 14:25:40 +0000 (Mon, 06 May 2013)
Log Message:
-----------
* smarty open/closed comment tag paires
Modified Paths:
--------------
trunk/schemes/hrc/hrc/inet/smarty.hrc
Modified: trunk/schemes/hrc/hrc/inet/smarty.hrc
===================================================================
--- trunk/schemes/hrc/hrc/inet/smarty.hrc 2013-05-06 08:57:23 UTC (rev 1958)
+++ trunk/schemes/hrc/hrc/inet/smarty.hrc 2013-05-06 14:25:40 UTC (rev 1959)
@@ -34,6 +34,7 @@
<scheme name="smartyComment">
<block start="/\{\*/" end="/\*\}/" scheme="Comment"
region="def:Comment"
+ region00="PairStart" region10="PairEnd"
/>
</scheme>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <laz...@us...> - 2013-05-09 08:23:41
|
Revision: 1960
http://sourceforge.net/p/colorer/svn/1960
Author: lazyeugene
Date: 2013-05-09 08:23:35 +0000 (Thu, 09 May 2013)
Log Message:
-----------
* parameters highlighting, some improvements
Modified Paths:
--------------
trunk/schemes/hrc/hrc/inet/smarty.hrc
Modified: trunk/schemes/hrc/hrc/inet/smarty.hrc
===================================================================
--- trunk/schemes/hrc/hrc/inet/smarty.hrc 2013-05-06 14:25:40 UTC (rev 1959)
+++ trunk/schemes/hrc/hrc/inet/smarty.hrc 2013-05-09 08:23:35 UTC (rev 1960)
@@ -31,12 +31,18 @@
<scheme name="smartyEscape">
<regexp match="/\x20[\{\}]\x20/" region="def:Text"/>
</scheme>
- <scheme name="smartyComment">
- <block start="/\{\*/" end="/\*\}/" scheme="Comment"
- region="def:Comment"
+ <scheme name="smartyCommentInner">
+ <block start="/\{\*/" end="/\*\}/"
+ content-priority="low"
+ region="def:Comment" scheme="Comment"
region00="PairStart" region10="PairEnd"
/>
</scheme>
+ <scheme name="smartyComment">
+ <block start="/\M\{\*/" end="/(\*\})?#2/" scheme="smartyCommentInner"
+ region="Insertion" content-priority="low"
+ />
+ </scheme>
@@ -67,9 +73,136 @@
/>
</scheme>
+ <!-- by bigvax -->
+ <scheme name="smartyParams">
+ <keywords ignorecase="yes" region="def:Parameter">
+ <word name="above"/>
+ <word name="all_extra"/>
+ <word name="assign"/>
+ <word name="autostatus"/>
+ <word name="autostatuscap"/>
+ <word name="background"/>
+ <word name="below"/>
+ <word name="bgbackground"/>
+ <word name="bgcolor"/>
+ <word name="border"/>
+ <word name="caparray"/>
+ <word name="capicon"/>
+ <word name="caption"/>
+ <word name="captionfont"/>
+ <word name="captionsize"/>
+ <word name="center"/>
+ <word name="closecolor"/>
+ <word name="closefont"/>
+ <word name="closesize"/>
+ <word name="closetext"/>
+ <word name="day_extra"/>
+ <word name="day_format"/>
+ <word name="day_size"/>
+ <word name="delay"/>
+ <word name="detection"/>
+ <word name="display_days"/>
+ <word name="display_hours"/>
+ <word name="display_meridian"/>
+ <word name="display_minutes"/>
+ <word name="display_months"/>
+ <word name="display_seconds"/>
+ <word name="display_years"/>
+ <word name="end_year"/>
+ <word name="equation"/>
+ <word name="fgbackground"/>
+ <word name="fgcolor"/>
+ <word name="field_array"/>
+ <word name="field_extra"/>
+ <word name="field_separator"/>
+ <word name="file"/>
+ <word name="fixx"/>
+ <word name="fixy"/>
+ <word name="format"/>
+ <word name="frame"/>
+ <word name="from"/>
+ <word name="fullhtml"/>
+ <word name="hauto"/>
+ <word name="height"/>
+ <word name="id"/>
+ <word name="inarray"/>
+ <word name="item"/>
+ <word name="left"/>
+ <word name="loop"/>
+ <word name="minute_interval"/>
+ <word name="month_format"/>
+ <word name="month_size"/>
+ <word name="name"/>
+ <word name="noclose"/>
+ <word name="offsetx"/>
+ <word name="offsety"/>
+ <word name="options"/>
+ <word name="output"/>
+ <word name="padx"/>
+ <word name="pady"/>
+ <word name="prefix"/>
+ <word name="print"/>
+ <word name="reverse_years"/>
+ <word name="right"/>
+ <word name="seconds_interval"/>
+ <word name="selected"/>
+ <word name="skip"/>
+ <word name="snapx"/>
+ <word name="snapy"/>
+ <word name="start"/>
+ <word name="start_year"/>
+ <word name="status"/>
+ <word name="sticky"/>
+ <word name="text"/>
+ <word name="textcolor"/>
+ <word name="textfont"/>
+ <word name="textsize"/>
+ <word name="time"/>
+ <word name="timeout"/>
+ <word name="trigger"/>
+ <word name="value"/>
+ <word name="values"/>
+ <word name="var"/>
+ <word name="vauto"/>
+ <word name="width"/>
+ </keywords>
+ </scheme>
+
+ <scheme name="smartyFilters">
+ <keywords ignorecase="yes" region="def:Keyword">
+ <word name="capitalize"/>
+ <word name="cat"/>
+ <word name="count_characters"/>
+ <word name="count_paragraphs"/>
+ <word name="count_sentences"/>
+ <word name="count_words"/>
+ <word name="date_format"/>
+ <word name="default"/>
+ <word name="escape"/>
+ <word name="from_charset"/>
+ <word name="indent"/>
+ <word name="lower"/>
+ <word name="nl2br"/>
+ <word name="regex_replace"/>
+ <word name="replace"/>
+ <word name="spacify"/>
+ <word name="string_format"/>
+ <word name="strip"/>
+ <word name="strip_tags"/>
+ <word name="to_charset"/>
+ <word name="truncate"/>
+ <word name="unescape"/>
+ <word name="upper"/>
+ <word name="wordwrap"/>
+ </keywords>
+ </scheme>
+
+ <!-- /by bigvax -->
<scheme name="smartyVars">
<regexp match="/\$(smarty)\b/" region="def:Var" region1="def:Constant"/>
- <regexp match="/\$(\w+)/" region="def:Var"/>
+ <regexp match="/\$(\w+)\b/" region="def:Var"/>
+ <regexp match="/(->)?#2(\w+)\b/" region="def:Var"/>
+ <regexp match="/\.?#1(\w+)\b/" region="def:Var"/>
</scheme>
<scheme name="Expressions">
<regexp match="/(-(\d|\.\d)?=)?\d*(\.\d+)?/" region="def:Number"/>
@@ -92,46 +225,65 @@
<keywords region="SymbolStrong">
<symb name="|"/>
</keywords>
- <regexp match="/\|?#1(capitalize|cat|count_characters|count_paragraphs|count_sentences|count_words|date_format|default|escape|from_charset|indent|lower|nl2br|regex_replace|replace|spacify|
- string_format|strip|strip_tags|to_charset|truncate|unescape|upper|wordwrap)\b/x"
- region1="def:Keyword" />
+ <block start="/\|?#1\M\w+\b/" end="/[^\w]?=/" scheme="smartyFilters" />
<inherit scheme="smartyVars"/>
<inherit scheme="Parenthes" />
+ <block start="/\M\b\w+=?=/" end="/\M=/" scheme="smartyParams"/>
</scheme>
<scheme name="Script">
- <block start="/\s*((block|capture|function|for\b|literal|nocache|php|setfilter|strip|while))/" end="/(\/\Y2)/"
+ <block start="/\s*\b((block|capture|function|for\b|literal|nocache|setfilter|strip|while))\b/" end="/(\/\Y2)/"
region01="PairStart" region10="PairEnd"
region02="def:Keyword" region11="def:Keyword"
scheme="Script" priority="low"
/>
- <block start="/(((\{)?#1\s*foreach|(foreach)?#7else))/" end="/(\{)?#1\s*((foreach(else)?=|\/foreach))/"
- region01="PairStart" region12="PairEnd"
- region02="def:Keyword" region13="def:Keyword"
+ <block start="/((\{?#1\s*foreach|(\{foreach)?#8else))\b/x" end="/\{?#1\s*((foreach(else\b)?=|\/foreach\b))/x"
+ region01="PairStart" region11="PairEnd"
+ region02="def:Keyword" region12="def:Keyword"
scheme="Script" priority="low"
/>
- <block start="/(((\{)?#1\s*section|(section)?#7else))/" end="/(\{)?#1\s*((section(else)?=|\/section))/"
- region01="PairStart" region12="PairEnd"
- region02="def:Keyword" region13="def:Keyword"
+ <block start="/((\{?#1\s*section|(\{section)?#8else))\b/x" end="/\{?#1\s*((section(else\b)?=|\/section\b))/x"
+ region01="PairStart" region11="PairEnd"
+ region02="def:Keyword" region12="def:Keyword"
scheme="Script" priority="low"
/>
- <block start="/(((\{)?#1\s*if|(el)?#2se|(else)?#4if))/" end="/(\{)?#1\s*((else(if)?=|el(se)?=|\/if))/"
- region01="PairStart" region12="PairEnd"
- region02="def:Keyword" region13="def:Keyword"
+ <block start="/((\{?#1\s*if|(\{el)?#3se|(\{else)?#5if))\b/" end="/\{?#1\s*((else(if\b)?=|el(se\b)?=|\/if\b))/"
+ region01="PairStart" region11="PairEnd"
+ region02="def:Keyword" region12="def:Keyword"
scheme="Script" priority="low"
/>
- <regexp match="/(\{)?#1 (append|assign|call|config_load|debug|extends|include|include_php|insert|[lr]delim)/x"
- region2="def:Keyword"
+ <regexp match="/\{?#1 (append|assign|call|config_load|debug|extends|include|include_php|insert|[lr]delim)/x"
+ region1="def:Keyword"
/>
+
<inherit scheme="Expressions" />
- <regexp match="/(\{\/)?#2(block|capture|function|for\b|if|literal|nocache|php|setfilter|strip|while)/x" region="def:Error" priority="low" />
- <regexp match="/\{?#1\s*(else|elseif) /x" region="def:Error" priority="low" />
+ <regexp match="/(\{\/)?#2(block|capture|function|for|if|literal|nocache|php|setfilter|strip|while)\b/x" region="def:Error" priority="low" />
+ <regexp match="/\{?#1\s*(else|elseif)\b /x" region="def:Error" priority="low" />
</scheme>
+ <scheme name="smartyPhpInsertion">
+ <block start="/(\{(php)\})/" end="/(\{(\/php)\})/" scheme="smarty"
+ priority="low" content-priority="low"
+ region="Insertion"
+ region00="OpenTag" region10="CloseTag"
+ region01="def:PairStart" region11="def:PairEnd"
+ region02="def:Keyword" region12="def:Keyword"
+ />
+ </scheme>
+ <scheme name="smartyPhpInverseInsertion"></scheme>
+ <scheme name="smartyPhp">
+ <inherit scheme="php:phpScript">
+ <virtual scheme="php:Insertion" subst-scheme="smartyPhpInsertion" />
+ <virtual scheme="php:InverseInsertion" subst-scheme="smartyPhpInverseInsertion" />
+ </inherit>
+ </scheme>
+
<scheme name="Insertion">
<inherit scheme="smartyEscape" />
<inherit scheme="smartyComment" />
+ <inherit scheme="smartyPhpInsertion"/>
+
<block start="/(\{)/" end="/(\})/"
priority="low" content-priority="low"
scheme="smartyScript" region="Insertion"
@@ -139,7 +291,6 @@
/>
</scheme>
-
<scheme name="InverseInsertion">
<block start="/(\})/" end="/(\{)/" scheme="html"
priority="low" region="Text" inner-region="yes"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X