Added ability to highlight comments in repl

Author: mrveera

compiler/src/dotty/tools/dotc/parsing/Scanners.scala

@@ -177,6 +177,9 @@ object Scanners {
     /** All doc comments kept by their end position in a `Map` */
     private[this] var docstringMap: SortedMap[Int, Comment] = SortedMap.empty
 
+    /* All comments positions will be stored in this */
+    var commentPositions:mutable.MutableList[Position] = mutable.MutableList()
+
     private[this] def addComment(comment: Comment): Unit = {
       val lookahead = lookaheadReader()
       def nextPos: Int = (lookahead.getc(): @switch) match {
@@ -616,6 +619,7 @@ object Scanners {
         if (keepComments) {
           val pos = Position(start, charOffset - 1, start)
           val comment = Comment(pos, flushBuf(commentBuf))
+          commentPositions += pos
 
           if (comment.isDocComment) {
             addComment(comment)

compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala

@@ -11,6 +11,7 @@ import dotty.tools.dotc.util.Positions.Position
 import dotty.tools.dotc.util.SourceFile
 
 import java.util.Arrays
+import scala.collection.mutable
 
 /** This object provides functions for syntax highlighting in the REPL */
 object SyntaxHighlighting {
@@ -48,6 +49,11 @@ object SyntaxHighlighting {
           highlightRange(pos.start, pos.end, color)
       }
 
+      def highlightComments(commentsPos: mutable.MutableList[Position]): Unit = {
+       for (pos <- commentsPos)
+         highlightPosition(pos,CommentColor)
+      }
+      
       val scanner = new Scanner(source)
       while (scanner.token != EOF) {
         val start = scanner.offset
@@ -81,6 +87,8 @@ object SyntaxHighlighting {
         }
       }
 
+      highlightComments(scanner.commentPositions)
+
       object TreeHighlighter extends untpd.UntypedTreeTraverser {
         import untpd._
 

compiler/src/dotty/tools/repl/ReplDriver.scala

@@ -282,14 +282,7 @@ class ReplDriver(settings: Array[String],
           x.symbol
       }
       .foreach { sym =>
-        // FIXME syntax highlighting on comment is currently not working
-        // out.println(SyntaxHighlighting.highlight("// defined " + sym.showUser))
-        val message = "// defined " + sym.showUser
-        if (ctx.settings.color.value != "never") {
-          println(SyntaxHighlighting.CommentColor + message + SyntaxHighlighting.NoColor)
-        } else {
-          println(message)
-        }
+        out.println(SyntaxHighlighting.highlight("// defined " + sym.showUser))
       }
 
 

compiler/test/dotty/tools/dotc/printing/SyntaxHighlightingTests.scala

@@ -28,7 +28,6 @@ class SyntaxHighlightingTests extends DottyTest {
   }
 
   @Test
-  @Ignore("Comments are currently not supported")
   def comments = {
     test("// a", "<C|// a>")
     test("/** a */", "<C|/** a */>")