MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-231900 Better support for parameters

Browse Source 
GitOrigin-RevId: ccc2e361e5542748b09842480393d77e7cb0893e
This commit is contained in:
Tagir Valeev
2020-02-19 14:00:58 +07:00
committed by intellij-monorepo-bot
parent 320de07c32
commit 1ed6f1dfd0
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java
View File

@@ -135,10 +135,10 @@ public class JavaI18nUtil extends I18nUtil {
PsiParameter parameter = method.getParameterList().getParameter(idx.getAsInt());
if (parameter != null) {
PsiType parameterType = parameter.getType();
PsiType receiverType = callExpression.getReceiverType();
if (receiverType instanceof PsiClassType) {
PsiClassType.ClassResolveResult result = ((PsiClassType)receiverType).resolveGenerics();
parameterType = result.getSubstitutor().substitute(parameterType);
PsiElement psi = callExpression.getSourcePsi();
if (psi instanceof PsiMethodCallExpression) {
PsiSubstitutor substitutor = ((PsiMethodCallExpression)psi).getMethodExpression().advancedResolve(false).getSubstitutor();
parameterType = substitutor.substitute(parameterType);
}
if (AnnotationUtil.findTypeAnnotationInHierarchy(parameterType, Collections.singleton(annFqn)) != null) {
return true;

9
plugins/java-i18n/testData/inspections/i18n/NlsTypeUse.java
View File

@@ -30,4 +30,13 @@ class NlsTypeUse {
map.put("foo", <warning descr="Hardcoded string literal: \"bar\"">"bar"</warning>);
cons.accept(<warning descr="Hardcoded string literal: \"foo\"">"foo"</warning>, "bar");
}
void typeArgsCustomType(NlsValueMap<String> map, NlsValueMap2<String, String> map2) {
map.put("foo", <warning descr="Hardcoded string literal: \"bar\"">"bar"</warning>);
map2.put("foo", <warning descr="Hardcoded string literal: \"bar\"">"bar"</warning>);
}
interface NlsValueMap<K> extends Map<K, @Nls String> {}
interface NlsValueMap2<K, V> extends Map<K, @Nls V> {}
}