equal
deleted
inserted
replaced
408 // Named type import. |
408 // Named type import. |
409 if (tree.staticImport) { |
409 if (tree.staticImport) { |
410 importNamedStatic(tree, p, name, localEnv); |
410 importNamedStatic(tree, p, name, localEnv); |
411 chk.checkCanonical(imp.selected); |
411 chk.checkCanonical(imp.selected); |
412 } else { |
412 } else { |
413 TypeSymbol c = attribImportType(imp, localEnv).getOriginalType().tsym; |
413 Type importedType = attribImportType(imp, localEnv); |
|
414 Type originalType = importedType.getOriginalType(); |
|
415 TypeSymbol c = originalType.hasTag(CLASS) ? originalType.tsym : importedType.tsym; |
414 chk.checkCanonical(imp); |
416 chk.checkCanonical(imp); |
415 importNamed(tree.pos(), c, env, tree); |
417 importNamed(tree.pos(), c, env, tree); |
416 } |
418 } |
417 } |
419 } |
418 } |
420 } |