[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion PyCodeCompletionPreferencesPage.java,1.10,1.11 PythonCompletionProcessor.java,1.14,1.15 CompletionCache.java,1.12,1.13 PyCodeCompletion.java,1.23,1.24

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

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

Modified Files:
	PyCodeCompletionPreferencesPage.java 
	PythonCompletionProcessor.java CompletionCache.java 
	PyCodeCompletion.java 
Log Message:
Still on code completion...

Index: PyCodeCompletion.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCodeCompletion.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** PyCodeCompletion.java	20 Dec 2004 18:16:28 -0000	1.23
--- PyCodeCompletion.java	21 Dec 2004 18:31:15 -0000	1.24
***************
*** 128,139 ****
          
                  if(closest == null){
! //                    completions = serverShell.getTokenCompletions(trimmed,
! //                            docToParse);
                  }else{
                      Scope scope = closest.getScope().findContainingClass(); //null returned if self. within a method and not in a class.
                      String token = scope.getStartNode().getName();
! //                    completions = serverShell
! //                            .getClassCompletions(token, docToParse);
                  }
              } else {
                  if(theActivationToken.endsWith(".")){
--- 128,145 ----
          
                  if(closest == null){
!                     if(theActivationToken.endsWith(".")){
!                         theActivationToken = theActivationToken.substring(0, theActivationToken.length()-1);
!                     }
!     	            IToken[] comps = astManager.getCompletionsForToken(edit.getEditorFile(), doc, line, documentOffset - region.getOffset(), theActivationToken, "" );
!     	            theList.addAll(Arrays.asList(comps));
! 
                  }else{
                      Scope scope = closest.getScope().findContainingClass(); //null returned if self. within a method and not in a class.
                      String token = scope.getStartNode().getName();
!                     
!     	            IToken[] comps = astManager.getCompletionsForToken(edit.getEditorFile(), doc, line, documentOffset - region.getOffset(), token, "" );
!     	            theList.addAll(Arrays.asList(comps));
                  }
+                 
              } else {
                  if(theActivationToken.endsWith(".")){
***************
*** 141,146 ****
                  }
  	            IToken[] comps = astManager.getCompletionsForToken(edit.getEditorFile(), doc, line, documentOffset - region.getOffset(), theActivationToken, "" );
- //                completions = serverShell.getTokenCompletions(trimmed,
- //                        docToParse);
  	            theList.addAll(Arrays.asList(comps));
              }
--- 147,150 ----
***************
*** 154,160 ****
  
              theList.addAll(Arrays.asList(comps));
- //            completions = serverShell.getGlobalCompletions(docToParse);
- //            theList.addAll(completions);
-         
          }
          return theList;
--- 158,161 ----

Index: PyCodeCompletionPreferencesPage.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCodeCompletionPreferencesPage.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PyCodeCompletionPreferencesPage.java	18 Nov 2004 15:38:25 -0000	1.10
--- PyCodeCompletionPreferencesPage.java	21 Dec 2004 18:31:14 -0000	1.11
***************
*** 32,46 ****
      public static final int DEFAULT_ATTEMPTS_CODECOMPLETION = 25;
  
!     	public static final String AUTOCOMPLETE_ON_DOT = "AUTOCOMPLETE_ON_DOT";
!     	public static final boolean DEFAULT_AUTOCOMPLETE_ON_DOT = true;
!     
!     	public static final String USE_AUTOCOMPLETE = "USE_AUTOCOMPLETE";
!     	public static final boolean DEFAULT_USE_AUTOCOMPLETE = true;
!     
!     	public static final String AUTOCOMPLETE_DELAY = "AUTOCOMPLETE_DELAY";
!     	public static final int DEFAULT_AUTOCOMPLETE_DELAY = 250;
!     
!     	public static final String AUTOCOMPLETE_ON_PAR = "AUTOCOMPLETE_ON_PAR";
!     	public static final boolean DEFAULT_AUTOCOMPLETE_ON_PAR = false;
      private Label labelWarning;
  
--- 32,47 ----
      public static final int DEFAULT_ATTEMPTS_CODECOMPLETION = 25;
  
! 	public static final String AUTOCOMPLETE_ON_DOT = "AUTOCOMPLETE_ON_DOT";
! 	public static final boolean DEFAULT_AUTOCOMPLETE_ON_DOT = true;
! 
! 	public static final String USE_AUTOCOMPLETE = "USE_AUTOCOMPLETE";
! 	public static final boolean DEFAULT_USE_AUTOCOMPLETE = true;
! 
! 	public static final String AUTOCOMPLETE_DELAY = "AUTOCOMPLETE_DELAY";
! 	public static final int DEFAULT_AUTOCOMPLETE_DELAY = 250;
! 
! 	public static final String AUTOCOMPLETE_ON_PAR = "AUTOCOMPLETE_ON_PAR";
! 	public static final boolean DEFAULT_AUTOCOMPLETE_ON_PAR = false;
! 	
      private Label labelWarning;
  
***************
*** 78,83 ****
  
  
!         addField(new BooleanFieldEditor(
! 		        USE_AUTOCOMPLETE, "Use autocompletion?", p));
  
  		addField(new IntegerFieldEditor(
--- 79,84 ----
  
  
! //        addField(new BooleanFieldEditor(
! //		        USE_AUTOCOMPLETE, "Use autocompletion?", p));
  
  		addField(new IntegerFieldEditor(

Index: PythonCompletionProcessor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PythonCompletionProcessor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PythonCompletionProcessor.java	20 Dec 2004 18:16:28 -0000	1.14
--- PythonCompletionProcessor.java	21 Dec 2004 18:31:15 -0000	1.15
***************
*** 227,230 ****
--- 227,231 ----
       */
      public char[] getCompletionProposalAutoActivationCharacters() {
+         System.out.println("getCompletionProposalAutoActivationCharacters");
          char[] c = new char[0];
          if (PyCodeCompletionPreferencesPage.isToAutocompleteOnDot()) {

Index: CompletionCache.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/CompletionCache.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CompletionCache.java	20 Dec 2004 18:16:28 -0000	1.12
--- CompletionCache.java	21 Dec 2004 18:31:15 -0000	1.13
***************
*** 77,81 ****
  
          	case PyCodeCompletion.TYPE_ATTR: 
!         	    return imageCache.get(UIConstants.PRIVATE_METHOD_ICON);
          	default:
          	    return null;
--- 77,81 ----
  
          	case PyCodeCompletion.TYPE_ATTR: 
!         	    return imageCache.get(UIConstants.PUBLIC_METHOD_ICON);
          	default:
          	    return null;