Merged branch idea243.release into idea243.x

JetBrains · Dec 12, 2024 · 42fb27f · 42fb27f
2 parents c0779aa + ed26a99
commit 42fb27f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/...pl/src/org/jetbrains/plugins/scala/lang/formatting/processors/ScalaSpacingProcessor.scala b/...pl/src/org/jetbrains/plugins/scala/lang/formatting/processors/ScalaSpacingProcessor.scala
@@ -15,7 +15,7 @@ import org.jetbrains.plugins.scala.extensions._
 import org.jetbrains.plugins.scala.lang.TokenSets
 import org.jetbrains.plugins.scala.lang.formatting.ScalaBlock
 import org.jetbrains.plugins.scala.lang.formatting.settings.ScalaCodeStyleSettings
-import org.jetbrains.plugins.scala.lang.lexer.{ScalaKeywordTokenType, ScalaTokenType, ScalaTokenTypes, ScalaTokenTypesEx, ScalaXmlTokenTypes}
+import org.jetbrains.plugins.scala.lang.lexer.{ScalaTokenType, ScalaTokenTypes, ScalaTokenTypesEx, ScalaXmlTokenTypes}
 import org.jetbrains.plugins.scala.lang.parser.{ScCodeBlockElementType, ScalaElementType}
 import org.jetbrains.plugins.scala.lang.psi.api.ScalaFile
 import org.jetbrains.plugins.scala.lang.psi.api.base._
@@ -39,6 +39,7 @@ import org.jetbrains.plugins.scala.lang.scaladoc.parser.ScalaDocElementTypes
 import org.jetbrains.plugins.scala.lang.scaladoc.psi.api.ScDocComment
 import org.jetbrains.plugins.scala.util.MultilineStringUtil
 import org.jetbrains.plugins.scalaDirective.lang.parser.ScalaDirectiveElementTypes
+import org.jetbrains.plugins.scalaDirective.psi.api.ScDirectiveToken
 
 import scala.annotation.{nowarn, tailrec}
 
@@ -1057,7 +1058,7 @@ object ScalaSpacingProcessor extends ScalaTokenTypes {
     if (rightBlockString.startsWith(".") &&
       rightElementType != ScalaTokenType.Float &&
       rightElementType != ScalaTokenType.Double &&
-      !rightPsi.isInstanceOf[ScLiteral]) {
+      !rightPsi.is[ScLiteral, ScDirectiveToken]) {
       return WITHOUT_SPACING
     }
     if (rightBlockString.startsWith(",")) {

diff --git a/.../jetbrains/plugins/scala/lang/formatter/intellij/tests/ScalaDirectiveFormattingTest.scala b/.../jetbrains/plugins/scala/lang/formatter/intellij/tests/ScalaDirectiveFormattingTest.scala
@@ -102,4 +102,16 @@ class ScalaDirectiveFormattingTest extends AbstractScalaFormatterTestBase {
       |// Foo
       |""".stripMargin
   )
+
+  // SCL-23326
+  def test_do_not_merge_tokens_starting_with_dot(): Unit = doTextTest(
+    """
+      |//> using file ../common/util.scala
+      |//>   using  file     ../common/util.scala
+      |""".stripMargin,
+    """
+      |//> using file ../common/util.scala
+      |//> using file ../common/util.scala
+      |""".stripMargin
+  )
 }