Convert concatenation to template: omit braces when converting 'this' #KT-7555 Fixed

idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt

@@ -120,6 +120,9 @@ open class ConvertToStringTemplateIntention : SelfTargetingOffsetIndependentInte
 
                 is KtNameReferenceExpression ->
                     return "$" + (if (forceBraces) "{$expressionText}" else expressionText)
+
+                is KtThisExpression ->
+                    return "$" + (if (forceBraces || expression.labelQualifier != null) "{$expressionText}" else expressionText)
             }
 
             return "\${$expressionText}"

idea/testData/intentions/convertToStringTemplate/this.kt

@@ -0,0 +1,3 @@
+class A {
+    val s = ""<caret> + this
+}

idea/testData/intentions/convertToStringTemplate/this.kt.after

@@ -0,0 +1,3 @@
+class A {
+    val s = "$this"
+}

idea/testData/intentions/convertToStringTemplate/this2.kt

@@ -0,0 +1,4 @@
+class A {
+    val i = 1
+    val s = ""<caret> + this.i
+}

idea/testData/intentions/convertToStringTemplate/this2.kt.after

@@ -0,0 +1,4 @@
+class A {
+    val i = 1
+    val s = "${this.i}"
+}

idea/testData/intentions/convertToStringTemplate/this3.kt

@@ -0,0 +1,5 @@
+class A {
+    inner class B {
+        val s = ""<caret> + this@A
+    }
+}

idea/testData/intentions/convertToStringTemplate/this3.kt.after

@@ -0,0 +1,5 @@
+class A {
+    inner class B {
+        val s = "${this@A}"
+    }
+}

idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java

@@ -7450,6 +7450,21 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/convertToStringTemplate/templatePlusStringLiteral.kt");
         }
 
+        @TestMetadata("this.kt")
+        public void testThis() throws Exception {
+            runTest("idea/testData/intentions/convertToStringTemplate/this.kt");
+        }
+
+        @TestMetadata("this2.kt")
+        public void testThis2() throws Exception {
+            runTest("idea/testData/intentions/convertToStringTemplate/this2.kt");
+        }
+
+        @TestMetadata("this3.kt")
+        public void testThis3() throws Exception {
+            runTest("idea/testData/intentions/convertToStringTemplate/this3.kt");
+        }
+
         @TestMetadata("tricky.kt")
         public void testTricky() throws Exception {
             runTest("idea/testData/intentions/convertToStringTemplate/tricky.kt");