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

incompatible types tooltip: ensure vararg parameter is shown when first arg is compatible

Browse Source 
GitOrigin-RevId: 70cc20169203f5dc857e73a84548089b6ebebc3c
This commit is contained in:
Anna.Kozlova
2019-11-07 02:40:58 +00:00
committed by intellij-monorepo-bot
parent 1ccce974ac
commit 628624c0c8
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
+10 -2
View File
@@ -1036,12 +1036,20 @@ public class HighlightMethodUtil {
parameterNameStyle += "background-color: " + ColorUtil.toHtmlColor(paramBgColor) + ";";
}
boolean varargAdded = false;
for (int i = 0; i < Math.max(parameters.length, expressions.length); i++) {
PsiParameter parameter = i < parameters.length ? parameters[i] : null;
PsiExpression expression = i < expressions.length ? expressions[i] : null;
boolean varargs = info != null && info.isVarargs();
if (assignmentCompatible(i, parameters, expressions, substitutor, varargs)) continue;
PsiParameter parameter = null;
if (i < parameters.length) {
parameter = parameters[i];
}
else if (!varargAdded) {
parameter = parameters[parameters.length - 1];
varargAdded = true;
}
PsiType parameterType = substitutor.substitute(PsiTypesUtil.getParameterType(parameters, i, varargs));
PsiExpression expression = i < expressions.length ? expressions[i] : null;
boolean showShortType = HighlightUtil.showShortType(parameterType,
expression != null ? expression.getType() : null);
s.append("<tr>");
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/VarargsTooltip.java
+1 -1
View File
@@ -4,6 +4,6 @@ class MyTest {
}
void test() {
processStrings(<error descr="'processStrings(java.lang.String...)' in 'MyTest' cannot be applied to '(int, java.lang.String, java.lang.String)'">1</error>, "str", "s");
processStrings("", <error descr="'processStrings(java.lang.String...)' in 'MyTest' cannot be applied to '(java.lang.String, int, java.lang.String, java.lang.String)'">1</error>, "str", "s");
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/lambda/GenericsHighlighting8Test.java
+5 -9
View File
@@ -1101,15 +1101,11 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
int fontSize = StartupUiUtil.getLabelFont().getSize() - (SystemInfo.isWindows ? 0 : 1);
String expected = "<html><body><table>" +
"<tr>" +
"<td/>" +
"<td style='color: " + greyed + "; padding-left: 16px; padding-right: 24px;'>Required type</td>" +
"<td style='color: " + greyed + "; padding-right: 28px;'>Provided</td></tr>" +
"<tr>" +
"<td><table><tr><td style='color: " + greyed + "; font-size:" + fontSize + "pt; padding:1px 4px 1px 4px;background-color: " + paramBgColor + ";'>charSequences:</td></tr></table></td>" +
"<td style='padding-left: 16px; padding-right: 24px;'><font color='" + toolTipForeground + "'>CharSequence...</font></td>" +
"<td style='padding-right: 28px;'><font color='" + red + "'>String</font></td></tr>" +
"<tr><td/><td style='padding-left: 16px; padding-right: 24px;'/><td style='padding-right: 28px;'><font color='" + red + "'>int</font></td></tr>" +
"<tr><td/><td style='padding-left: 16px; padding-right: 24px;'/><td style='padding-right: 28px;'><font color='" + red + "'>String</font></td></tr>" +
"<td style='padding: 0px 16px 8px 4px;color: " + greyed + "'>Required type:</td>" +
"<td style='padding: 0px 4px 8px 0px;'><font color='" + toolTipForeground + "'>CharSequence...</font></td>" +
"</tr>" +
"<tr><td style='padding: 0px 16px 0px 4px;color: " + greyed + "'>Provided:</td>" +
"<td style='padding: 0px 4px 0px 0px;'><font color='" + red + "'>int</font></td></tr>" +
"</table></body></html>";
doHighlighting()