From 5766652109a61a264d8fe47a1587bf005dddcf62 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 3 Jan 2020 18:57:45 +0700 Subject: [PATCH] Records: consider varargness mismatch as compilation error There's an agreement to do this in expert group -- see http://mail.openjdk.java.net/pipermail/amber-spec-experts/2019-December/001889.html GitOrigin-RevId: 8fc465ece0b9c4bb1517793a60cabab34933b688 --- .../daemon/impl/analysis/HighlightMethodUtil.java | 6 ------ .../advHighlightingRecords/RecordConstructors.java | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java index d30e25cd289d..d1b75b753cc1 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java @@ -1961,12 +1961,6 @@ public class HighlightMethodUtil { for (int i = 0; i < parameters.length; i++) { PsiType componentType = components[i].getType(); PsiType parameterType = parameters[i].getType(); - if (componentType instanceof PsiEllipsisType) { - componentType = ((PsiEllipsisType)componentType).toArrayType(); - } - if (parameterType instanceof PsiEllipsisType) { - parameterType = ((PsiEllipsisType)parameterType).toArrayType(); - } String componentName = components[i].getName(); String parameterName = parameters[i].getName(); if (!parameterType.equals(componentType)) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordConstructors.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordConstructors.java index b3d93178c0ed..c8209d32456f 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordConstructors.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordConstructors.java @@ -23,12 +23,12 @@ record NameMismatch(int x, int y) { } // Current spec draft allows this record VarArgMismatch(int... x) { - public VarArgMismatch(int[] x) { + public VarArgMismatch(int[] x) { this.x = x; } } record VarArgMismatch2(int[] x) { - public VarArgMismatch2(int... x) { + public VarArgMismatch2(int... x) { this.x = x; } }