bugfix: don't show arg completions for infix

scalameta · Jul 20, 2023 · a073513 · a073513
1 parent b334da8
commit a073513
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/mtags/src/main/scala-2/scala/meta/internal/pc/completions/Completions.scala b/mtags/src/main/scala-2/scala/meta/internal/pc/completions/Completions.scala
@@ -455,6 +455,18 @@ trait Completions { this: MetalsGlobal =>
         ident: Ident,
         apply: Apply
     ): CompletionPosition = {
+      def isInfix(apply: Apply, text: String) =
+        apply.fun match {
+          case Select(New(_), _) => false
+          case Select(_, name) if name.decoded == "apply" => false
+          case Select(This(_), _) => false
+          // is a select statement without a dot `qual.name`
+          case Select(qual, _) => {
+            val pos = qual.pos.end
+            pos < text.length() && text(pos) != '.'
+          }
+          case _ => false
+        }
       if (hasLeadingBrace(ident, text)) {
         if (isCasePrefix(ident.name)) {
           val moveToNewLine = ident.pos.line == apply.pos.line
@@ -473,7 +485,9 @@ trait Completions { this: MetalsGlobal =>
           NoneCompletion
         }
       } else {
-        ArgCompletion(ident, apply, pos, text, completions)
+        if (!isInfix(apply, text)) {
+          ArgCompletion(ident, apply, pos, text, completions)
+        } else NoneCompletion
       }
     }
 

diff --git a/tests/cross/src/test/scala/tests/pc/CompletionArgSuite.scala b/tests/cross/src/test/scala/tests/pc/CompletionArgSuite.scala
@@ -501,18 +501,7 @@ class CompletionArgSuite extends BaseCompletionSuite {
         |}
         |""".stripMargin,
     """|x: Int
-       |x = : Byte
-       |x = : Char
-       |x = : Double
-       |x = : Float
-       |x = : Int
-       |x = : Long
-       |x = : Short
-       |x = x : Int
        |""".stripMargin,
-    compat = Map(
-      "3" -> "x: Int"
-    ),
   )
 
   check(