MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix import scanner for imports like "package.*;"

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-09-23 19:43:57 +03:00
parent 89add86543
commit 826ea113fa
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/javac/ast/JavacReferencesCollector.java
+12 -9
View File
@@ -149,18 +149,21 @@ public class JavacReferencesCollector {
final JCTree.JCFieldAccess id = (JCTree.JCFieldAccess)anImport.getQualifiedIdentifier();
final Symbol sym = id.sym;
if (sym == null) {
final JCTree.JCFieldAccess classImport = (JCTree.JCFieldAccess)id.getExpression();
final Symbol ownerSym = classImport.sym;
final Name name = id.getIdentifier();
if (name != getAsteriksFromCurrentNameTable(name)) {
// member import
for (Symbol memberSymbol : ownerSym.members().getElements()) {
if (memberSymbol.getSimpleName() == name) {
symbols.add(new JavacRefSymbol(memberSymbol, Tree.Kind.IMPORT));
final JCTree.JCExpression qExpr = id.getExpression();
if (qExpr instanceof JCTree.JCFieldAccess) {
final JCTree.JCFieldAccess classImport = (JCTree.JCFieldAccess)qExpr;
final Symbol ownerSym = classImport.sym;
final Name name = id.getIdentifier();
if (name != getAsteriksFromCurrentNameTable(name)) {
// member import
for (Symbol memberSymbol : ownerSym.members().getElements()) {
if (memberSymbol.getSimpleName() == name) {
symbols.add(new JavacRefSymbol(memberSymbol, Tree.Kind.IMPORT));
}
}
}
collectClassImports(ownerSym, symbols);
}
collectClassImports(ownerSym, symbols);
} else {
// class import
collectClassImports(sym, symbols);