fixed Scala comments, added svn:keywords

1 files changed, 6 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala b/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala
index 328f2713af..3e827aa0b1 100644
--- a/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala
+++ b/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala
@@ -50,7 +50,11 @@ trait ModelExtractor {
     }
 
   protected def decodeComment(comment0: String): Comment = {
-    val comment = comment0 // .substring("/**".length, comment0.length - "*/".length)
+    val comment = { // discard outmost comment delimiters if present
+      val begin = if (comment0 startsWith "/**") 3 else 0
+      val end = comment0.length - (if (comment0 endsWith "*/") 2 else 0)
+      comment0.substring(begin, end)
+    }
     val tok = new java.util.StringTokenizer(comment, LINE_SEPARATOR)
     val buf = new StringBuilder
     type AttrDescr = (String, String, StringBuilder)
@@ -415,7 +419,7 @@ trait ModelExtractor {
   import java.util.regex.Pattern
   // patterns for standard tags with 1 and 2 arguments
   private val pat1 = Pattern.compile(
-    "[ \t]*@(author|deprecated|pre|return|see|since|todo|version|ex|note)[ \t]*(.*)")
+    "[ \t]*@(author|deprecated|owner|pre|return|see|since|todo|version|ex|note)[ \t]*(.*)")
   private val pat2 = Pattern.compile(
     "[ \t]*@(exception|param|throws)[ \t]+(\\p{Graph}*)[ \t]*(.*)")