From f61c8612f94a1e5ecd7eaed67f2cab13994b98d6 Mon Sep 17 00:00:00 2001
From: Mikhail Pyltsin <Mikhail.Pyltsin@jetbrains.com>
Date: Thu, 20 Jul 2023 12:22:57 +0200
Subject: [PATCH] [java-highlighting] IDEA-325916 Get rid of deconstruction
 patterns with pattern variables.

Clean tests

GitOrigin-RevId: cb3ca829cabc9ab6e96f3ccb77d213896606c93e
---
 .../FromArrowToDestructuringPattern.java              |  2 +-
 .../FromArrowToDestructuringPattern_after.java        |  2 +-
 .../FromArrowToDestructuringVariable.java             |  9 ---------
 .../FromArrowToDestructuringVariable_after.java       |  9 ---------
 .../FromGuardToDestructuringPattern.java              |  2 +-
 .../FromGuardToDestructuringPattern_after.java        |  2 +-
 .../FromGuardToDestructuringVariable.java             |  9 ---------
 .../FromGuardToDestructuringVariable_after.java       |  9 ---------
 .../FromStatementToDestructuringPattern.java          |  2 +-
 .../FromStatementToDestructuringPattern_after.java    |  2 +-
 .../FromStatementToDestructuringVariable.java         | 11 -----------
 .../FromStatementToDestructuringVariable_after.java   | 11 -----------
 12 files changed, 6 insertions(+), 64 deletions(-)
 delete mode 100644 java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringVariable.java
 delete mode 100644 java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringVariable_after.java
 delete mode 100644 java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringVariable.java
 delete mode 100644 java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringVariable_after.java
 delete mode 100644 java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringVariable.java
 delete mode 100644 java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringVariable_after.java

diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringPattern.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringPattern.java
index c63e4e3aaa42..d8448ac83be6 100644
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringPattern.java
+++ b/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringPattern.java
@@ -2,7 +2,7 @@ record R(int x, int y){}
 class Test{
   void foo(Object o) {
     switch(o){
-      case R(int w, int c) s  -> System.out.println(w<caret>);
+      case R(int w, int c)  -> System.out.println(w<caret>);
       default -> System.out.println()
     }
   }
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringPattern_after.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringPattern_after.java
index c46b26a406a5..b1ac2a9791b1 100644
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringPattern_after.java
+++ b/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringPattern_after.java
@@ -2,7 +2,7 @@ record R(int x, int y){}
 class Test{
   void foo(Object o) {
     switch(o){
-      case R(int <caret>w, int c) s  -> System.out.println(w);
+      case R(int <caret>w, int c)  -> System.out.println(w);
       default -> System.out.println()
     }
   }
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringVariable.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringVariable.java
deleted file mode 100644
index 0760554648ec..000000000000
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringVariable.java
+++ /dev/null
@@ -1,9 +0,0 @@
-record R(int x, int y){}
-class Test{
-  void foo(Object o) {
-    switch(o){
-      case R(int w, int c) s  -> System.out.println(s<caret>);
-      default -> System.out.println()
-    }
-  }
-}
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringVariable_after.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringVariable_after.java
deleted file mode 100644
index 8edac1ba3643..000000000000
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromArrowToDestructuringVariable_after.java
+++ /dev/null
@@ -1,9 +0,0 @@
-record R(int x, int y){}
-class Test{
-  void foo(Object o) {
-    switch(o){
-      case R(int w, int c) <caret>s  -> System.out.println(s);
-      default -> System.out.println()
-    }
-  }
-}
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringPattern.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringPattern.java
index fbfc05078e45..dff0b17a25cd 100644
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringPattern.java
+++ b/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringPattern.java
@@ -2,7 +2,7 @@ record R(int x, int y){}
 class Test{
   void foo(Object o) {
     switch(o){
-      case R(int w, int c) s when c<caret> > 0 -> System.out.println();
+      case R(int w, int c) when c<caret> > 0 -> System.out.println();
       default -> System.out.println()
     }
   }
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringPattern_after.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringPattern_after.java
index ad4a5a001108..1c5a259e3462 100644
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringPattern_after.java
+++ b/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringPattern_after.java
@@ -2,7 +2,7 @@ record R(int x, int y){}
 class Test{
   void foo(Object o) {
     switch(o){
-      case R(int w, int <caret>c) s when c > 0 -> System.out.println();
+      case R(int w, int <caret>c) when c > 0 -> System.out.println();
       default -> System.out.println()
     }
   }
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringVariable.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringVariable.java
deleted file mode 100644
index c13323341771..000000000000
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringVariable.java
+++ /dev/null
@@ -1,9 +0,0 @@
-record R(int x, int y){}
-class Test{
-  void foo(Object o) {
-    switch(o){
-      case R(int w, int c) s when s<caret>.y() > 0 -> System.out.println();
-      default -> System.out.println()
-    }
-  }
-}
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringVariable_after.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringVariable_after.java
deleted file mode 100644
index 5db657149555..000000000000
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromGuardToDestructuringVariable_after.java
+++ /dev/null
@@ -1,9 +0,0 @@
-record R(int x, int y){}
-class Test{
-  void foo(Object o) {
-    switch(o){
-      case R(int w, int c) <caret>s when s.y() > 0 -> System.out.println();
-      default -> System.out.println()
-    }
-  }
-}
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringPattern.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringPattern.java
index 87d0a9b94f48..b388b3551b26 100644
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringPattern.java
+++ b/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringPattern.java
@@ -2,7 +2,7 @@ record R(int x, int y){}
 class Test{
   void foo(Object o) {
     switch(o){
-      case R(int w, int c) s:
+      case R(int w, int c):
         System.out.println(c<caret>);
         break;
       default -> System.out.println()
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringPattern_after.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringPattern_after.java
index a76fdf072717..ce35a532d699 100644
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringPattern_after.java
+++ b/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringPattern_after.java
@@ -2,7 +2,7 @@ record R(int x, int y){}
 class Test{
   void foo(Object o) {
     switch(o){
-      case R(int w, int <caret>c) s:
+      case R(int w, int <caret>c):
         System.out.println(c);
         break;
       default -> System.out.println()
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringVariable.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringVariable.java
deleted file mode 100644
index c9365faf078c..000000000000
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringVariable.java
+++ /dev/null
@@ -1,11 +0,0 @@
-record R(int x, int y){}
-class Test{
-  void foo(Object o) {
-    switch(o){
-      case R(int w, int c) s:
-        System.out.println(s<caret>);
-        break;
-      default -> System.out.println()
-    }
-  }
-}
diff --git a/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringVariable_after.java b/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringVariable_after.java
deleted file mode 100644
index 933f36ceefdd..000000000000
--- a/java/java-tests/testData/codeInsight/gotoDeclaration/FromStatementToDestructuringVariable_after.java
+++ /dev/null
@@ -1,11 +0,0 @@
-record R(int x, int y){}
-class Test{
-  void foo(Object o) {
-    switch(o){
-      case R(int w, int c) <caret>s:
-        System.out.println(s);
-        break;
-      default -> System.out.println()
-    }
-  }
-}