Update of /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31519/src_completions/org/python/pydev/editor/codecompletion
Modified Files:
PyCodeCompletion.java
Log Message:
<li>Fixed NPE when creating editor with no interpreter configured</li>
<li>Hyperlink works in the same way that F3 (saves file before search)</li>
<li>Fixed problem while navigating pydev package explorer ( https://sourceforge.net/tracker/index.php?func=detail&aid=2008015&group_id=85796&atid=577329 )</li>
<li>Applied patch that fixes race condition in PythonNature (thanks to Radim Kubacki)</li>
<li><strong>Eclipse 3.4</strong>: Move / rename working</li>
Index: PyCodeCompletion.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/PyCodeCompletion.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PyCodeCompletion.java 10 May 2008 00:45:30 -0000 1.5
--- PyCodeCompletion.java 31 Jul 2008 01:47:37 -0000 1.6
***************
*** 17,20 ****
--- 17,21 ----
import org.eclipse.core.runtime.CoreException;
+ import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
***************
*** 47,50 ****
--- 48,53 ----
import org.python.pydev.parser.jython.ast.NameTok;
import org.python.pydev.parser.visitors.NodeUtils;
+ import org.python.pydev.plugin.PydevPlugin;
+ import org.python.pydev.ui.NotConfiguredInterpreterException;
/**
***************
*** 104,110 ****
//list of Object[], IToken or ICompletionProposal
List<Object> tokensList = new ArrayList<Object>();
! lazyStartShell(request);
!
! String trimmed = request.activationToken.replace('.', ' ').trim();
ImportInfo importsTipper = getImportsTipperStr(request);
--- 107,116 ----
//list of Object[], IToken or ICompletionProposal
List<Object> tokensList = new ArrayList<Object>();
! try {
! lazyStartShell(request);
! } catch (NotConfiguredInterpreterException e) {
! Log.log(IStatus.WARNING, "Warning: unable to get code-completion for builtins: No interpreter configured.", null);
! }
! String trimmed = request.activationToken.replace('.', ' ').trim();
ImportInfo importsTipper = getImportsTipperStr(request);
***************
*** 327,330 ****
--- 333,338 ----
Log.toLogFile(this,"END AbstractShell.getServerShell");
}
+ } catch (RuntimeException e) {
+ throw e;
} catch (Exception e) {
throw new RuntimeException(e);
|
