From dec68af464ad4ff6e2fa5e82698b979b8740c47d Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Wed, 12 Dec 2018 19:34:04 +0300 Subject: [PATCH] [devkit] `UastPatterns.stringLiteralExpression` and `UastLiteralReferenceProvider` cleanup --- .../src/references/IconsReferencesContributor.java | 4 ++-- .../src/references/TestDataFilesReferencesContributor.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/devkit/devkit-core/src/references/IconsReferencesContributor.java b/plugins/devkit/devkit-core/src/references/IconsReferencesContributor.java index ea777376d983..dcd617902e14 100644 --- a/plugins/devkit/devkit-core/src/references/IconsReferencesContributor.java +++ b/plugins/devkit/devkit-core/src/references/IconsReferencesContributor.java @@ -241,10 +241,10 @@ public class IconsReferencesContributor extends PsiReferenceContributor private static void registerForPresentationAnnotation(@NotNull PsiReferenceRegistrar registrar) { UastReferenceRegistrar.registerUastReferenceProvider( registrar, - UastPatterns.stringLiteralExpression() + UastPatterns.injectionHostUExpression() .sourcePsiFilter(psi -> PsiUtil.isPluginProject(psi.getProject())) .annotationParam(Presentation.class.getName(), "icon"), - UastReferenceRegistrar.uastLiteralReferenceProvider((uElement, referencePsiElement) -> new PsiReference[]{ + UastReferenceRegistrar.uastInjectionHostReferenceProvider((uElement, referencePsiElement) -> new PsiReference[]{ new IconPsiReferenceBase(referencePsiElement) { private UElement getUElement() { diff --git a/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java b/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java index e99d1dbd3c96..00210379e9c0 100644 --- a/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java +++ b/plugins/devkit/devkit-core/src/references/TestDataFilesReferencesContributor.java @@ -26,7 +26,7 @@ public class TestDataFilesReferencesContributor extends PsiReferenceContributor UastReferenceRegistrar .registerUastReferenceProvider( registrar, - UastPatterns.stringLiteralExpression().inCall(UastPatterns.callExpression()), + UastPatterns.injectionHostUExpression().inCall(UastPatterns.callExpression()), new UastInjectionHostReferenceProvider() { @NotNull