From f708d8febb1f965c46fed2ea8c485e98e25fee62 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Tue, 14 Jan 2020 16:12:24 +0700
Subject: [PATCH] IDEA-230559 'final' modifier is not allowed on record
 component

GitOrigin-RevId: 5f06b57f53fda76465a53f67440cc14a99be86db
---
 .../codeInsight/daemon/impl/analysis/HighlightUtil.java      | 5 ++---
 .../advHighlightingRecords/RecordBasics.java                 | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index e993b78362bd..8d6fa04f8cdc 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -1022,11 +1022,10 @@ public class HighlightUtil extends HighlightUtilBase {
     else if (modifierOwner instanceof PsiClassInitializer) {
       isAllowed = PsiModifier.STATIC.equals(modifier);
     }
-    else if (modifierOwner instanceof PsiLocalVariable || modifierOwner instanceof PsiParameter || 
-             modifierOwner instanceof PsiRecordComponent) {
+    else if (modifierOwner instanceof PsiLocalVariable || modifierOwner instanceof PsiParameter) {
       isAllowed = PsiModifier.FINAL.equals(modifier);
     }
-    else if (modifierOwner instanceof PsiReceiverParameter) {
+    else if (modifierOwner instanceof PsiReceiverParameter || modifierOwner instanceof PsiRecordComponent) {
       isAllowed = false;
     }
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordBasics.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordBasics.java
index 5043303849e8..ec5b3ff7feea 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordBasics.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordBasics.java
@@ -23,7 +23,7 @@ record <error descr="Class 'UnrelatedDefaults' must implement abstract method 'r
 record ComponentModifiers(
   <error descr="Modifier 'public' not allowed here">public</error> int x, 
   <error descr="Modifier 'static' not allowed here">static</error> int y,
-  final int z) {}
+  <error descr="Modifier 'final' not allowed here">final</error> int z) {}
 record ComponentDuplicateName(int <error descr="Variable 'x' is already defined in the scope">x</error>, int <error descr="Variable 'x' is already defined in the scope">x</error>) {}
 record VarArgOk(int... x) {}
 record VarArgOk2(int x, int... y) {}