KotlinAbiVersionIndex: refactoring after converting

idea/src/org/jetbrains/kotlin/idea/versions/KotlinAbiVersionIndex.kt

@@ -16,76 +16,51 @@
 
 package org.jetbrains.kotlin.idea.versions
 
-import com.google.common.collect.ImmutableSet
-import com.google.common.collect.Maps
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.fileTypes.StdFileTypes
-import com.intellij.openapi.util.Ref
-import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.util.indexing.*
 import com.intellij.util.io.ExternalIntegerKeyDescriptor
-import com.intellij.util.io.KeyDescriptor
+import org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses
 import org.jetbrains.kotlin.load.java.AbiVersionUtil
+import org.jetbrains.kotlin.load.java.JvmAnnotationNames.*
 import org.jetbrains.org.objectweb.asm.AnnotationVisitor
 import org.jetbrains.org.objectweb.asm.ClassReader
 import org.jetbrains.org.objectweb.asm.ClassVisitor
 import org.jetbrains.org.objectweb.asm.Opcodes
 
-import org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses
-import org.jetbrains.kotlin.load.java.JvmAnnotationNames.*
-
 /**
  * Important! This is not a stub-based index. And it has its own version
  */
-public class KotlinAbiVersionIndex private constructor() : ScalarIndexExtension<Int>() {
+public object KotlinAbiVersionIndex : ScalarIndexExtension<Int>() {
 
-    override fun getName(): ID<Int, Void> {
+    override fun getName() = ID.create<Int, Void>(javaClass<KotlinAbiVersionIndex>().getCanonicalName())
-        return NAME
-    }
 
-    override fun getIndexer(): DataIndexer<Int, Void, FileContent> {
+    override fun getIndexer() = INDEXER
-        return INDEXER
-    }
 
-    override fun getKeyDescriptor(): KeyDescriptor<Int> {
+    override fun getKeyDescriptor() = ExternalIntegerKeyDescriptor()
-        return KEY_DESCRIPTOR
-    }
 
-    override fun getInputFilter(): FileBasedIndex.InputFilter {
+    override fun getInputFilter() = FileBasedIndex.InputFilter() { file -> file.getFileType() == StdFileTypes.CLASS }
-        return INPUT_FILTER
-    }
 
-    override fun dependsOnFileContent(): Boolean {
+    override fun dependsOnFileContent() = true
-        return true
-    }
 
-    override fun getVersion(): Int {
+    override fun getVersion() = VERSION
-        return VERSION
-    }
-
-    companion object {
-        private val LOG = Logger.getInstance(javaClass<KotlinAbiVersionIndex>())
-
-        public val INSTANCE: KotlinAbiVersionIndex = KotlinAbiVersionIndex()
 
     private val VERSION = 1
 
-        private val NAME = ID.create<Int, Void>(javaClass<KotlinAbiVersionIndex>().getCanonicalName())
+    private val LOG = Logger.getInstance(javaClass<KotlinAbiVersionIndex>())
-        private val KEY_DESCRIPTOR = ExternalIntegerKeyDescriptor()
 
-        private val INPUT_FILTER = object : FileBasedIndex.InputFilter {
+    private val kotlinAnnotationsDesc = setOf(
-            override fun acceptInput(file: VirtualFile): Boolean {
+            OLD_JET_CLASS_ANNOTATION,
-                return file.getFileType() == StdFileTypes.CLASS
+            OLD_JET_PACKAGE_CLASS_ANNOTATION,
-            }
+            OLD_KOTLIN_CLASS,
-        }
+            OLD_KOTLIN_PACKAGE,
+            KOTLIN_CLASS,
+            KOTLIN_PACKAGE)
+            .map { asmDescByFqNameWithoutInnerClasses(it) }
 
-        private val INDEXER = object : DataIndexer<Int, Void, FileContent> {
+    private val INDEXER = DataIndexer<Int, Void, FileContent>() { inputData: FileContent ->
-            SuppressWarnings("deprecation")
+        var version: Int? = null
-            private val kotlinAnnotationsDesc = ImmutableSet.Builder<String>().add(asmDescByFqNameWithoutInnerClasses(OLD_JET_CLASS_ANNOTATION)).add(asmDescByFqNameWithoutInnerClasses(OLD_JET_PACKAGE_CLASS_ANNOTATION)).add(asmDescByFqNameWithoutInnerClasses(OLD_KOTLIN_CLASS)).add(asmDescByFqNameWithoutInnerClasses(OLD_KOTLIN_PACKAGE)).add(asmDescByFqNameWithoutInnerClasses(KOTLIN_CLASS)).add(asmDescByFqNameWithoutInnerClasses(KOTLIN_PACKAGE)).build()
+        var annotationPresent = false
-
-            override fun map(inputData: FileContent): Map<Int, Void> {
-                val result = Maps.newHashMap<Int, Void>()
-                val annotationPresent = Ref(false)
 
         try {
             val classReader = ClassReader(inputData.getContent())
@@ -94,16 +69,16 @@ public class KotlinAbiVersionIndex private constructor() : ScalarIndexExtension<
                     if (!kotlinAnnotationsDesc.contains(desc)) {
                         return null
                     }
-                            annotationPresent.set(true)
+                    annotationPresent = true
                     return object : AnnotationVisitor(Opcodes.ASM5) {
                         override fun visit(name: String, value: Any) {
                             if (ABI_VERSION_FIELD_NAME == name) {
                                 if (value is Int) {
-                                            result.put(value, null)
+                                    version = value
                                 }
                                 else {
                                     // Version is set to something weird
-                                            result.put(AbiVersionUtil.INVALID_VERSION, null)
+                                    version = AbiVersionUtil.INVALID_VERSION
                                 }
                             }
                         }
@@ -115,14 +90,11 @@ public class KotlinAbiVersionIndex private constructor() : ScalarIndexExtension<
             LOG.warn("Could not index ABI version for file " + inputData.getFile() + ": " + e.getMessage())
         }
 
-
+        if (annotationPresent && version == null) {
-                if (annotationPresent.get() && result.isEmpty()) {
             // No version at all: the class is too old
-                    result.put(AbiVersionUtil.INVALID_VERSION, null)
+            version = AbiVersionUtil.INVALID_VERSION
         }
 
-                return result
+        if (version != null) mapOf<Int, Void?>(version!! to null) else mapOf()
-            }
-        }
     }
 }