# HG changeset patch
# User Thomas Lindae <thomas.lindae@in.tum.de>
# Date 1721333326 -7200
# Node ID ff813e8a32715d78c03d426e911f4b475cdb9dd5
# Parent  ca20bd1e25fe48e6cb1f66ce75c042c9f9b3287e
lsp: improved completions;

diff -r ca20bd1e25fe -r ff813e8a3271 src/Tools/VSCode/src/lsp.scala
--- a/src/Tools/VSCode/src/lsp.scala	Wed Jul 17 21:03:56 2024 +0200
+++ b/src/Tools/VSCode/src/lsp.scala	Thu Jul 18 22:08:46 2024 +0200
@@ -354,12 +354,42 @@
 
 
   /* completion */
+  
+  object CompletionItemKind {
+    val Text = 1;
+    val Method = 2;
+    val Function = 3;
+    val Constructor = 4;
+    val Field = 5;
+    val Variable = 6;
+    val Class = 7;
+    val Interface = 8;
+    val Module = 9;
+    val Property = 10;
+    val Unit = 11;
+    val Value = 12;
+    val Enum = 13;
+    val Keyword = 14;
+    val Snippet = 15;
+    val Color = 16;
+    val File = 17;
+    val Reference = 18;
+    val Folder = 19;
+    val EnumMember = 20;
+    val Constant = 21;
+    val Struct = 22;
+    val Event = 23;
+    val Operator = 24;
+    val TypeParameter = 25;
+  }
 
   sealed case class CompletionItem(
     label: String,
     kind: Option[Int] = None,
     detail: Option[String] = None,
     documentation: Option[String] = None,
+    filter_text: Option[String] = None,
+    commit_characters: Option[List[String]] = None,
     text: Option[String] = None,
     range: Option[Line.Range] = None,
     command: Option[Command] = None
@@ -369,9 +399,9 @@
       JSON.optional("kind" -> kind) ++
       JSON.optional("detail" -> detail) ++
       JSON.optional("documentation" -> documentation) ++
-      JSON.optional("insertText" -> text) ++
-      JSON.optional("range" -> range.map(Range(_))) ++
-      JSON.optional("textEdit" -> range.map(r => TextEdit(r, text.getOrElse(label)).json)) ++
+      JSON.optional("filterText" -> filter_text) ++
+      JSON.optional("textEdit" -> range.map(r => TextEdit(range = r, new_text = text.getOrElse(label)).json)) ++
+      JSON.optional("commitCharacters" -> commit_characters) ++
       JSON.optional("command" -> command.map(_.json))
   }
 
diff -r ca20bd1e25fe -r ff813e8a3271 src/Tools/VSCode/src/vscode_rendering.scala
--- a/src/Tools/VSCode/src/vscode_rendering.scala	Wed Jul 17 21:03:56 2024 +0200
+++ b/src/Tools/VSCode/src/vscode_rendering.scala	Thu Jul 18 22:08:46 2024 +0200
@@ -109,11 +109,23 @@
             results match {
               case None => Nil
               case Some(result) =>
-                result.items.map(item =>
+                result.items.map(item => {
+                  val kind = item.description match {
+                    case _ :: "(keyword)" :: _ => LSP.CompletionItemKind.Keyword
+                    case _ => LSP.CompletionItemKind.Text
+                  }
+
                   LSP.CompletionItem(
-                    label = item.description.mkString(" "),
+                    label = item.replacement,
+                    kind = Some(kind),
+                    detail = Some(item.description.mkString(" ")),
+                    filter_text = Some(item.original),
+                    commit_characters =
+                      if (result.unique && item.immediate) Some(List(" ")) else None,
                     text = Some(item.replacement),
-                    range = Some(doc.range(item.range))))
+                    range = Some(doc.range(item.range)),
+                  )
+                })
             }
           items ::: VSCode_Spell_Checker.menu_items(rendering, caret)
         }