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

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

Modified Files:
	ASTManager.java 
Log Message:


Index: ASTManager.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/ASTManager.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** ASTManager.java	3 May 2005 15:30:51 -0000	1.34
--- ASTManager.java	6 May 2005 16:58:38 -0000	1.35
***************
*** 23,26 ****
--- 23,27 ----
  import org.eclipse.jface.text.IDocument;
  import org.python.parser.SimpleNode;
+ import org.python.parser.ast.FunctionDef;
  import org.python.pydev.editor.codecompletion.PyCodeCompletion;
  import org.python.pydev.editor.codecompletion.revisited.modules.AbstractModule;
***************
*** 649,665 ****
                  Definition[] defs = s.findDefinition(state.activationToken, state.line, state.col, state.nature);
                  for (int i = 0; i < defs.length; i++) {
!                     
!                     CompletionState copy = state.getCopy();
!                     copy.activationToken = defs[i].value;
!                     copy.line = defs[i].line;
!                     copy.col = defs[i].col;
!                     module = defs[i].module;
!                     IToken[] tks = getCompletionsForModule(module, copy);
!                     if(tks.length > 0)
!                         return tks;
                  }
                  
              } catch (Exception e) {
                  e.printStackTrace();
              }
          }
--- 650,671 ----
                  Definition[] defs = s.findDefinition(state.activationToken, state.line, state.col, state.nature);
                  for (int i = 0; i < defs.length; i++) {
!                     if(!(defs[0].ast instanceof FunctionDef)){
!                         //we might want to extend that later to check the return of some function...
! 	                    CompletionState copy = state.getCopy();
! 	                    copy.activationToken = defs[i].value;
! 	                    copy.line = defs[i].line;
! 	                    copy.col = defs[i].col;
! 	                    module = defs[i].module;
! 	                    IToken[] tks = getCompletionsForModule(module, copy);
! 	                    if(tks.length > 0)
! 	                        return tks;
!                     }
                  }
                  
+                 
              } catch (Exception e) {
                  e.printStackTrace();
+             } catch (Throwable t) {
+                 t.printStackTrace();
              }
          }