From ea08920aee5c90f2a02ec7099599000fda98615d Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Mon, 23 Mar 2020 15:19:59 +0700
Subject: [PATCH] Inline descriptions for soutc, serrc; FQN for
 java.lang.System

Review ID: IDEA-CR-60451

GitOrigin-RevId: c50adbdaeb66256e8e09b37d618eb84169c69c09
---
 .../template/SerrConsumerConflict-out.java     |  8 ++++++++
 .../template/SerrConsumerConflict.java         |  8 ++++++++
 .../template/JavaLiveTemplateTest.groovy       |  6 ++++++
 .../messages/CodeInsightBundle.properties      |  2 --
 resources/src/liveTemplates/output.xml         | 18 ++++++++----------
 5 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 java/java-tests/testData/codeInsight/template/SerrConsumerConflict-out.java
 create mode 100644 java/java-tests/testData/codeInsight/template/SerrConsumerConflict.java

diff --git a/java/java-tests/testData/codeInsight/template/SerrConsumerConflict-out.java b/java/java-tests/testData/codeInsight/template/SerrConsumerConflict-out.java
new file mode 100644
index 000000000000..8eceabd95384
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/template/SerrConsumerConflict-out.java
@@ -0,0 +1,8 @@
+import java.util.List;
+
+class System {
+
+  static void foo(List<String> ls) {
+    ls.forEach(java.lang.System.err::println<caret>);
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/template/SerrConsumerConflict.java b/java/java-tests/testData/codeInsight/template/SerrConsumerConflict.java
new file mode 100644
index 000000000000..ebeca652d2a3
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/template/SerrConsumerConflict.java
@@ -0,0 +1,8 @@
+import java.util.List;
+
+class System {
+
+  static void foo(List<String> ls) {
+    ls.forEach(<caret>);
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/template/JavaLiveTemplateTest.groovy b/java/java-tests/testSrc/com/intellij/java/codeInsight/template/JavaLiveTemplateTest.groovy
index c7bd13bcf35d..f235ece2f279 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/template/JavaLiveTemplateTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/template/JavaLiveTemplateTest.groovy
@@ -245,6 +245,12 @@ class Outer {
     checkResult()
   }
 
+  void testSerrConsumerConflict() {
+    configure()
+    startTemplate("serrc", "output")
+    checkResult()
+  }
+
   private boolean isApplicable(String text, TemplateImpl inst) throws IOException {
     myFixture.configureByText("a.java", text)
     return TemplateManagerImpl.isApplicable(myFixture.getFile(), getEditor().getCaretModel().getOffset(), inst)
diff --git a/platform/lang-api/resources/messages/CodeInsightBundle.properties b/platform/lang-api/resources/messages/CodeInsightBundle.properties
index b6b26eaa4066..9a4beae7f25b 100644
--- a/platform/lang-api/resources/messages/CodeInsightBundle.properties
+++ b/platform/lang-api/resources/messages/CodeInsightBundle.properties
@@ -282,9 +282,7 @@ livetemplate.description.if.not.null=Inserts 'if not null' statement
 livetemplate.description.if.null=Inserts 'if null' statement
 livetemplate.description.geti=Inserts singleton method getInstance
 livetemplate.description.serr=Prints a string to System.err
-livetemplate.description.serrc=System.err::println
 livetemplate.description.sout=Prints a string to System.out
-livetemplate.description.soutc=System.out::println
 livetemplate.description.souf=Prints a formatted string to System.out
 livetemplate.description.soutm=Prints current class and method names to System.out
 livetemplate.description.soutp=Prints method parameter names and values to System.out
diff --git a/resources/src/liveTemplates/output.xml b/resources/src/liveTemplates/output.xml
index 0351307ac9df..b069aeec2757 100644
--- a/resources/src/liveTemplates/output.xml
+++ b/resources/src/liveTemplates/output.xml
@@ -1,42 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templateSet group="output">
   <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.serr"
-            name="serr" toReformat="true" toShortenFQNames="true" value="System.err.println($END$);">
+            name="serr" toReformat="true" toShortenFQNames="true" value="java.lang.System.err.println($END$);">
     <context>
       <option name="JAVA_CODE" value="false" />
       <option name="JAVA_STATEMENT" value="true" />
     </context>
   </template>
-  <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.serrc"
-            name="serrc" toReformat="true" toShortenFQNames="true" value="System.err::println">
+  <template description="System.err::println" name="serrc" toReformat="true" toShortenFQNames="true" value="java.lang.System.err::println">
     <context>
       <option name="JAVA_CODE" value="false" />
       <option name="JAVA_CONSUMER" value="true" />
     </context>
   </template>
   <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.sout"
-            name="sout" toReformat="true" toShortenFQNames="true" value="System.out.println($END$);">
+            name="sout" toReformat="true" toShortenFQNames="true" value="java.lang.System.out.println($END$);">
     <context>
       <option name="JAVA_CODE" value="false" />
       <option name="JAVA_STATEMENT" value="true" />
     </context>
   </template>
-  <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.soutc"
-            name="soutc" toReformat="true" toShortenFQNames="true" value="System.out::println">
+  <template description="System.out::println" name="soutc" toReformat="true" toShortenFQNames="true" value="java.lang.System.out::println">
     <context>
       <option name="JAVA_CODE" value="false" />
       <option name="JAVA_CONSUMER" value="true" />
     </context>
   </template>
   <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.souf"
-            name="souf" toReformat="true" toShortenFQNames="true" value="System.out.printf(&quot;$END$&quot;);">
+            name="souf" toReformat="true" toShortenFQNames="true" value="java.lang.System.out.printf(&quot;$END$&quot;);">
     <context>
       <option name="JAVA_CODE" value="false" />
       <option name="JAVA_STATEMENT" value="true" />
     </context>
   </template>
   <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.soutm"
-            name="soutm" toReformat="true" toShortenFQNames="true" value="System.out.println(&quot;$CLASS_NAME$.$METHOD_NAME$&quot;);">
+            name="soutm" toReformat="true" toShortenFQNames="true" value="java.lang.System.out.println(&quot;$CLASS_NAME$.$METHOD_NAME$&quot;);">
     <variable alwaysStopAt="false" defaultValue="" expression="className()" name="CLASS_NAME" />
     <variable alwaysStopAt="false" defaultValue="" expression="methodName()" name="METHOD_NAME" />
     <context>
@@ -47,7 +45,7 @@
     </context>
   </template>
   <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.soutp"
-            name="soutp" toReformat="true" toShortenFQNames="true" value="System.out.println($FORMAT$);">
+            name="soutp" toReformat="true" toShortenFQNames="true" value="java.lang.System.out.println($FORMAT$);">
     <variable alwaysStopAt="false" defaultValue="" expression="groovyScript(&quot;import com.intellij.psi.*;import com.intellij.psi.util.PsiTreeUtil; def file = PsiDocumentManager.getInstance(_editor.project).getPsiFile(_editor.document); PsiMethod method = PsiTreeUtil.findElementOfClassAtOffset(file, _editor.caretModel.offset, PsiMethod.class, false); PsiParameter[] parameters = method == null ? PsiParameter.EMPTY_ARRAY : method.parameterList.parameters; return parameters.size() == 0 ? '' : '\&quot;' + parameters.collect { def prefix = it.name + ' = '; def type = it.type; return type instanceof PsiArrayType ? type.componentType instanceof PsiPrimitiveType ? prefix + '\&quot; + java.util.Arrays.toString(' + it.name + ')' : prefix + '\&quot; + java.util.Arrays.deepToString(' + it.name + ')' : prefix + '\&quot; + ' + it.name }.join(' + \&quot;, ')&quot;, methodParameters())" name="FORMAT" />
 <!--
 import com.intellij.psi.*
@@ -72,7 +70,7 @@ return parameters.size() == 0 ? '' : '"' + parameters.collect {
     </context>
   </template>
   <template resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.soutv"
-            name="soutv" toReformat="true" toShortenFQNames="true" value="System.out.println(&quot;$EXPR_COPY$ = &quot; + $EXPR$);">
+            name="soutv" toReformat="true" toShortenFQNames="true" value="java.lang.System.out.println(&quot;$EXPR_COPY$ = &quot; + $EXPR$);">
     <variable alwaysStopAt="true" defaultValue="&quot;expr&quot;" expression="variableOfType(&quot;&quot;)" name="EXPR" />
     <variable alwaysStopAt="false" defaultValue="" expression="escapeString(EXPR)" name="EXPR_COPY" />
     <context>