[completion] fix match/catch keyword completion in indentation-based syntax

Author: timaliberdov

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/completion/lookups/ScalaKeywordLookupItem.scala

@@ -9,8 +9,11 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.codeStyle.{CodeStyleManager, CommonCodeStyleSettings}
 import com.intellij.psi.{PsiDocumentManager, PsiFile}
 import com.intellij.util.ui.EmptyIcon
-import org.jetbrains.plugins.scala.extensions.{BooleanExt, PsiFileExt}
+import org.jetbrains.plugins.scala.editor.DocumentExt
+import org.jetbrains.plugins.scala.extensions.{BooleanExt, ObjectExt, PsiFileExt}
 import org.jetbrains.plugins.scala.lang.completion.InsertionContextExt
+import org.jetbrains.plugins.scala.lang.psi.api.ScalaPsiElement
+import org.jetbrains.plugins.scala.lang.surroundWith.surrounders.expression.ScalaPsiElementExt
 import org.jetbrains.plugins.scala.{ScalaFileType, ScalaLanguage}
 
 object ScalaKeywordLookupItem {
@@ -81,11 +84,24 @@ object ScalaKeywordLookupItem {
           case MATCH | CATCH =>
             val caretOffset = caretModel.getOffset
 
-            val useIndentationBasedSyntax = file.useIndentationBasedSyntax
-            val text = if (useIndentationBasedSyntax) s"\n$CASE" else s"{\n$CASE\n}"
+            val text = s"{\n$CASE\n}"
             document.insertString(caretOffset, text)
             adjustLineIndent(TextRange.from(caretOffset, text.length))
 
+            val useIndentationBasedSyntax = file.useIndentationBasedSyntax
+            if (useIndentationBasedSyntax) {
+              document.commit(project)
+              /** the first char of [[text]] is `{` so the element at [[caretOffset]] will be brace leaf element */
+              val lBrace = file.findElementAt(caretOffset)
+
+              Option(lBrace) // just in case to avoid NPE
+                .flatMap(_.getContext.asOptionOf[ScalaPsiElement])
+                .foreach { element =>
+                  element.toIndentationBasedSyntax
+                  PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document)
+                }
+            }
+
             val endOffset = document.getLineEndOffset(document.getLineNumber(caretOffset) + (!useIndentationBasedSyntax).toInt)
             document.insertString(endOffset, " ")
             caretModel.moveToOffset(endOffset + 1)

scala/scala-impl/src/org/jetbrains/plugins/scala/lang/surroundWith/surrounders/expression/package.scala

@@ -65,6 +65,8 @@ package object expression {
                 case _ =>
               }
             }
+          case block: ScBlockExpr =>
+            convertBlockToBraceless(block)
           case _ =>
             element.children.toList.foreach {
               case block: ScBlockExpr =>

scala/scala-impl/test/org/jetbrains/plugins/scala/lang/completion3/ScalaKeywordCompletionTest.scala

@@ -676,6 +676,32 @@ class ScalaKeywordCompletionTest_3_Latest extends ScalaCompletionTestBase {
     item = "match"
   )
 
+  def testMatchInBracelessBlock(): Unit = doCompletionTest(
+    fileText =
+      s"""object O:
+         |  42 m$CARET
+         |""".stripMargin,
+    resultText =
+      s"""object O:
+         |  42 match
+         |    case $CARET
+         |""".stripMargin,
+    item = "match"
+  )
+
+  def testMatchInBracedBlock(): Unit = doCompletionTest(
+    fileText =
+      s"""object O {
+         |  42 m$CARET
+         |}""".stripMargin,
+    resultText =
+      s"""object O {
+         |  42 match
+         |    case $CARET
+         |}""".stripMargin,
+    item = "match"
+  )
+
   def testInfixMatch(): Unit = doCompletionTest(
     fileText =
       s"42 m$CARET ",
@@ -694,6 +720,32 @@ class ScalaKeywordCompletionTest_3_Latest extends ScalaCompletionTestBase {
     item = "catch"
   )
 
+  def testCatchInBracelessBlock(): Unit = doCompletionTest(
+    fileText =
+      s"""object O:
+         |  try 42 c$CARET
+         |""".stripMargin,
+    resultText =
+      s"""object O:
+         |  try 42 catch
+         |    case $CARET
+         |""".stripMargin,
+    item = "catch"
+  )
+
+  def testCatchInBracedBlock(): Unit = doCompletionTest(
+    fileText =
+      s"""object O {
+         |  try 42 c$CARET
+         |}""".stripMargin,
+    resultText =
+      s"""object O {
+         |  try 42 catch
+         |    case $CARET
+         |}""".stripMargin,
+    item = "catch"
+  )
+
   def testWithInGivenDefinition(): Unit = doCompletionTest(
     fileText =
       s"""given foo: AnyRef w$CARET""".stripMargin,