Minor: remove obsolete JAVA_ROOT
This commit is contained in:
-4
@@ -39,10 +39,6 @@ public class JavaDescriptorResolver(public val packageFragmentProvider: LazyJava
|
||||
public fun getPackageFragment(javaClass: JavaClass): PackageFragmentDescriptor? {
|
||||
return packageFragmentProvider.getPackageFragment(javaClass)
|
||||
}
|
||||
|
||||
class object {
|
||||
public val JAVA_ROOT: Name = Name.special("<java_root>")
|
||||
}
|
||||
}
|
||||
|
||||
public fun JavaDescriptorResolver.resolveMethod(method: JavaMethod): FunctionDescriptor? {
|
||||
|
||||
@@ -180,11 +180,6 @@ public class ImportInsertHelper {
|
||||
}
|
||||
|
||||
public static boolean needImport(@NotNull ImportPath importPath, @NotNull JetFile file, List<JetImportDirective> importDirectives) {
|
||||
if (importPath.fqnPart().firstSegmentIs(JavaDescriptorResolver.JAVA_ROOT)) {
|
||||
FqName withoutJavaRoot = NamePackage.withoutFirstSegment(importPath.fqnPart());
|
||||
importPath = new ImportPath(withoutJavaRoot, importPath.isAllUnder(), importPath.getAlias());
|
||||
}
|
||||
|
||||
if (isImportedByDefault(importPath, file)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user