summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-03-14 13:14:53 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-03-14 13:14:53 -0700
commit2aa587437f08fbc28dfa03a2f8c1b7a1f50383d9 (patch)
tree5e873d92aecc5534bb0dd523c33d2bbb83d2ee73 /src
parentf4c6762578e509fd850f2c08a200d9df0a6d461f (diff)
parent953b776d49d7de55a74967f6a48beea763d22144 (diff)
downloadscala-2aa587437f08fbc28dfa03a2f8c1b7a1f50383d9.tar.gz
scala-2aa587437f08fbc28dfa03a2f8c1b7a1f50383d9.tar.bz2
scala-2aa587437f08fbc28dfa03a2f8c1b7a1f50383d9.zip
Merge pull request #3598 from som-snytt/issue/8266-amend-advice
SI-8266 Amend advice for deprecated octal 042
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/reflect/FormatInterpolator.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/reflect/FormatInterpolator.scala b/src/compiler/scala/tools/reflect/FormatInterpolator.scala
index 0258002850..e0f9bb6044 100644
--- a/src/compiler/scala/tools/reflect/FormatInterpolator.scala
+++ b/src/compiler/scala/tools/reflect/FormatInterpolator.scala
@@ -93,7 +93,8 @@ abstract class FormatInterpolator {
case '\n' => "\\n"
case '\f' => "\\f"
case '\r' => "\\r"
- case '\"' => "\\u0022" // $" in future
+ case '\"' => "${'\"'}" /* avoid lint warn */ +
+ " or a triple-quoted literal \"\"\"with embedded \" or \\u0022\"\"\"" // $" in future
case '\'' => "'"
case '\\' => """\\"""
case x => "\\u%04x" format x