From c72b96d48147e73270b1a58f830ddf9f71185d49 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Thu, 1 Aug 2024 09:07:34 +0200
Subject: [PATCH] Java: enable Pratt parser by default (IDEA-305898)

GitOrigin-RevId: 597cfc30aeff88a7791e9e185b5c08426844d4da
---
 .../com/intellij/lang/java/parser/BasicExpressionParser.java  | 4 ++--
 java/java-psi-impl/src/META-INF/JavaPsiPlugin.xml             | 2 +-
 .../inplaceIntroduceVariable/heavilyBrokenFile.java           | 2 +-
 .../inplaceIntroduceVariable/heavilyBrokenFile_after.java     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicExpressionParser.java b/java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicExpressionParser.java
index 827a4f0f3365..f48e38b2a84d 100644
--- a/java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicExpressionParser.java
+++ b/java/java-frontback-psi-impl/src/com/intellij/lang/java/parser/BasicExpressionParser.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.lang.java.parser;
 
 import com.intellij.core.JavaPsiBundle;
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.PropertyKey;
 import java.util.function.Function;
 
 public class BasicExpressionParser {
-  private static final boolean useNewImplementation = Registry.is("pratt.java.expression.parser", false);
+  private static final boolean useNewImplementation = Registry.is("pratt.java.expression.parser", true);
 
   private final BasicOldExpressionParser myOldExpressionParser;
   private final BasicPrattExpressionParser myNewExpressionParser;
diff --git a/java/java-psi-impl/src/META-INF/JavaPsiPlugin.xml b/java/java-psi-impl/src/META-INF/JavaPsiPlugin.xml
index 145f890d8cea..689285b36292 100644
--- a/java/java-psi-impl/src/META-INF/JavaPsiPlugin.xml
+++ b/java/java-psi-impl/src/META-INF/JavaPsiPlugin.xml
@@ -70,7 +70,7 @@
   </extensionPoints>
 
   <extensions defaultExtensionNs="com.intellij">
-    <registryKey defaultValue="false" description="Use pratt java expression parser" key="pratt.java.expression.parser" restartRequired="true" />
+    <registryKey defaultValue="true" description="Use pratt java expression parser" key="pratt.java.expression.parser" restartRequired="true" />
     <applicationService serviceInterface="com.intellij.psi.util.JavaClassSupers"
                         serviceImplementation="com.intellij.psi.impl.JavaClassSupersImpl"/>
     <applicationService serviceInterface="com.intellij.codeInsight.TestFrameworks"
diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceVariable/heavilyBrokenFile.java b/java/java-tests/testData/refactoring/inplaceIntroduceVariable/heavilyBrokenFile.java
index 015b622443d2..799bc5847789 100644
--- a/java/java-tests/testData/refactoring/inplaceIntroduceVariable/heavilyBrokenFile.java
+++ b/java/java-tests/testData/refactoring/inplaceIntroduceVariable/heavilyBrokenFile.java
@@ -1,5 +1,5 @@
 class TestClass {
   public void test() {
-        <T1 x="s1"><T2 t2= 1 <caret>>;
+        <T1 x="s1">#T2 t2= 1 <caret>>;
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/inplaceIntroduceVariable/heavilyBrokenFile_after.java b/java/java-tests/testData/refactoring/inplaceIntroduceVariable/heavilyBrokenFile_after.java
index 7090f83f851a..de9a1ab296bc 100644
--- a/java/java-tests/testData/refactoring/inplaceIntroduceVariable/heavilyBrokenFile_after.java
+++ b/java/java-tests/testData/refactoring/inplaceIntroduceVariable/heavilyBrokenFile_after.java
@@ -1,5 +1,5 @@
 class TestClass {
   public void test() {
-      T2 t3 = 1 >;<T1 x="s1"><T2 t2= t3;
+      T2 t3 = 1 >;<T1 x="s1">#T2 t2= t3;
   }
 }
\ No newline at end of file