Store symbol visibilities in index

Author: fwcd

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

@@ -101,6 +101,7 @@ private fun indexCompletionItems(parsedFile: KtFile, index: SymbolIndex, partial
                 Symbol.Kind.ENUM_MEMBER -> CompletionItemKind.EnumMember
                 Symbol.Kind.CONSTRUCTOR -> CompletionItemKind.Constructor
                 Symbol.Kind.FIELD -> CompletionItemKind.Field
+                Symbol.Kind.UNKNOWN -> CompletionItemKind.Text
             }
             detail = "(import from ${it.fqName.parent()})"
             val pos = findImportInsertionPosition(parsedFile, it.fqName)

server/src/main/kotlin/org/javacs/kt/index/ExtractSymbolVisibility.kt

@@ -0,0 +1,44 @@
+package org.javacs.kt.index
+
+import org.jetbrains.kotlin.descriptors.*
+
+object ExtractSymbolVisibility : DeclarationDescriptorVisitor<Symbol.Visibility, Unit> {
+    private fun convert(visibility: DescriptorVisibility): Symbol.Visibility = when (visibility.delegate) {
+        Visibilities.PrivateToThis -> Symbol.Visibility.PRIAVTE_TO_THIS
+        Visibilities.Private -> Symbol.Visibility.PRIVATE
+        Visibilities.Internal -> Symbol.Visibility.INTERNAL
+        Visibilities.Protected -> Symbol.Visibility.PROTECTED
+        Visibilities.Public -> Symbol.Visibility.PUBLIC
+        else -> Symbol.Visibility.UNKNOWN
+    }
+
+    override fun visitPropertySetterDescriptor(desc: PropertySetterDescriptor, nothing: Unit?) = convert(desc.visibility)
+
+    override fun visitConstructorDescriptor(desc: ConstructorDescriptor, nothing: Unit?) = convert(desc.visibility)
+
+    override fun visitReceiverParameterDescriptor(desc: ReceiverParameterDescriptor, nothing: Unit?) = convert(desc.visibility)
+
+    override fun visitPackageViewDescriptor(desc: PackageViewDescriptor, nothing: Unit?) = Symbol.Visibility.PUBLIC
+
+    override fun visitFunctionDescriptor(desc: FunctionDescriptor, nothing: Unit?) = convert(desc.visibility)
+
+    override fun visitModuleDeclaration(desc: ModuleDescriptor, nothing: Unit?) = Symbol.Visibility.PUBLIC
+
+    override fun visitClassDescriptor(desc: ClassDescriptor, nothing: Unit?) = convert(desc.visibility)
+
+    override fun visitPackageFragmentDescriptor(desc: PackageFragmentDescriptor, nothing: Unit?) = Symbol.Visibility.PUBLIC
+
+    override fun visitValueParameterDescriptor(desc: ValueParameterDescriptor, nothing: Unit?) = convert(desc.visibility)
+
+    override fun visitTypeParameterDescriptor(desc: TypeParameterDescriptor, nothing: Unit?) = Symbol.Visibility.PUBLIC
+
+    override fun visitScriptDescriptor(desc: ScriptDescriptor, nothing: Unit?) = convert(desc.visibility)
+
+    override fun visitTypeAliasDescriptor(desc: TypeAliasDescriptor, nothing: Unit?) = convert(desc.visibility)
+
+    override fun visitPropertyGetterDescriptor(desc: PropertyGetterDescriptor, nothing: Unit?) = convert(desc.visibility)
+
+    override fun visitVariableDescriptor(desc: VariableDescriptor, nothing: Unit?) = convert(desc.visibility)
+
+    override fun visitPropertyDescriptor(desc: PropertyDescriptor, nothing: Unit?) = convert(desc.visibility)
+}

server/src/main/kotlin/org/javacs/kt/index/Symbol.kt

@@ -5,7 +5,8 @@ import org.jetbrains.kotlin.name.FqName
 data class Symbol(
     // TODO: Store location (e.g. using a URI)
     val fqName: FqName,
-    val kind: Kind
+    val kind: Kind,
+    val visibility: Visibility
 ) {
     enum class Kind(val rawValue: Int) {
         CLASS(0),
@@ -16,10 +17,24 @@ data class Symbol(
         ENUM(5),
         ENUM_MEMBER(6),
         CONSTRUCTOR(7),
-        FIELD(8);
+        FIELD(8),
+        UNKNOWN(9);
 
         companion object {
-            fun fromRaw(rawValue: Int) = Kind.values().first { it.rawValue == rawValue }
+            fun fromRaw(rawValue: Int) = Kind.values().firstOrNull { it.rawValue == rawValue } ?: Kind.UNKNOWN
+        }
+    }
+
+    enum class Visibility(val rawValue: Int) {
+        PRIAVTE_TO_THIS(0),
+        PRIVATE(1),
+        INTERNAL(2),
+        PROTECTED(3),
+        PUBLIC(4),
+        UNKNOWN(5);
+
+        companion object {
+            fun fromRaw(rawValue: Int) = Visibility.values().firstOrNull { it.rawValue == rawValue } ?: Visibility.UNKNOWN
         }
     }
 }

server/src/main/kotlin/org/javacs/kt/index/SymbolIndex.kt

@@ -16,8 +16,9 @@ import org.jetbrains.exposed.sql.insert
 
 private object Symbols : Table() {
     val fqName = varchar("fqname", length = 255).primaryKey()
-    val shortName = varchar("shortname", length = 127)
+    val shortName = varchar("shortname", length = 80)
     val kind = integer("kind")
+    val visibility = integer("visibility")
 }
 
 /**
@@ -64,6 +65,7 @@ class SymbolIndex {
                                 it[fqName] = fqn.toString()
                                 it[shortName] = fqn.shortName().toString()
                                 it[kind] = descriptor.accept(ExtractSymbolKind, Unit).rawValue
+                                it[visibility] = descriptor.accept(ExtractSymbolVisibility, Unit).rawValue
                             }
                         }
                     }
@@ -85,7 +87,11 @@ class SymbolIndex {
         Symbols
             .select { Symbols.shortName.like("$prefix%") }
             .limit(limit)
-            .map { Symbol(FqName(it[Symbols.fqName]), Symbol.Kind.fromRaw(it[Symbols.kind])) }
+            .map { Symbol(
+                fqName = FqName(it[Symbols.fqName]),
+                kind = Symbol.Kind.fromRaw(it[Symbols.kind]),
+                visibility = Symbol.Visibility.fromRaw(it[Symbols.visibility])
+            ) }
     }
 
     private fun allDescriptors(module: ModuleDescriptor): Collection<DeclarationDescriptor> = allPackages(module)