Thread: [Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited AbstractASTManag
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2006-07-19 22:22:01
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20503/src/org/python/pydev/editor/codecompletion/revisited Modified Files: AbstractASTManager.java Log Message: Index: AbstractASTManager.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/AbstractASTManager.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** AbstractASTManager.java 17 Jul 2006 23:27:46 -0000 1.25 --- AbstractASTManager.java 19 Jul 2006 22:21:58 -0000 1.26 *************** *** 26,29 **** --- 26,30 ---- import org.python.pydev.core.REF; import org.python.pydev.core.Tuple; + import org.python.pydev.core.Tuple3; import org.python.pydev.core.log.Log; import org.python.pydev.editor.actions.PyAction; *************** *** 627,637 **** */ public IToken resolveImport(ICompletionState state, IToken imported) { - // if(true){ //TODO: Check how to resolve things correctly (and check if this is the best place to do it) - // //mental note: probably the best place to put it would be after all the tokens are resolved, - // //and only change the imports there (or only add the arguments after a calltip is requested) - // return imported; - // } String curModName = imported.getParentPackage(); ! Tuple<IModule, String> modTok = findOnImportedMods(new IToken[]{imported}, state.getNature(), imported.getRepresentation(), curModName); if(modTok != null && modTok.o1 != null){ --- 628,633 ---- */ public IToken resolveImport(ICompletionState state, IToken imported) { String curModName = imported.getParentPackage(); ! Tuple3<IModule, String, IToken> modTok = findOnImportedMods(new IToken[]{imported}, state.getNature(), imported.getRepresentation(), curModName); if(modTok != null && modTok.o1 != null){ *************** *** 739,743 **** public IToken[] findTokensOnImportedMods( IToken[] importedModules, ICompletionState state, IModule current) { ! Tuple<IModule, String> o = findOnImportedMods(importedModules, state.getNature(), state.getActivationToken(), current.getName()); if(o == null) --- 735,739 ---- public IToken[] findTokensOnImportedMods( IToken[] importedModules, ICompletionState state, IModule current) { ! Tuple3<IModule, String, IToken> o = findOnImportedMods(importedModules, state.getNature(), state.getActivationToken(), current.getName()); if(o == null) *************** *** 773,777 **** * 1: tok */ ! public Tuple<IModule, String> findOnImportedMods( IPythonNature nature, String activationToken, IModule current) { IToken[] importedModules = current.getTokenImportedModules(); return findOnImportedMods(importedModules, nature, activationToken, current.getName()); --- 769,773 ---- * 1: tok */ ! public Tuple3<IModule, String, IToken> findOnImportedMods( IPythonNature nature, String activationToken, IModule current) { IToken[] importedModules = current.getTokenImportedModules(); return findOnImportedMods(importedModules, nature, activationToken, current.getName()); *************** *** 791,797 **** * * 0: mod ! * 1: tok */ ! public Tuple<IModule, String> findOnImportedMods( IToken[] importedModules, IPythonNature nature, String activationToken, String currentModuleName) { FullRepIterable iterable = new FullRepIterable(activationToken, true); --- 787,794 ---- * * 0: mod ! * 1: tok (string) ! * 2: actual tok */ ! public Tuple3<IModule, String, IToken> findOnImportedMods( IToken[] importedModules, IPythonNature nature, String activationToken, String currentModuleName) { FullRepIterable iterable = new FullRepIterable(activationToken, true); *************** *** 803,807 **** if(modRep.equals(tok)){ String act = activationToken; ! return findOnImportedMods(importedModule, tok, nature, act, currentModuleName); } } --- 800,808 ---- if(modRep.equals(tok)){ String act = activationToken; ! Tuple<IModule, String> r = findOnImportedMods(importedModule, tok, nature, act, currentModuleName); ! if(r == null){ ! return null; ! } ! return new Tuple3<IModule, String, IToken>(r.o1, r.o2, importedModule); } } |