Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quote names when necessary in Symbol#normalized #1100

Merged
merged 1 commit into from
Apr 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package scala.meta.internal.scalafix
import scala.meta.Dialect
import scala.meta.Tree
import scala.meta.dialects
import scala.meta.internal.semanticdb.Scala.Names
import scala.meta.internal.trees.Origin

object ScalafixScalametaHacks {
Expand All @@ -11,4 +12,5 @@ object ScalafixScalametaHacks {
else if (language.isEmpty) dialects.Scala212
else Dialect.standards(language)
def resetOrigin(tree: Tree): Tree = tree.withOrigin(Origin.None)
def encode(name: String): String = Names.encode(name)
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package scalafix.internal.util

import scala.meta._
import scala.meta.internal.ScalametaInternals
import scala.meta.internal.scalafix.ScalafixScalametaHacks
import scala.meta.internal.semanticdb.Scala._
import scalafix.v0._
import scalafix.v1
Expand Down Expand Up @@ -69,7 +70,7 @@ object SymbolOps {
val (owner, desc) =
ScalametaInternals.symbolOwnerAndDescriptor(symbol)
loop(owner)
sb.append(desc.name).append(".")
sb.append(ScalafixScalametaHacks.encode(desc.name.value)).append(".")
}
}
loop(sym.value)
Expand Down
9 changes: 9 additions & 0 deletions scalafix-tests/shared/src/main/scala/test/SymbolTest.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package test

import a.`b.c`.d

object a {
object `b.c` {
object d
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package scalafix.tests.v1

import org.scalatest.FunSuite
import scala.meta.Import
import scala.meta.Importer
import scalafix.tests.core.BaseSemanticSuite

class SymbolSuite extends FunSuite {
implicit val doc = BaseSemanticSuite.loadDoc("SymbolTest.scala")

test("normalized") {
val ref :: Nil = doc.tree.collect {
case Import(Importer(ref, _) :: Nil) => ref
}

import scalafix.v1._
assert(ref.symbol.normalized.owner.value == "test.a.")
}
}