[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/modul
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2008-10-03 00:44:04
|
Update of /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/modules In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10036/src_completions/org/python/pydev/editor/codecompletion/revisited/modules Modified Files: AbstractModule.java Log Message: Synching with aptana svn repo for release 1.3.22 (see http://pydev.sourceforge.net/developers.html) Index: AbstractModule.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/modules/AbstractModule.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** AbstractModule.java 28 Sep 2008 12:45:40 -0000 1.16 --- AbstractModule.java 3 Oct 2008 00:43:54 -0000 1.17 *************** *** 100,104 **** public boolean isInGlobalTokens(String tok, IPythonNature nature, boolean searchSameLevelMods, ICompletionCache completionCache) throws CompletionRecursionException{ ! return isInGlobalTokens(tok, nature, true, false, completionCache) != IModule.NOT_FOUND; } --- 100,104 ---- public boolean isInGlobalTokens(String tok, IPythonNature nature, boolean searchSameLevelMods, ICompletionCache completionCache) throws CompletionRecursionException{ ! return isInGlobalTokens(tok, nature, searchSameLevelMods, false, completionCache) != IModule.NOT_FOUND; } *************** *** 165,169 **** state.setActivationToken (activationToken); ! IToken[] globalTokens = astManager.getCompletionsForModule(this, state, searchSameLevelMods); for (IToken token : globalTokens) { --- 165,170 ---- state.setActivationToken (activationToken); ! //we don't want to gather builtins in this case. ! state.setBuiltinsGotten(true); IToken[] globalTokens = astManager.getCompletionsForModule(this, state, searchSameLevelMods); for (IToken token : globalTokens) { |