Merge pull request scala#14555 from ireina7/marker-color-same-as-def-…

…name

improvement(repl): end marker now has the same color as its definition in repl (fix scala#14535)

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

@@ -109,9 +109,11 @@ object SyntaxHighlighting {
             case tree: ValOrDefDef =>
               highlightAnnotations(tree)
               highlightPosition(tree.nameSpan, ValDefColor)
+              highlightPosition(tree.endSpan, ValDefColor)
             case tree: MemberDef /* ModuleDef | TypeDef */ =>
               highlightAnnotations(tree)
               highlightPosition(tree.nameSpan, TypeColor)
+              highlightPosition(tree.endSpan, TypeColor)
             case tree: Ident if tree.isType =>
               highlightPosition(tree.span, TypeColor)
             case _: TypeTree =>

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

@@ -140,5 +140,41 @@ class SyntaxHighlightingTests extends DottyTest {
     test("val inline = 2", "<K|val> <V|inline> = <L|2>")
     test("def inline = 2", "<K|def> <V|inline> = <L|2>")
     test("def foo(inline: Int) = 2", "<K|def> <V|foo>(<V|inline>: <T|Int>) = <L|2>")
+    test(
+      """enum Foo:
+        |  case foo
+        |end Foo""".stripMargin,
+      """<K|enum> <T|Foo>:
+        |  <K|case> <T|foo>
+        |<K|end> <T|Foo>""".stripMargin
+    )
+    test(
+      """class Foo:
+        |end Foo""".stripMargin,
+      """<K|class> <T|Foo>:
+        |<K|end> <T|Foo>""".stripMargin
+    )
+    test(
+      """object Foo:
+        |end Foo""".stripMargin,
+      """<K|object> <T|Foo>:
+        |<K|end> <T|Foo>""".stripMargin
+    )
+    test(
+      """def foo =
+        |  ()
+        |end foo""".stripMargin,
+      """<K|def> <V|foo> =
+        |  ()
+        |<K|end> <V|foo>""".stripMargin
+    )
+    test(
+      """val foo =
+        |  ()
+        |end foo""".stripMargin,
+      """<K|val> <V|foo> =
+        |  ()
+        |<K|end> <V|foo>""".stripMargin
+    )
   }
 }