[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics AssistAssign.java, 1.13, 1.14

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29242/src/org/python/pydev/editor/correctionassist/heuristics

Modified Files:
	AssistAssign.java 
Log Message:
Assign to local variable/attribute handles constants correctly

Index: AssistAssign.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/correctionassist/heuristics/AssistAssign.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AssistAssign.java	24 Feb 2007 19:28:11 -0000	1.13
--- AssistAssign.java	30 Aug 2007 01:26:49 -0000	1.14
***************
*** 82,85 ****
--- 82,86 ----
  
          String callName = getTokToAssign(ps, sel);
+         callName = changeToLowerUppercaseConstant(callName);
  
          if(callName.length() > 0){
***************
*** 89,92 ****
--- 90,95 ----
              }
              
+             callName = changeToCodingStd(callName);
+             
              for(int i=0;i<callName.length();i++){
                  char c = callName.charAt(i);
***************
*** 100,104 ****
          }
          
-         callName = changeToCodingStd(callName);
          String tok = callName;
  
--- 103,106 ----
***************
*** 113,125 ****
      }
  
      private String changeToCodingStd(String callName) {
          if(!this.std.localsAndAttrsCamelcase()){
              StringBuffer ret = new StringBuffer();
              char[] cs = callName.toCharArray();
              for(char c: cs){
                  if(Character.isUpperCase(c)){
!                     ret.append("_");
                      ret.append(Character.toLowerCase(c));
                  }else{
                      ret.append(c);
                  }
--- 115,146 ----
      }
  
+     private String changeToLowerUppercaseConstant(String callName) {
+         char[] cs = callName.toCharArray();
+         for(char c: cs){
+             if(Character.isLetterOrDigit(c) && !Character.isUpperCase(c)){
+                 return callName;
+             }
+         }
+         return callName.toLowerCase();
+     }
+ 
      private String changeToCodingStd(String callName) {
          if(!this.std.localsAndAttrsCamelcase()){
              StringBuffer ret = new StringBuffer();
              char[] cs = callName.toCharArray();
+             
+             boolean foundLower = false;
+             
              for(char c: cs){
                  if(Character.isUpperCase(c)){
!                     if(foundLower){
!                         ret.append('_');
!                     }
!                     foundLower = false;
                      ret.append(Character.toLowerCase(c));
                  }else{
+                     if(Character.isLowerCase(c)){
+                         foundLower = true;
+                     }
                      ret.append(c);
                  }