[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules SourceModule.java,1.14,1.15 AbstractModule.java,1.11,1.12

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

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

Modified Files:
	SourceModule.java AbstractModule.java 
Log Message:


Index: SourceModule.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/SourceModule.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SourceModule.java	14 Apr 2005 13:12:18 -0000	1.14
--- SourceModule.java	25 Apr 2005 12:04:04 -0000	1.15
***************
*** 220,235 ****
              //ok, it is not an assign, so, let's search the global tokens (and imports)
              Object[] o = nature.getAstManager().findOnImportedMods(nature, token, this);
              if(o != null){
! 	            SourceModule mod =  (SourceModule) o[0];
! 	            String tok = (String) o[1];
! 	            Definition d = mod.findGlobalTokDef(tok);
! 	            if(d != null)
! 	                toRet.add(d);
              }
          }else{
  	        for (Iterator iter = visitor.definitions.iterator(); iter.hasNext();) {
  	            AssignDefinition element = (AssignDefinition) iter.next();
! 	            if(element.scope.isOuterOrSameScope(scopeVisitor.scope)){
! 	                toRet.add(element);
  	            }
  	        }
--- 220,243 ----
              //ok, it is not an assign, so, let's search the global tokens (and imports)
              Object[] o = nature.getAstManager().findOnImportedMods(nature, token, this);
+             String tok = token;
+             SourceModule mod = this;
+             
              if(o != null){
! 	            mod =  (SourceModule) o[0];
! 	            tok = (String) o[1];
              }
+             Definition d = mod.findGlobalTokDef(tok);
+             if(d != null)
+                 toRet.add(d);
+             
          }else{
  	        for (Iterator iter = visitor.definitions.iterator(); iter.hasNext();) {
  	            AssignDefinition element = (AssignDefinition) iter.next();
! 	            if(element.target.startsWith("self") == false){
! 		            if(element.scope.isOuterOrSameScope(scopeVisitor.scope)){
! 		                toRet.add(element);
! 		            }
! 	            }else{
! 		            toRet.add(element);
  	            }
  	        }

Index: AbstractModule.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/modules/AbstractModule.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AbstractModule.java	13 Apr 2005 17:33:27 -0000	1.11
--- AbstractModule.java	25 Apr 2005 12:04:05 -0000	1.12
***************
*** 23,27 ****
  import org.python.pydev.editor.codecompletion.revisited.PythonPathHelper;
  import org.python.pydev.editor.codecompletion.revisited.visitors.Definition;
- import org.python.pydev.editor.codecompletion.revisited.visitors.GlobalModelVisitor;
  import org.python.pydev.parser.PyParser;
  import org.python.pydev.plugin.PydevPlugin;
--- 23,26 ----