@@ -8,7 +8,7 @@ CodeSense Providers map contexts in a document to possible completions. The actu
<!-- ColdFusion tags -->
<provider>
- <selector>sourcecode.cfm - *, meta.tag.self-closing.cfm, meta.tag.cfoutput.cfm, meta.tag.cfquery.cfm, meta.tag.any.cfm</selector>
+ <selector>sourcecode.cfm - *, meta.tag.cfoutput.cfm, meta.tag.cfquery.cfm, meta.tag.self-closing.cfm, meta.tag.open.other.cfm</selector>
<completions>com.scottmebberson.cfml.tags</completions>
<complete-match capture="2">(<)([a-zA-Z0-9-]*)</complete-match>
<require-suffix>(\s|>|^)</require-suffix>
@@ -16,7 +16,7 @@ CodeSense Providers map contexts in a document to possible completions. The actu
<!-- HTML attributes -->
<provider>
- <selector>meta.tag.any.cfm:has-child(name:capture(tag))</selector>
+ <selector>meta.tag.open.cfm:has-child(name:capture(tag)) > attribute-name, meta.tag.open.cfm:has-child(name:capture(tag)) > punctuation.definition.end, meta.tag.open.cfm:has-child(name:capture(tag))</selector>
<completions>com.scottmebberson.cfml.tag.${tag}.attributes</completions>
<complete-match capture="2">(\s)([a-zA-Z0-9-]*)</complete-match>
<require-suffix>(\s|=|>|^)</require-suffix>
CodeSenseProviders/ColdFusion.xml
@@ -52,7 +52,7 @@
<zone name="meta.tag.self-closing.cfm">
<starts-with>
- <expression>(<)(cfabort|cfset|cfargument|cfreturn)</expression>
+ <expression>(<)((?i:cf)(abort|else|set|argument|return))</expression>
<capture number="1" name="punctuation.definition.begin"/>
<capture number="2" name="entity.name.tag.cfm"/>
</starts-with>
@@ -66,19 +66,53 @@
</subzones>
</zone>
- <zone name="meta.tag.any.cfm">
+ <zone name="meta.tag.open.other.cfm">
<starts-with>
- <expression></?((?i:cf)([a-zA-Z0-9]+))(?=[^>]*>)</expression>
- <capture number="1" name="entity.name.tag.cfm"/>
+ <expression>(<)((?i:cf)([a-zA-Z0-9]+))(?=[^>]*>)</expression>
+ <capture number="1" name="punctuation.definition.begin"/>
+ <capture number="2" name="entity.name.tag.cfm"/>
</starts-with>
<ends-with>
- <expression>></expression>
+ <expression>(/?)(>)</expression>
+ <capture number="1" name="punctuation.definition.end.self-closing"/>
+ <capture number="2" name="punctuation.definition.end"/>
+ </ends-with>
+ <subzones>
+ <include collection="tag-stuff"/>
+ </subzones>
+ </zone>
+
+ <zone name="meta.tag.close.other.cfm">
+ <starts-with>
+ <expression>(</)((?i:cf)([a-zA-Z0-9]+))(?=[^>]*>)</expression>
+ <capture number="1" name="punctuation.definition.begin"/>
+ <capture number="2" name="entity.name.tag.cfm"/>
+ </starts-with>
+ <ends-with>
+ <expression>(>)</expression>
+ <capture number="2" name="punctuation.definition.end"/>
</ends-with>
<subzones>
<include collection="tag-stuff"/>
</subzones>
</zone>
+ <!-- zone name="meta.tag.any.cfm">
+ <starts-with>
+ <expression>(<)/?((?i:cf)([a-zA-Z0-9]+))(?=[^>]*>)</expression>
+ <capture number="1" name="punctuation.definition.begin"/>
+ <capture number="2" name="entity.name.tag.cfm"/>
+ </starts-with>
+ <ends-with>
+ <expression>(/?)(>)</expression>
+ <capture number="1" name="punctuation.definition.end.self-closing"/>
+ <capture number="2" name="punctuation.definition.end"/>
+ </ends-with>
+ <subzones>
+ <include collection="tag-stuff"/>
+ </subzones>
+ </zone -->
+
<include collection="coldfusion-comment"/>
<!-- include syntax="text.html.basic"/ -->
@@ -134,10 +168,28 @@
</subzones>
</zone>
</collection>
- <collection name="tag-generic-attribute">
+ <!-- collection name="tag-generic-attribute">
<zone name="entity.other.attribute-name.cfm">
<expression>\b([a-zA-Z\-:]+)</expression>
</zone>
+ </collection -->
+ <collection name="tag-attributes">
+ <zone>
+ <expression>\s+([-_a-zA-Z0-9:]+)(=)</expression>
+ <capture number="1" name="attribute-name">
+ <subzones>
+ <zone>
+ <expression>([^:]+)(:)(.*)</expression>
+ <capture number="1" name="namespace"/>
+ <capture number="2" name="punctuation.separator"/>
+ <capture number="3" name="localname"/>
+ </zone>
+ </subzones>
+ </capture>
+ <capture number="2" name="punctuation.separator.attribute"/>
+ <capture number="3" name="punctuation.separator.namespace"/>
+ </zone>
+ <include collection="strings"/>
</collection>
<collection name="tag-id-attribute">
<zone name="meta.attribute-with-value.id.cfm">
@@ -179,7 +231,7 @@
</collection>
<collection name="tag-stuff">
<include collection="tag-id-attribute"/>
- <include collection="tag-generic-attribute"/>
+ <include collection="tag-attributes"/>
<include collection="string-double-quoted"/>
<include collection="string-single-quoted"/>
<include collection="embedded-code"/>
Syntaxes/ColdFusionSyntax.xml
65bbf5a06766766c45f36450a056e6540a42cb7a
Scott Mebberson
scott@scottmebberson.com
http://github.com/smebberson/coldfusion.sugar/commit/84362b94b3b2a7c9aaa9fc7b732cfe9f60224bbd
84362b94b3b2a7c9aaa9fc7b732cfe9f60224bbd
2009-04-21T06:40:52-07:00
2009-04-21T06:40:52-07:00
Completely restructure core ColdFusion Syntax definitions
Modelled the changes on the XML+HTML sugar
Fixed a problem with attribute hinting appearing after the spacebar within the tag child i.e. <>...</>, rather than within the tag itself as it should be i.e. <...></>
f973116cc4e867e5163a2c5584974ba5dbb41ab8
Scott Mebberson
scott@scottmebberson.com