[settings] replaced * with proper help icon in type annotations settings #SCL-21984 fixed

SrTobi · SrTobi · commit ff17bc345966 · 2024-02-27T00:55:38.000+01:00
diff --git a/scala/scala-impl/resources/messages/ScalaBundle.properties b/scala/scala-impl/resources/messages/ScalaBundle.properties
@@ -1176,23 +1176,23 @@ type.annotations.panel.underscore.parameter=Underscore parameter
 type.annotations.panel.enforce.for=Enforce for
 type.annotations.panel.implicit.definition=Implicit definition
 type.annotations.panel.unit.type=Unit type
-type.annotations.panel.accidental.structural.type=Accidental structural type*
-type.annotations.panel.accidental.structural.type.tooltip=<html>Enforces type annotations for values, which have structural type inferred, e.g.<br>\n<pre><code>\nval foo = Runnable {\n  override def run(): Unit = ()\n  def helper(): Unit = ()\n} // foo has inferred type Runnable { def helper(): Unit } \n</code></pre></html>
+type.annotations.panel.accidental.structural.type=Accidental structural type
 #Except when
 type.annotations.panel.except.when=Except when
 type.annotations.panel.member.of.anonymous.class=Member of anonymous class
 type.annotations.panel.member.of.private.class=Member of private class
 type.annotations.panel.member.of=Member of:
 type.annotations.panel.annotated.with=Annotated with:
 type.annotations.panel.constant.final.val=Constant (final val)
-type.annotations.panel.type.is.stable=Type is stable*
-type.annotations.panel.type.is.stable.tooltip=<html><body>When right-hand side is:<br> Literal: <code>123</code>, <code>\\"string\\"</code>, etc. (excluding <code>null</code>)<br> Unit expression: <code>()</code><br> Object creation: <code>new Foo(...)</code> (excluding one with refinement: <code>new Foo() {}</code>)<br> Factory method call: <code>Foo(...)</code> (calling <code>apply(...)</code> on companion object)<br> Empty collection: <code>Seq.empty[Int]</code>, <code>Map.empty[Int, String]</code>, etc.<br> Java enum constant: <code>Enum.VALUE</code><br> An exception: <code>throw Exception()</code> </body></html>
+type.annotations.panel.type.is.stable=Type is stable
 type.annotations.panel.type.matches=Type matches:
 type.annotations.panel.in.test.sources=In test sources
-type.annotations.panel.in.scala.dialect.sources=In Scala dialect sources*
-type.annotations.panel.in.scala.dialect.sources.tooltip=*.sbt, *.sc, etc.
+type.annotations.panel.in.scala.dialect.sources=In Scala dialect sources
 
 ### org/jetbrains/plugins/scala/lang/formatting/settings/TypeAnnotationsPanelBase.java
+type.annotations.panel.accidental.structural.type.tooltip=<html>Enforces type annotations for values which have structural type inferred, e.g.<br>\n<pre><code>\nval foo = Runnable {\n  override def run(): Unit = ()\n  def helper(): Unit = ()\n} // foo has inferred type Runnable { def helper(): Unit } \n</code></pre></html>
+type.annotations.panel.type.is.stable.tooltip=<html><body>When right-hand side is:<br> Literal: <code>123</code>, <code>\\"string\\"</code>, etc. (excluding <code>null</code>)<br> Unit expression: <code>()</code><br> Object creation: <code>new Foo(...)</code> (excluding one with refinement: <code>new Foo() {}</code>)<br> Factory method call: <code>Foo(...)</code> (calling <code>apply(...)</code> on companion object)<br> Empty collection: <code>Seq.empty[Int]</code>, <code>Map.empty[Int, String]</code>, etc.<br> Java enum constant: <code>Enum.VALUE</code><br> An exception: <code>throw Exception()</code> </body></html>
+type.annotations.panel.in.scala.dialect.sources.tooltip=*.sbt, *.sc, etc.
 #Type Annotations panel
 type.annotations.panel.title=Type Annotations
 type.annotations.panel.classes=Classes
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/formatting/settings/TypeAnnotationsPanelBase.form b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/formatting/settings/TypeAnnotationsPanelBase.form
@@ -115,16 +115,6 @@
               <text resource-bundle="messages/ScalaBundle" key="type.annotations.panel.member.of.private.class"/>
             </properties>
           </component>
-          <component id="37134" class="javax.swing.JCheckBox" binding="myStableType">
-            <constraints>
-              <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <selected value="true"/>
-              <text resource-bundle="messages/ScalaBundle" key="type.annotations.panel.type.is.stable"/>
-              <toolTipText resource-bundle="messages/ScalaBundle" key="type.annotations.panel.type.is.stable.tooltip"/>
-            </properties>
-          </component>
           <hspacer id="49b13">
             <constraints>
               <grid row="0" column="0" row-span="12" col-span="1" vsize-policy="1" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false">
@@ -140,15 +130,6 @@
               <text resource-bundle="messages/ScalaBundle" key="type.annotations.panel.in.test.sources"/>
             </properties>
           </component>
-          <component id="4eb3a" class="javax.swing.JCheckBox" binding="myDialectSources">
-            <constraints>
-              <grid row="11" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text resource-bundle="messages/ScalaBundle" key="type.annotations.panel.in.scala.dialect.sources"/>
-              <toolTipText resource-bundle="messages/ScalaBundle" key="type.annotations.panel.in.scala.dialect.sources.tooltip"/>
-            </properties>
-          </component>
           <grid id="43d6d" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
@@ -235,6 +216,58 @@
               </component>
             </children>
           </grid>
+          <grid id="35963" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="37134" class="javax.swing.JCheckBox" binding="myStableType">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <selected value="true"/>
+                  <text resource-bundle="messages/ScalaBundle" key="type.annotations.panel.type.is.stable"/>
+                </properties>
+              </component>
+              <component id="38b9b" class="com.intellij.ui.ContextHelpLabel" binding="myStableTypeHelp" custom-create="true">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="1" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <alignmentX value="0.0"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+          <grid id="7b9c4" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="11" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="4eb3a" class="javax.swing.JCheckBox" binding="myDialectSources">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <label value="In Scala dialect sources"/>
+                  <text resource-bundle="messages/ScalaBundle" key="type.annotations.panel.in.scala.dialect.sources"/>
+                </properties>
+              </component>
+              <component id="4f252" class="com.intellij.ui.ContextHelpLabel" binding="myDialectSourcesHelp" custom-create="true">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="1" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+              </component>
+            </children>
+          </grid>
         </children>
       </grid>
       <vspacer id="5ab88">
@@ -278,16 +311,31 @@
               <text resource-bundle="messages/ScalaBundle" key="type.annotations.panel.unit.type"/>
             </properties>
           </component>
-          <component id="d134d" class="javax.swing.JCheckBox" binding="myStructuralType">
+          <grid id="dce2b" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="2" indent="0" use-parent-layout="false"/>
             </constraints>
-            <properties>
-              <selected value="true"/>
-              <text resource-bundle="messages/ScalaBundle" key="type.annotations.panel.accidental.structural.type"/>
-              <toolTipText resource-bundle="messages/ScalaBundle" key="type.annotations.panel.accidental.structural.type.tooltip"/>
-            </properties>
-          </component>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="d134d" class="javax.swing.JCheckBox" binding="myStructuralType">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <selected value="true"/>
+                  <text resource-bundle="messages/ScalaBundle" key="type.annotations.panel.accidental.structural.type"/>
+                </properties>
+              </component>
+              <component id="39a57" class="com.intellij.ui.ContextHelpLabel" binding="myStructuralTypeHelp" custom-create="true">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="1" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+              </component>
+            </children>
+          </grid>
         </children>
       </grid>
       <hspacer id="49c65">
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/formatting/settings/TypeAnnotationsPanelBase.java b/scala/scala-impl/src/org/jetbrains/plugins/scala/lang/formatting/settings/TypeAnnotationsPanelBase.java
