From 3ff9f1acbf94db3ff822e3f6bf1449d4468a901d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Fri, 29 May 2020 14:39:36 +0200 Subject: [PATCH] [devkit] PropertyKeyReferenceProvider: cleanup GitOrigin-RevId: 498ff511547b8754c9aac78593e78188ee8f7af5 --- .../dom/impl/PropertyKeyReferenceProvider.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/devkit/devkit-core/src/dom/impl/PropertyKeyReferenceProvider.java b/plugins/devkit/devkit-core/src/dom/impl/PropertyKeyReferenceProvider.java index bcad27293b14..11b8e4474d73 100644 --- a/plugins/devkit/devkit-core/src/dom/impl/PropertyKeyReferenceProvider.java +++ b/plugins/devkit/devkit-core/src/dom/impl/PropertyKeyReferenceProvider.java @@ -31,13 +31,14 @@ import java.util.List; class PropertyKeyReferenceProvider extends PsiReferenceProvider { private final boolean myTagMode; - private final String myFallbackKeyName; - private final String myFallbackGroupName; - PropertyKeyReferenceProvider(boolean tagMode, String fallbackKeyName, String fallbackGroupName) { + @Nullable private final String myFallbackKeyName; + @Nullable private final String myFallbackBundleName; + + PropertyKeyReferenceProvider(boolean tagMode, @Nullable String fallbackKeyName, @Nullable String fallbackBundleName) { myTagMode = tagMode; myFallbackKeyName = fallbackKeyName; - myFallbackGroupName = fallbackGroupName; + myFallbackBundleName = fallbackBundleName; } @Override @@ -63,9 +64,9 @@ class PropertyKeyReferenceProvider extends PsiReferenceProvider { if ("key".equals(xmlAttribute.getName())) { value = xmlAttribute.getValue(); } - else if (myFallbackKeyName.equals(xmlAttribute.getName())) { + else if (xmlAttribute.getName().equals(myFallbackKeyName)) { value = xmlAttribute.getValue(); - final String groupBundle = tag.getAttributeValue(myFallbackGroupName); + final String groupBundle = tag.getAttributeValue(myFallbackBundleName); if (groupBundle != null) { bundle = groupBundle; } @@ -81,8 +82,8 @@ class PropertyKeyReferenceProvider extends PsiReferenceProvider { private PsiReference[] getTagReferences(XmlTag element) { final XmlTag parent = PsiTreeUtil.getParentOfType(element, XmlTag.class); if (parent == null) return PsiReference.EMPTY_ARRAY; - final XmlTag groupNameTag = parent.findFirstSubTag(myFallbackGroupName); - String bundleName = groupNameTag != null ? groupNameTag.getValue().getTrimmedText() : null; + final XmlTag bundleNameTag = parent.findFirstSubTag(myFallbackBundleName); + String bundleName = bundleNameTag != null ? bundleNameTag.getValue().getTrimmedText() : null; return new PsiReference[]{new MyPropertyReference(element.getValue().getText(), element, bundleName)}; }