[jboss-svn-commits] JBL Code SVN: r14517 - labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2007-08-24 05:52:06 -0400 (Fri, 24 Aug 2007)
New Revision: 14517

Modified:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/CompletionContext.java
Log:
JBRULES-1063: Failing location determination tests
 - updated location determination to fix tests

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/CompletionContext.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/CompletionContext.java	2007-08-24 09:52:02 UTC (rev 14516)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/CompletionContext.java	2007-08-24 09:52:06 UTC (rev 14517)
@@ -46,6 +46,12 @@
     static final Pattern ENDS_WITH_SPACES                    = Pattern.compile( ".*\\s+",
                                                                                 Pattern.DOTALL );
 
+    static final Pattern ENDS_WITH_COLON                     = Pattern.compile( ".*:\\s*",
+            																	Pattern.DOTALL );
+
+    static final Pattern ENDS_WITH_BRACKET                   = Pattern.compile( ".*\\)\\s*",
+																				Pattern.DOTALL );
+
     static final Pattern MVEL_DIALECT_PATTERN                        = Pattern.compile( ".*dialect\\s+\"mvel\".*",
                                                                                 Pattern.DOTALL );
 
@@ -131,7 +137,8 @@
                                                       Location location,
                                                       String backText) {
         if ( location.getType() == Location.LOCATION_LHS_INSIDE_CONDITION_OPERATOR ) {
-            if ( !ENDS_WITH_SPACES.matcher( backText ).matches() ) {
+            if ( !ENDS_WITH_SPACES.matcher( backText ).matches() 
+            	 || ENDS_WITH_COLON.matcher( backText ).matches()) {
                 location.setType( Location.LOCATION_LHS_INSIDE_CONDITION_START );
             }
         } else if ( location.getType() == Location.LOCATION_LHS_INSIDE_CONDITION_END ) {
@@ -163,7 +170,9 @@
             if ( location.getProperty( Location.LOCATION_FROM_CONTENT ) == null ) {
                 location.setProperty( Location.LOCATION_FROM_CONTENT,
                                       "" );
-            } else if ( ((String) location.getProperty( Location.LOCATION_FROM_CONTENT )).length() > 0 && ENDS_WITH_SPACES.matcher( backText ).matches() ) {
+            } else if ( ((String) location.getProperty( Location.LOCATION_FROM_CONTENT )).length() > 0
+            		    && (ENDS_WITH_SPACES.matcher( backText ).matches()
+            		    	|| ENDS_WITH_BRACKET.matcher( backText ).matches() )) {
                 location.setType( Location.LOCATION_LHS_BEGIN_OF_CONDITION );
             }
         } else if ( location.getType() == Location.LOCATION_LHS_FROM_ACCUMULATE_INIT ) {