Thread: [Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors AbstractV
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2005-09-30 16:29:39
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31218/src/org/python/pydev/editor/codecompletion/revisited/visitors Modified Files: AbstractVisitor.java Log Message: changed the way imports work Index: AbstractVisitor.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitor.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** AbstractVisitor.java 29 Sep 2005 19:55:23 -0000 1.22 --- AbstractVisitor.java 30 Sep 2005 16:29:27 -0000 1.23 *************** *** 139,143 **** public static List<IToken> makeImportToken(ImportFrom node, List<IToken> tokens, String moduleName, boolean allowForMultiple) { aliasType[] names = node.names; ! return makeImportToken(node, tokens, names, ((NameTok)node.module).id, allowForMultiple); } --- 139,150 ---- public static List<IToken> makeImportToken(ImportFrom node, List<IToken> tokens, String moduleName, boolean allowForMultiple) { aliasType[] names = node.names; ! String importName = ((NameTok)node.module).id; ! ! if(moduleName != null && moduleName.length() > 0){ ! moduleName = moduleName+"."+importName; ! }else{ ! moduleName = importName; ! } ! return makeImportToken(node, tokens, names, moduleName, allowForMultiple); } *************** *** 150,162 **** } for (int i = 0; i < names.length; i++) { ! String name = ((NameTok)names[i].name).id; ! String original = ((NameTok)names[i].name).id; ! if(names[i].asname != null){ ! name = ((NameTok)names[i].asname).id; } ! FullRepIterable iterator = new FullRepIterable(name); ! for (String rep : iterator) { ! SourceToken sourceToken = new SourceToken(node, rep, "", "", module, original); tokens.add(sourceToken); } --- 157,177 ---- } for (int i = 0; i < names.length; i++) { ! aliasType aliasType = names[i]; ! ! String name = null; ! String original = ((NameTok)aliasType.name).id; ! ! if(aliasType.asname != null){ ! name = ((NameTok)aliasType.asname).id; } ! if(name == null){ ! FullRepIterable iterator = new FullRepIterable(original); ! for (String rep : iterator) { ! SourceToken sourceToken = new SourceToken(node, rep, "", "", module, rep); ! tokens.add(sourceToken); ! } ! }else{ ! SourceToken sourceToken = new SourceToken(node, name, "", "", module, original); tokens.add(sourceToken); } |