[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited ASTManager.java,1.17,1.18

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

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

Modified Files:
	ASTManager.java 
Log Message:
more tests to code completion

Index: ASTManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/ASTManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ASTManager.java	2 Feb 2005 15:56:17 -0000	1.17
--- ASTManager.java	3 Feb 2005 12:31:15 -0000	1.18
***************
*** 496,506 ****
                  AbstractModule builtinsMod = getModule("__builtin__", state.nature);
                  if(builtinsMod != null){
!                     state.recursing = true;
! 	                tokens = getCompletionsForModule( builtinsMod, state);
! 	                if (tokens.length > 0){
! 	                    if (tokens[0].getRepresentation().equals("ERROR:") == false){
! 	                        return tokens;
! 	                    }
! 	                }
                  }
                  
--- 496,508 ----
                  AbstractModule builtinsMod = getModule("__builtin__", state.nature);
                  if(builtinsMod != null){
!                     if(!state.recursing){
! 	                    state.recursing = true;
! 		                tokens = getCompletionsForModule( builtinsMod, state);
! 		                if (tokens.length > 0){
! 		                    if (tokens[0].getRepresentation().equals("ERROR:") == false){
! 		                        return tokens;
! 		                    }
! 		                }
!                     }
                  }
                  
***************
*** 644,648 ****
                  }else if (mod != null){
                      //the token returned is the token we have to get the completions on the module we have.
!                     return mod.getGlobalTokens(tok, this, state.line, state.col, state.nature);
                  }
  
--- 646,685 ----
                  }else if (mod != null){
                      //the token returned is the token we have to get the completions on the module we have.
!                     IToken[] globalTokens = mod.getGlobalTokens(tok, this, state.line, state.col, state.nature);
!                     if(globalTokens.length > 0){
!                         return globalTokens;
!                     }
!                     
!                     //ok, it was not a global token, still, it might be some import from that module.
!                     IToken[] tokenImportedModules = mod.getTokenImportedModules();
!                     for (int j = 0; j < tokenImportedModules.length; j++) {
!                         if(tokenImportedModules[j].getRepresentation().equals(state.activationToken)){
!                             String path = tokenImportedModules[j].getCompletePath();
!                             Object [] o2 = findModuleFromPath(path , state.nature);
!                             AbstractModule mod2 = (AbstractModule) o2[0];
!                             String tok2 = (String) o2[1];
!                             if (mod2 != null){
!                                 return mod2.getGlobalTokens(tok2, this, state.line, state.col, state.nature);
!                             }      
!                         }
!                     }
!                     IToken[] wildImportedModules = mod.getWildImportedModules();
!                     for (int j = 0; j < wildImportedModules.length; j++) {
!                         AbstractModule mod2 = getModule(wildImportedModules[j].getCompletePath(), state.nature);
!                         
!                         if (mod2 == null) {
!                             mod2 = getModule(wildImportedModules[j].getRepresentation(), state.nature);
!                         }
!                         
!                         if (mod2 != null) {
!                             state.recursing = true;
!                             //the token to find is already specified.
!                             IToken[] completionsForModule = getCompletionsForModule(mod2, state);
!                             return completionsForModule;
!                         }
!                             
!                         
!                     }
!                     
                  }