Revert "Fixed container.class definition to handle multiline situatio…

…ns." This reverts commit 10cdee7.
derekr · Jul 15, 2010 · 4b6168f · 4b6168f
1 parent 129fa58
commit 4b6168f
Showing 1 changed file with 32 additions and 27 deletions.
diff --git a/XML Based/Syntaxes/PHP.xml b/XML Based/Syntaxes/PHP.xml
@@ -576,34 +576,39 @@ THE SOFTWARE.
 
         <collection name="container.class">
             <zone name="container.class">
-            			<expression>(\b((abstract)|(final))?\s+(class)\s+([a-zA-Z0-9_]+))</expression>
-	                    <capture number="3" name="keyword.modifier.scope.abstract" />
-	                    <capture number="4" name="keyword.modifier.scope.final" />
-	                    <capture number="5" name="keyword.definition.class" />
-	                    <capture number="6" name="name" />
+            		<starts-with>
+            			<expression>(?i)^(\b(abstract|final|interface)?\s*(class)\s*([a-z0-9_]+))</expression>
+            			<capture number="1" name="class.current" />
+	                    <capture number="2" name="keyword.modifier.scope" />
+	                    <capture number="3" name="keyword.definition.class.begin" />
+	                    <capture number="4" name="name" />
+            		</starts-with>
+            		<ends-with>
+            			<expression>$</expression>
+            		</ends-with>
+
+                    <subzones>
+                    	<zone name="identifier.support.class.extended">
+                    		<expression>((?i:(extends))\s+([a-zA-Z0-9_]+))</expression>
+                    		<capture number="2" name="literal.keyword.modifier.scope.extends" />
+                    		<capture number="3" name="name" />
+                    	</zone>
+                    	<zone name="identifier.support.class.implemented">
+                    		<starts-with>
+                    			<expression>(?i:(implements))</expression>
+                    			<capture number="1" name="literal.keyword.modifier.scope.implements" />
+                    		</starts-with>
+                    		<ends-with>
+                    			<expression>$</expression>
+                    		</ends-with>
+                    		<subzones>
+                    			<zone name="class.name">
+                    				<expression>(([a-zA-Z0-9_]+)(?=(,?)))+</expression>
+                    			</zone>
+                    		</subzones>
+                    	</zone>
+                    </subzones>
             </zone>
-            <zone name="container.class">
-        		<expression>((?i:(extends))\s+([a-zA-Z0-9_]+))</expression>
-        		<capture number="0" name="identifier.support.class.extended" />
-        		<capture number="2" name="literal.keyword.modifier.scope.extends" />
-        		<capture number="3" name="name" />
-        	</zone>
-            <zone name="container.class">
-        		<starts-with>
-        			<expression>(?i:(implements))</expression>
-        			<capture number="0" name="identifier.support.class.implemented" />
-        			<capture number="1" name="literal.keyword.modifier.scope.extends" />
-        		</starts-with>
-        		<ends-with>
-        			<expression>$</expression>
-        		</ends-with>
-        		<subzones>
-        			<zone name="class.name">
-        				<expression>(([a-zA-Z0-9_]+)(?=(,?)))+</expression>
-        			</zone>
-        		</subzones>
-        	</zone>
-
         </collection>
 
         <collection name="container.block">