Mark deprecated symbols as such in completion

Author: Duhemm

language-server/src/dotty/tools/languageserver/DottyLanguageServer.scala

@@ -19,6 +19,7 @@ import scala.io.Codec
 import dotc._
 import ast.{Trees, tpd}
 import core._, core.Decorators.{sourcePos => _, _}
+import Annotations.AnnotInfo
 import Comments._, Constants._, Contexts._, Flags._, Names._, NameOps._, Symbols._, SymDenotations._, Trees._, Types._
 import classpath.ClassPathEntries
 import reporting._, reporting.diagnostic.{Message, MessageContainer, messages}
@@ -800,6 +801,7 @@ object DottyLanguageServer {
     ParsedComment.docOf(sym).foreach { doc =>
       item.setDocumentation(markupContent(doc.renderAsMarkdown))
     }
+    item.setDeprecated(sym.isDeprecated)
     item.setKind(completionItemKind(sym))
     item
   }

language-server/test/dotty/tools/languageserver/CompletionTest.scala

@@ -1,10 +1,11 @@
 package dotty.tools.languageserver
 
-import org.junit.Assert.{assertTrue, assertFalse}
+import org.junit.Assert.{assertEquals, assertTrue, assertFalse}
 import org.junit.Test
 import org.eclipse.lsp4j.CompletionItemKind._
 
 import dotty.tools.languageserver.util.Code._
+import dotty.tools.languageserver.util.actions.CodeCompletion
 
 class CompletionTest {
 
@@ -32,7 +33,8 @@ class CompletionTest {
     withSources(
       code"""object Foo { class MyClass }""",
       code"""import Foo.${m1}"""
-    ).completion(m1, results => {
+    ).completion(m1, completionItems => {
+      val results = CodeCompletion.simplifyResults(completionItems)
       val myClass = ("MyClass", Class, "Foo.MyClass")
       assertTrue(results.contains(("MyClass", Class, "Foo.MyClass")))
 
@@ -143,4 +145,18 @@ class CompletionTest {
     code"""import java.io.{FileDesc${m1} => Foo}""".withSource
       .completion(m1, Set(("FileDescriptor", Class, "java.io.FileDescriptor")))
   }
+
+  @Test def markDeprecatedSymbols: Unit = {
+    code"""object Foo {
+             @deprecated
+             val bar = 0
+           }
+           import Foo.ba${m1}""".withSource
+      .completion(m1, results => {
+        assertEquals(1, results.size)
+        val result = results.head
+        assertEquals("bar", result.getLabel)
+        assertTrue("bar was not deprecated", result.getDeprecated)
+      })
+  }
 }

language-server/test/dotty/tools/languageserver/util/CodeTester.scala

@@ -8,7 +8,7 @@ import dotty.tools.languageserver.util.server.{TestFile, TestServer}
 import dotty.tools.dotc.reporting.diagnostic.ErrorMessageID
 import dotty.tools.dotc.util.Signatures.Signature
 
-import org.eclipse.lsp4j.{ CompletionItemKind, DocumentHighlightKind, Diagnostic, DiagnosticSeverity }
+import org.eclipse.lsp4j.{ CompletionItem, CompletionItemKind, DocumentHighlightKind, Diagnostic, DiagnosticSeverity }
 
 import org.junit.Assert.assertEquals
 
@@ -116,7 +116,7 @@ class CodeTester(projects: List[Project]) {
    * @see dotty.tools.languageserver.util.actions.CodeCompletion
    */
   def completion(marker: CodeMarker, expected: Set[(String, CompletionItemKind, String)]): this.type =
-    completion(marker, assertEquals(expected, _))
+    completion(marker, results => assertEquals(expected, CodeCompletion.simplifyResults(results)))
 
   /**
    * Requests completion at the position defined by `marker`, and pass the results to
@@ -127,7 +127,7 @@ class CodeTester(projects: List[Project]) {
    *
    * @see dotty.tools.languageserver.util.actions.CodeCompletion
    */
-  def completion(marker: CodeMarker, checkResults: Set[(String, CompletionItemKind, String)] => Unit): this.type =
+  def completion(marker: CodeMarker, checkResults: Set[CompletionItem] => Unit): this.type =
     doAction(new CodeCompletion(marker, checkResults))
 
   /**

language-server/test/dotty/tools/languageserver/util/actions/CodeCompletion.scala

@@ -4,7 +4,7 @@ import dotty.tools.languageserver.util.PositionContext
 import dotty.tools.languageserver.util.embedded.CodeMarker
 import dotty.tools.languageserver.util.server.TestFile
 
-import org.eclipse.lsp4j.CompletionItemKind
+import org.eclipse.lsp4j.{CompletionItem, CompletionItemKind}
 import org.junit.Assert.{assertEquals, assertFalse, assertTrue}
 
 import scala.collection.JavaConverters._
@@ -18,19 +18,23 @@ import scala.collection.JavaConverters._
  *                     expectations.
  */
 class CodeCompletion(override val marker: CodeMarker,
-                     checkResults: Set[(String, CompletionItemKind, String)] => Unit)
+                     checkResults: Set[CompletionItem] => Unit)
     extends ActionOnMarker {
 
   override def execute(): Exec[Unit] = {
     val result = server.completion(marker.toCompletionParams).get()
     assertTrue(s"Completion results were not 'right': $result", result.isRight)
     assertFalse(s"Completion results were 'incomplete': $result", result.getRight.isIncomplete)
-    val completionResults = result.getRight.getItems.asScala.toSet.map { item =>
-      (item.getLabel, item.getKind, item.getDetail)
-    }
+    val completionResults = result.getRight.getItems.asScala.toSet
     checkResults(completionResults)
   }
 
   override def show: PositionContext.PosCtx[String] =
     s"CodeCompletion(${marker.show}, $checkResults)"
 }
+
+object CodeCompletion {
+  /** Extract the (label, kind, details) of each `CompletionItem`. */
+  def simplifyResults(items: Set[CompletionItem]): Set[(String, CompletionItemKind, String)] =
+    items.map(item => (item.getLabel, item.getKind, item.getDetail))
+}