Use more fine-grained completion item kinds for classes

Fixes #265

Author: fwcd

server/src/main/kotlin/org/javacs/kt/completion/RenderCompletionItem.kt

@@ -1,8 +1,7 @@
 package org.javacs.kt.completion
 
 import org.eclipse.lsp4j.CompletionItem
-import org.eclipse.lsp4j.CompletionItemKind.*
-import org.eclipse.lsp4j.CompletionItemKind.Function
+import org.eclipse.lsp4j.CompletionItemKind
 import org.eclipse.lsp4j.InsertTextFormat.PlainText
 import org.eclipse.lsp4j.InsertTextFormat.Snippet
 import org.jetbrains.kotlin.descriptors.*
@@ -49,15 +48,15 @@ class RenderCompletionItem(val snippetsEnabled: Boolean) : DeclarationDescriptor
     override fun visitPropertySetterDescriptor(desc: PropertySetterDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Field
+        result.kind = CompletionItemKind.Field
 
         return result
     }
 
     override fun visitConstructorDescriptor(desc: ConstructorDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Constructor
+        result.kind = CompletionItemKind.Constructor
         result.insertText = functionInsertText(desc)
         result.insertTextFormat = functionInsertFormat
 
@@ -67,23 +66,23 @@ class RenderCompletionItem(val snippetsEnabled: Boolean) : DeclarationDescriptor
     override fun visitReceiverParameterDescriptor(desc: ReceiverParameterDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Variable
+        result.kind = CompletionItemKind.Variable
 
         return result
     }
 
     override fun visitPackageViewDescriptor(desc: PackageViewDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Module
+        result.kind = CompletionItemKind.Module
 
         return result
     }
 
     override fun visitFunctionDescriptor(desc: FunctionDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Function
+        result.kind = CompletionItemKind.Function
         result.insertText = functionInsertText(desc)
         result.insertTextFormat = functionInsertFormat
 
@@ -117,79 +116,84 @@ class RenderCompletionItem(val snippetsEnabled: Boolean) : DeclarationDescriptor
     override fun visitModuleDeclaration(desc: ModuleDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Module
+        result.kind = CompletionItemKind.Module
 
         return result
     }
 
     override fun visitClassDescriptor(desc: ClassDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Class
+        result.kind = when (desc.kind) {
+            ClassKind.INTERFACE -> CompletionItemKind.Interface
+            ClassKind.ENUM_CLASS -> CompletionItemKind.Enum
+            ClassKind.ENUM_ENTRY -> CompletionItemKind.EnumMember
+            else -> CompletionItemKind.Class
+        }
 
         return result
     }
 
     override fun visitPackageFragmentDescriptor(desc: PackageFragmentDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Module
+        result.kind = CompletionItemKind.Module
 
         return result
     }
 
     override fun visitValueParameterDescriptor(desc: ValueParameterDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Variable
+        result.kind = CompletionItemKind.Variable
 
         return result
     }
 
     override fun visitTypeParameterDescriptor(desc: TypeParameterDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Variable
+        result.kind = CompletionItemKind.Variable
 
         return result
     }
 
     override fun visitScriptDescriptor(desc: ScriptDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Module
+        result.kind = CompletionItemKind.Module
 
         return result
     }
 
     override fun visitTypeAliasDescriptor(desc: TypeAliasDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Variable
+        result.kind = CompletionItemKind.Variable
 
         return result
     }
 
     override fun visitPropertyGetterDescriptor(desc: PropertyGetterDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Field
+        result.kind = CompletionItemKind.Field
 
         return result
     }
 
     override fun visitVariableDescriptor(desc: VariableDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Variable
+        result.kind = CompletionItemKind.Variable
 
         return result
     }
 
     override fun visitPropertyDescriptor(desc: PropertyDescriptor, nothing: Unit?): CompletionItem {
         setDefaults(desc)
 
-        result.kind = Field
+        result.kind = CompletionItemKind.Field
 
         return result
     }