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

[java-completion] Prefer declared_in_same_package over has_same_package_import

Browse Source 
Fixes IDEA-285000 JDK's Number is preferred over same-project same-package one

GitOrigin-RevId: a130410dbed7ff754987baab2a24ae7b91b2058a
This commit is contained in:
Tagir Valeev
2021-12-20 07:01:14 +00:00
committed by intellij-monorepo-bot
parent 39f9a1dc73
commit 27184c1411
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/util/proximity/ExplicitlyImportedWeigher.java
+3 -3
View File
@@ -100,9 +100,6 @@ public class ExplicitlyImportedWeigher extends ProximityWeigher {
return ImportWeight.CLASS_ON_DEMAND_NESTED;
}
// check if anything from the same package is already imported in the file:
// people are likely to refer to the same subsystem as they're already working
if (containsImport(importedNames, packageName)) return ImportWeight.CLASS_HAS_SAME_PACKAGE_IMPORT;
final PsiPackage placePackage = PLACE_PACKAGE.getValue(location);
if (placePackage != null) {
Module elementModule = ModuleUtilCore.findModuleForPsiElement(element);
@@ -110,6 +107,9 @@ public class ExplicitlyImportedWeigher extends ProximityWeigher {
return topLevel ? ImportWeight.CLASS_DECLARED_IN_SAME_PACKAGE_TOP_LEVEL : ImportWeight.CLASS_DECLARED_IN_SAME_PACKAGE_NESTED;
}
}
// check if anything from the same package is already imported in the file:
// people are likely to refer to the same subsystem as they're already working
if (containsImport(importedNames, packageName)) return ImportWeight.CLASS_HAS_SAME_PACKAGE_IMPORT;
}
return ImportWeight.UNKNOWN;
}