[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited AbstractASTManager.java, 1.28, 1.29

[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-serv18383/src/org/python/pydev/editor/codecompletion/revisited

Modified Files:
	AbstractASTManager.java 
Log Message:
Ok, a little bit more

Index: AbstractASTManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/AbstractASTManager.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** AbstractASTManager.java	17 Sep 2006 21:52:20 -0000	1.28
--- AbstractASTManager.java	17 Sep 2006 22:12:59 -0000	1.29
***************
*** 101,106 ****
          
          String relative = null;
          if(request.editorFile != null){
!             String moduleName = nature.getAstManager().getModulesManager().resolveModule(REF.getFileAbsolutePath(request.editorFile));
              if(moduleName != null){
                  
--- 101,107 ----
          
          String relative = null;
+         String moduleName = null;
          if(request.editorFile != null){
!             moduleName = nature.getAstManager().getModulesManager().resolveModule(REF.getFileAbsolutePath(request.editorFile));
              if(moduleName != null){
                  
***************
*** 148,152 ****
              getTokensForModule(relative, nature, relative, set);
          }
!         return (IToken[]) set.toArray(new IToken[0]);
      }
  
--- 149,164 ----
              getTokensForModule(relative, nature, relative, set);
          }
!         if(level == 1 && moduleName != null){
!             //has returned itself, so, let's remove it
!             String strToRemove = FullRepIterable.getLastPart(moduleName);
!             for(Iterator<IToken> it=set.iterator();it.hasNext();){
!                 IToken o = it.next();
!                 if(o.getRepresentation().equals(strToRemove)){
!                     it.remove();
!                     //don't break because the token might be different, but not the representation...
!                 }
!             }
!         }
!         return set.toArray(new IToken[0]);
      }