diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
index f294061ba0d2..9052aaf49eaf 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
@@ -1901,7 +1901,7 @@ public final class JavaSpacePropertyProcessor extends JavaElementVisitor {
 
   @Override
   public void visitRecordPattern(PsiRecordPattern recordPattern) {
-    if (myType1 == JavaElementType.RECORD_STRUCTURE_PATTERN && myType2 == JavaTokenType.IDENTIFIER) {
+    if (myType1 == JavaElementType.RECORD_STRUCTURE_PATTERN && myType2 == JavaElementType.RECORD_PATTERN_VARIABLE) {
       createSpaceInCode(true);
     }
   }
diff --git a/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java b/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java
index 71dba28cc205..b780c350a47a 100644
--- a/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java
+++ b/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java
@@ -297,6 +297,8 @@ public abstract class JavaElementVisitor extends PsiElementVisitor {
     visitElement(pattern);
   }
 
+  public void visitPatternGuard(PsiPatternGuard guard) { visitElement(guard); }
+
   public void visitPatternVariable(@NotNull PsiPatternVariable variable) {
     visitParameter(variable);
   }
@@ -329,6 +331,12 @@ public abstract class JavaElementVisitor extends PsiElementVisitor {
     visitElement(recordHeader);
   }
 
+  public void visitRecordPattern(PsiRecordPattern recordPattern) { visitElement(recordPattern); }
+
+  public void visitRecordPatternVariable(PsiRecordPatternVariable variable) { visitPatternVariable(variable); }
+
+  public void visitRecordStructurePattern(PsiRecordStructurePattern recordStructurePattern) { visitElement(recordStructurePattern); }
+
   public void visitReferenceElement(@NotNull PsiJavaCodeReferenceElement reference) {
     visitElement(reference);
   }
@@ -471,12 +479,4 @@ public abstract class JavaElementVisitor extends PsiElementVisitor {
   public void visitYieldStatement(@NotNull PsiYieldStatement statement) {
     visitStatement(statement);
   }
-
-  public void visitRecordPattern(PsiRecordPattern recordPattern) { visitElement(recordPattern); }
-
-  public void visitRecordStructurePattern(PsiRecordStructurePattern recordStructurePattern) { visitElement(recordStructurePattern); }
-
-  public void visitRecordPatternVariable(PsiRecordPatternVariable variable) { visitPatternVariable(variable); }
-
-  public void visitPatternGuard(PsiPatternGuard guard) { visitElement(guard); }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/SwitchByString.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/SwitchByString.java
index 1f7253fadf06..f320c374c5b5 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/SwitchByString.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/SwitchByString.java
@@ -24,8 +24,8 @@ public class Test {
     String foo = "foo";
     String key = "key";
     switch (key) {
-      case <error>foo</error>:
-      case <error>getStringValue()</error>: {
+      case foo:
+      case <error descr="Cannot resolve symbol 'getStringValue'">getStringValue</error>(): {
         System.out.println("illegal");
         break;
       }
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/IncompleteSwitchEnum.java b/java/java-tests/testData/inspection/dataFlow/fixture/IncompleteSwitchEnum.java
index 9a7f2e172620..54f42df9d00a 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/IncompleteSwitchEnum.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/IncompleteSwitchEnum.java
@@ -4,7 +4,7 @@ public enum Test {
   void test() {
     Integer code = getCode();
     switch (code) {
-      case VALUE.value()<EOLError descr="':' expected"></EOLError>
+      case VALUE.<error descr="Cannot resolve symbol 'value'">value</error>()<EOLError descr="':' expected"></EOLError>
     }
     if (code == VALUE.value()) {
       getCode();