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

[Parameter Name Hints] show hint for vararg if any of it's params is literal

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2016-09-14 17:11:23 +03:00
parent d33ff47bba
commit 673461c204
2 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/ParameterNameHintsManager.java
+32 -11
View File
@@ -133,20 +133,41 @@ public class ParameterNameHintsManager {
@NotNull PsiExpression[] callArguments,
@NotNull PsiParameter[] parameters,
@NotNull JavaResolveResult resolveResult) {
PsiExpression argument = callArguments[paramIndex];
if (isLiteralExpression(argument) && argument.getType() != null) {
PsiParameter parameter = parameters[paramIndex];
String paramName = parameter.getName();
JavaCodeFoldingSettings settings = JavaCodeFoldingSettings.getInstance();
if (paramName != null && paramName.length() >= settings.getInlineLiteralParameterMinNameLength()) {
PsiType parameterType = resolveResult.getSubstitutor().substitute(parameter.getType());
return TypeConversionUtil.isAssignable(parameterType, argument.getType()) || isVarArgs(parameterType, argument.getType());
}
final PsiExpression argument = callArguments[paramIndex];
if (argument.getType() == null) return false;
final PsiParameter parameter = parameters[paramIndex];
if (!hasProperLength(parameter.getName())) return false;
PsiType argType = argument.getType();
PsiType paramType = parameter.getType();
if (isVarargParam(paramType, argType) && hasLiteralInVarargs(paramIndex, callArguments)) {
return true;
}
if (isLiteralExpression(argument)) {
PsiType parameterType = resolveResult.getSubstitutor().substitute(paramType);
return TypeConversionUtil.isAssignable(parameterType, argType);
}
return false;
}
private static boolean hasProperLength(@Nullable String paramName) {
JavaCodeFoldingSettings settings = JavaCodeFoldingSettings.getInstance();
return paramName != null && paramName.length() >= settings.getInlineLiteralParameterMinNameLength();
}
private static boolean hasLiteralInVarargs(int index, PsiExpression[] callArguments) {
for (int i = index; i < callArguments.length; i++) {
PsiExpression arg = callArguments[i];
if (isLiteralExpression(arg)) return true;
}
return false;
}
public static boolean isVarArgs(@NotNull PsiType param, @NotNull PsiType argument) {
private static boolean isVarargParam(@NotNull PsiType param, @NotNull PsiType argument) {
PsiType deepType = param.getDeepComponentType();
return param instanceof PsiEllipsisType && TypeConversionUtil.isAssignable(deepType, argument);
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/inlays/InlayParameterHintsTest.kt
+23
View File
@@ -348,6 +348,29 @@ public class Test {
.assertInlays("counter->10", "shouldTest->false")
}
fun `test inline if one of vararg params is literal`() {
setup("""
public class VarArgTest {
public void main() {
System.out.println("AAA");
int test = 13;
boolean isCheck = false;
boolean isOk = true;
testBooleanVarargs(test, isCheck, true, isOk);
}
public boolean testBooleanVarargs(int test, Boolean... booleans) {
int temp = test;
return false;
}
}
""")
onLineStartingWith("testBooleanVarargs")
.assertInlays("booleans...->isCheck")
}
private fun onLineStartingWith(text: String): InlayAssert {
val range = getLineRangeStartingWith(text)
val inlays = myFixture.editor.inlayModel.getInlineElementsInRange(range.startOffset, range.endOffset)