Permalink
Browse files

Fixed itemizer bugs. Had to get rid of control blocks displaying in t…

…he nav bar for now.
  • Loading branch information...
1 parent e953f31 commit 3498c452f6a88e99517af26b89ccba67807851ca @derekr committed Apr 30, 2009
Showing with 13 additions and 34 deletions.
  1. +11 −31 XML Based/Itemizers/PHP.xml
  2. +2 −3 test/class.php
@@ -29,7 +29,7 @@ THE SOFTWARE.
<recipe name="source.block.php.processing-instruction">
<class>ESBaseItem</class>
<start-selector>php.begin:capture(name) + *</start-selector>
- <end-selector>php.end:capture(name)</end-selector>
+ <end-selector>* + php.end:capture(name)</end-selector>
<subrecipes>
<include-root-recipes />
</subrecipes>
@@ -45,10 +45,15 @@ THE SOFTWARE.
</subrecipes>
</recipe>
- <!-- Defining a magic function -->
- <recipe name="container.function.magic">
+ <!-- Defining a custom function -->
+ <recipe name="container.function">
+ <class>ESBaseItem</class>
+ <selector>container.function:has-child(name:capture(name))</selector>
+ </recipe>
+
+ <recipe name="container.function.block.hidden">
<class>ESBaseItem</class>
- <start-selector>container.function.magic:has-child(name:capture(name)) + delimiter.balanced.curly-brace.begin:capture(itemizer-firstused)</start-selector>
+ <start-selector>container.function + delimiter.balanced.curly-brace.begin</start-selector>
<end-selector>delimiter.balanced.curly-brace.end</end-selector>
<subrecipes>
<include-root-recipes />
@@ -67,30 +72,11 @@ THE SOFTWARE.
<selector>keyword.constant.class + keyword.constant.other:capture(name)</selector>
</recipe>
- <!-- Defining a custom function -->
- <recipe name="container.function">
- <class>ESBaseItem</class>
- <start-selector>container.function:has-child(name:capture(name)) + delimiter.balanced.curly-brace.begin)</start-selector>
- <end-selector>delimiter.balanced.curly-brace.end</end-selector>
- <subrecipes>
- <include-root-recipes />
- </subrecipes>
- </recipe>
-
<!-- Defining control structures; (if, else, switch, for, foreach...)-->
- <recipe name="container.block">
- <class>ESBaseItem</class>
- <start-selector>container.block:capture(name) + delimiter.balanced.curly-brace.begin:capture(itemizer-firstused)</start-selector>
- <end-selector>delimiter.balanced.curly-brace.end</end-selector>
- <subrecipes>
- <include-root-recipes />
- </subrecipes>
- </recipe>
-
<recipe name="container.block.hidden">
<class>ESBaseItem</class>
- <start-selector>container.block > delimiter.balanced.parenthesis.begin</start-selector>
- <end-selector>container.block > delimiter.balanced.parenthesis.end</end-selector>
+ <start-selector>container.block + delimiter.balanced.curly-brace.begin</start-selector>
+ <end-selector>delimiter.balanced.curly-brace.end</end-selector>
<subrecipes>
<include-root-recipes />
</subrecipes>
@@ -120,12 +106,6 @@ THE SOFTWARE.
<end-selector>heredoc.end</end-selector>
</recipe>
- <!-- Defining an include -->
- <!-- <recipe name="include">
- <class>DRImportItem</class>
- <selector>:(keyword.include + string:has-child(content:capture(name)))</selector>
- </recipe> -->
-
<recipe name="built-in.comment">
<class>ESCommentItem</class>
<selector>comment.line</selector>
View
@@ -14,7 +14,7 @@
{
const NAME = 'test';
- public $varName = null;
+ public $varName = null
public function __construct($var, $var2 = null)
{
@@ -45,5 +45,4 @@ static public function customFunction($var, $var2 = null)
}
// test comments
}
- // test commment ?>
-
+ // test commment

0 comments on commit 3498c45

Please sign in to comment.