diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-03-25 13:43:00 +0100 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-03-25 13:43:00 +0100 |
commit | 4a3e9372363194560bbe0c04aec2108953ea89dd (patch) | |
tree | 0838487c33ab9f8c68fd54b82fa797bc7b8efd00 /src | |
parent | de4edd4f5ff4d584ce16054fdef1f562237e4d0e (diff) | |
parent | dcd4d6700660c480b29eb4c8aeba77403c112d5f (diff) | |
download | scala-4a3e9372363194560bbe0c04aec2108953ea89dd.tar.gz scala-4a3e9372363194560bbe0c04aec2108953ea89dd.tar.bz2 scala-4a3e9372363194560bbe0c04aec2108953ea89dd.zip |
Merge pull request #4310 from som-snytt/issue/9127-b
SI-9127 Xlint doesn't think spaces are significant
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index d01e4f84ba..d23b50c3eb 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -5200,13 +5200,10 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper def suspiciousExpr = InterpolatorCodeRegex findFirstIn s def suspiciousIdents = InterpolatorIdentRegex findAllIn s map (s => suspiciousSym(s drop 1)) - // heuristics - no warning on e.g. a string with only "$asInstanceOf" - if (s contains ' ') ( - if (suspiciousExpr.nonEmpty) - warn("detected an interpolated expression") // "${...}" - else - suspiciousIdents find isPlausible foreach (sym => warn(s"detected interpolated identifier `$$${sym.name}`")) // "$id" - ) + if (suspiciousExpr.nonEmpty) + warn("detected an interpolated expression") // "${...}" + else + suspiciousIdents find isPlausible foreach (sym => warn(s"detected interpolated identifier `$$${sym.name}`")) // "$id" } lit match { case Literal(Constant(s: String)) if !isRecognizablyNotForInterpolation => maybeWarn(s) |