From 27184c1411a2b9901f44223ec0f558317a5831d7 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Mon, 20 Dec 2021 11:59:28 +0700 Subject: [PATCH] [java-completion] Prefer declared_in_same_package over has_same_package_import Fixes IDEA-285000 JDK's Number is preferred over same-project same-package one GitOrigin-RevId: a130410dbed7ff754987baab2a24ae7b91b2058a --- .../psi/util/proximity/ExplicitlyImportedWeigher.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/util/proximity/ExplicitlyImportedWeigher.java b/java/java-impl/src/com/intellij/psi/util/proximity/ExplicitlyImportedWeigher.java index 31c24ac11bb8..a942a673eed5 100644 --- a/java/java-impl/src/com/intellij/psi/util/proximity/ExplicitlyImportedWeigher.java +++ b/java/java-impl/src/com/intellij/psi/util/proximity/ExplicitlyImportedWeigher.java @@ -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; }