[Pydev-cvs] org.python.pydev.core/src/org/python/pydev/core/docutils PySelection.java, 1.45, 1.46

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

Update of /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/docutils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23359/src/org/python/pydev/core/docutils

Modified Files:
	PySelection.java 
Log Message:


Index: PySelection.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.core/src/org/python/pydev/core/docutils/PySelection.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** PySelection.java	25 Feb 2007 23:23:38 -0000	1.45
--- PySelection.java	1 Mar 2007 02:35:03 -0000	1.46
***************
*** 1570,1574 ****
  	
  	public boolean isInFunctionLine() {
! 		return FunctionPattern.matcher(getToColon().trim()).matches();
  	}
  
--- 1570,1582 ----
  	
  	public boolean isInFunctionLine() {
! 		String line = getLine();
!         if(line.startsWith("def ") || line.indexOf(" def ") != -1 || line.indexOf("\tdef ") != -1){
!             return true;
!         }
!         return false;
! 	}
! 	
! 	public static boolean isIdentifier(String str) {
! 	    return IdentifierPattern.matcher(str).matches();
  	}
  
***************
*** 1576,1589 ****
  		return ClassPattern.matcher(getToColon().trim()).matches();
  	}
! 
! 	//(\\s|\\w|\\.|\\,|\\=|\\*)
! 	//(\\s|\\w)
! 	
! 	//spaces* 'def' space+ identifier space* ( (space|char|.|,|=|*|(|))* ):
!     private static final Pattern FunctionPattern = Pattern.compile("\\s*def\\s+\\w*\\s*\\((\\s|\\w|\\.|\\,|\\=|\\*|\\(|\\))*\\)\\s*:");
  
      //spaces* 'class' space+ identifier space* (? (.|char|space |,)* )?
      private static final Pattern ClassPattern = Pattern.compile("\\s*class\\s+\\w*\\s*\\(?(\\s|\\w|\\.|\\,)*\\)?\\s*:");
  
  
      public static boolean isCommentLine(String line) {
--- 1584,1598 ----
  		return ClassPattern.matcher(getToColon().trim()).matches();
  	}
! //
! //	//(\\s|\\w|\\.|\\,|\\=|\\*)
! //	//(\\s|\\w)
! //	
! //	//spaces* 'def' space+ identifier space* ( (space|char|.|,|=|*|(|)|'|")* ):
! //    private static final Pattern FunctionPattern = Pattern.compile("\\s*def\\s+\\w*\\s*\\(.*\\)\\s*:");
  
      //spaces* 'class' space+ identifier space* (? (.|char|space |,)* )?
      private static final Pattern ClassPattern = Pattern.compile("\\s*class\\s+\\w*\\s*\\(?(\\s|\\w|\\.|\\,)*\\)?\\s*:");
  
+     private static final Pattern IdentifierPattern = Pattern.compile("\\w*");
  
      public static boolean isCommentLine(String line) {