diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-04-09 17:10:38 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-04-09 17:10:38 -0700 |
commit | adb53ea8026af403daca92eacddf1a199ac188ef (patch) | |
tree | 4bd37618cd8703b6c5708e2c837e6063344098e2 /src/compiler/scala/tools/nsc/ast | |
parent | cdb05edb4e9261c86bf1cf5620fe7012f7d53117 (diff) | |
parent | 6356e8ef0cb7ae10e8042e0927b0ba26acb600d5 (diff) | |
download | scala-adb53ea8026af403daca92eacddf1a199ac188ef.tar.gz scala-adb53ea8026af403daca92eacddf1a199ac188ef.tar.bz2 scala-adb53ea8026af403daca92eacddf1a199ac188ef.zip |
Merge pull request #4408 from kzys/one-wiki-syntax
Don't define the wiki syntax in multiple places
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast')
-rwxr-xr-x | src/compiler/scala/tools/nsc/ast/DocComments.scala | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/DocComments.scala b/src/compiler/scala/tools/nsc/ast/DocComments.scala index 02a199f7ac..055f658670 100755 --- a/src/compiler/scala/tools/nsc/ast/DocComments.scala +++ b/src/compiler/scala/tools/nsc/ast/DocComments.scala @@ -129,25 +129,6 @@ trait DocComments { self: Global => getDocComment(sym) map getUseCases getOrElse List() } - private val wikiReplacements = List( - ("""(\n\s*\*?)(\s*\n)""" .r, """$1 <p>$2"""), - ("""<([^\w/])""" .r, """<$1"""), - ("""([^\w/])>""" .r, """$1>"""), - ("""\{\{\{(.*(?:\n.*)*)\}\}\}""".r, """<pre>$1</pre>"""), - ("""`([^`]*)`""" .r, """<code>$1</code>"""), - ("""__([^_]*)__""" .r, """<u>$1</u>"""), - ("""''([^']*)''""" .r, """<i>$1</i>"""), - ("""'''([^']*)'''""" .r, """<b>$1</b>"""), - ("""\^([^^]*)\^""" .r, """<sup>$1</sup>"""), - (""",,([^,]*),,""" .r, """<sub>$1</sub>""")) - - /** Returns just the wiki expansion (this would correspond to - * a comment in the input format of the JavaDoc tool, modulo differences - * in tags.) - */ - def expandWiki(str: String): String = - (str /: wikiReplacements) { (str1, regexRepl) => regexRepl._1 replaceAllIn(str1, regexRepl._2) } - private def getDocComment(sym: Symbol): Option[DocComment] = mapFind(sym :: allInheritedOverriddenSymbols(sym))(docComments get _) |