[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion PythonCompletionProcessor.java, 1.45, 1.46 PyCodeCompletion.java, 1.86, 1.87

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

Modified Files:
	PythonCompletionProcessor.java PyCodeCompletion.java 
Log Message:


Index: PyCodeCompletion.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PyCodeCompletion.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** PyCodeCompletion.java	23 Jan 2007 00:14:31 -0000	1.86
--- PyCodeCompletion.java	5 Feb 2007 18:07:27 -0000	1.87
***************
*** 35,41 ****
  import org.python.pydev.core.docutils.DocUtils;
  import org.python.pydev.core.log.Log;
  import org.python.pydev.editor.codecompletion.revisited.ASTManager;
  import org.python.pydev.editor.codecompletion.revisited.AbstractToken;
- import org.python.pydev.editor.codecompletion.revisited.CompletionRecursionException;
  import org.python.pydev.editor.codecompletion.revisited.CompletionState;
  import org.python.pydev.editor.codecompletion.revisited.modules.AbstractModule;
--- 35,41 ----
  import org.python.pydev.core.docutils.DocUtils;
  import org.python.pydev.core.log.Log;
+ import org.python.pydev.core.structure.CompletionRecursionException;
  import org.python.pydev.editor.codecompletion.revisited.ASTManager;
  import org.python.pydev.editor.codecompletion.revisited.AbstractToken;
  import org.python.pydev.editor.codecompletion.revisited.CompletionState;
  import org.python.pydev.editor.codecompletion.revisited.modules.AbstractModule;
***************
*** 378,383 ****
                              Name n = (Name) d.bases[i];
  	                        state.activationToken = n.id;
! 	        	            IToken[] completions = request.nature.getAstManager().getCompletionsForToken(request.editorFile, request.doc, state);
! 	        	            gottenComps.addAll(Arrays.asList(completions));
                          }
                      }
--- 378,388 ----
                              Name n = (Name) d.bases[i];
  	                        state.activationToken = n.id;
! 	        	            IToken[] completions;
! 							try {
! 								completions = request.nature.getAstManager().getCompletionsForToken(request.editorFile, request.doc, state);
! 								gottenComps.addAll(Arrays.asList(completions));
! 							} catch (CompletionRecursionException e) {
! 								//ok...
! 							}
                          }
                      }
***************
*** 397,401 ****
                          //ok, it's just really self, let's get on to get the completions
                          state.activationToken = NodeUtils.getNameFromNameTok((NameTok) d.name);
!         	            comps = request.nature.getAstManager().getCompletionsForToken(request.editorFile, request.doc, state);
          	            
                      }else{
--- 402,410 ----
                          //ok, it's just really self, let's get on to get the completions
                          state.activationToken = NodeUtils.getNameFromNameTok((NameTok) d.name);
!         	            try {
! 							comps = request.nature.getAstManager().getCompletionsForToken(request.editorFile, request.doc, state);
! 						} catch (CompletionRecursionException e) {
! 							//ok
! 						}
          	            
                      }else{

Index: PythonCompletionProcessor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/PythonCompletionProcessor.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** PythonCompletionProcessor.java	17 Sep 2006 23:25:49 -0000	1.45
--- PythonCompletionProcessor.java	5 Feb 2007 18:07:27 -0000	1.46
***************
*** 24,28 ****
  import org.python.pydev.core.docutils.PySelection;
  import org.python.pydev.editor.PyEdit;
- import org.python.pydev.editor.codecompletion.revisited.CompletionRecursionException;
  import org.python.pydev.plugin.PydevPlugin;
  
--- 24,27 ----
***************
*** 168,173 ****
                      try {
                          objects = getPythonProposals(viewer, documentOffset, doc, request);
-                     } catch (CompletionRecursionException e) {
-                         //thats ok
                      } catch (Throwable e) {
                          setError(e);
--- 167,170 ----