PR comments, mostly related to style and consistency.

Author: themkat

server/src/main/kotlin/org/javacs/kt/codeaction/quickfix/AddMissingImportsQuickFix.kt

@@ -25,7 +25,7 @@ class AddMissingImportsQuickFix: QuickFix {
 
             getImportAlternatives(symbolName, file.parse, index).map { (importStr, edit) ->
                 val codeAction = CodeAction()
-                codeAction.title = "import ${importStr}"
+                codeAction.title = "Import ${importStr}"
                 codeAction.kind = CodeActionKind.QuickFix
                 codeAction.diagnostics = listOf(diagnostic)
                 codeAction.edit = WorkspaceEdit(mapOf(uri to listOf(edit)))
@@ -42,15 +42,15 @@ class AddMissingImportsQuickFix: QuickFix {
 
     private fun getImportAlternatives(symbolName: String, file: KtFile, index: SymbolIndex): List<Pair<String, TextEdit>> {
         // wildcard matcher to empty string, because we only want to match exactly the symbol itself, not anything extra
-        val queryResult = index.query(symbolName, wildcardMatcher = "")
+        val queryResult = index.query(symbolName, suffix = "")
 
         return queryResult
-            .filter { it.kind != Symbol.Kind.MODULE }
             .filter {
+                it.kind != Symbol.Kind.MODULE &&
                 // TODO: Visibility checker should be less liberal
-                it.visibility == Symbol.Visibility.PUBLIC
-                || it.visibility == Symbol.Visibility.PROTECTED
-                || it.visibility == Symbol.Visibility.INTERNAL
+                (it.visibility == Symbol.Visibility.PUBLIC
+                 || it.visibility == Symbol.Visibility.PROTECTED
+                 || it.visibility == Symbol.Visibility.INTERNAL)
             }
             .map {
                 Pair(it.fqName.toString(), getImportTextEditEntry(file, it.fqName))

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

@@ -177,11 +177,11 @@ class SymbolIndex {
         fqName.toString().length <= MAX_FQNAME_LENGTH
             && fqName.shortName().toString().length <= MAX_SHORT_NAME_LENGTH
 
-    fun query(prefix: String, receiverType: FqName? = null, limit: Int = 20, wildcardMatcher: String = "%"): List<Symbol> = transaction(db) {
+    fun query(prefix: String, receiverType: FqName? = null, limit: Int = 20, suffix: String = "%"): List<Symbol> = transaction(db) {
         // TODO: Extension completion currently only works if the receiver matches exactly,
         //       ideally this should work with subtypes as well
         SymbolEntity.find {
-            (Symbols.shortName like "$prefix$wildcardMatcher") and (Symbols.extensionReceiverType eq receiverType?.toString())
+            (Symbols.shortName like "$prefix$suffix") and (Symbols.extensionReceiverType eq receiverType?.toString())
         }.limit(limit)
             .map { Symbol(
                 fqName = FqName(it.fqName),