WIP

Author: antonsviridov-src

semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/Analyzer.kt

@@ -13,6 +13,8 @@ import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
 import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector
 import org.jetbrains.kotlin.com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.container.ComponentProvider
+import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingTrace
@@ -32,6 +34,18 @@ class Analyzer(
                 CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY,
                 PrintingMessageCollector(System.err, MessageRenderer.PLAIN_FULL_PATHS, false))
 
+    override fun doAnalysis(
+        project: Project,
+        module: ModuleDescriptor,
+        projectContext: ProjectContext,
+        files: Collection<KtFile>,
+        bindingTrace: BindingTrace,
+        componentProvider: ComponentProvider
+    ): AnalysisResult? {
+        return super.doAnalysis(
+            project, module, projectContext, files, bindingTrace, componentProvider)
+    }
+
     override fun analysisCompleted(
         project: Project,
         module: ModuleDescriptor,

semanticdb-kotlinc/src/main/kotlin/com/sourcegraph/semanticdb_kotlinc/SemanticdbTextDocumentBuilder.kt

@@ -52,7 +52,8 @@ class SemanticdbTextDocumentBuilder(
         if (role == Role.DEFINITION) symbols.add(symbolInformation(symbol, descriptor, element))
     }
 
-    private val isIgnoredSuperClass = setOf("kotlin.Any", "java.lang.Object", "java.io.Serializable")
+    private val isIgnoredSuperClass =
+        setOf("kotlin.Any", "java.lang.Object", "java.io.Serializable")
 
     private fun functionDescriptorOverrides(descriptor: FunctionDescriptor): Iterable<String> {
         val result = mutableListOf<String>()
@@ -66,7 +67,8 @@ class SemanticdbTextDocumentBuilder(
             }
 
             isVisited.add(current)
-            val directOverrides = current.overriddenDescriptors.flatMap { cache[it] }.map { it.toString() }
+            val directOverrides =
+                current.overriddenDescriptors.flatMap { cache[it] }.map { it.toString() }
             result.addAll(directOverrides)
             queue.addAll(current.overriddenDescriptors)
         }
@@ -85,14 +87,11 @@ class SemanticdbTextDocumentBuilder(
                         .getAllSuperClassifiers()
                         // first is the class itself
                         .drop(1)
-                        .filter {
-                            it.fqNameSafe.toString() !in isIgnoredSuperClass
-                        }
+                        .filter { it.fqNameSafe.toString() !in isIgnoredSuperClass }
                         .flatMap { cache[it] }
                         .map { it.toString() }
                         .asIterable()
-                is SimpleFunctionDescriptor ->
-                    functionDescriptorOverrides(descriptor)
+                is SimpleFunctionDescriptor -> functionDescriptorOverrides(descriptor)
                 else -> emptyList<String>().asIterable()
             }
         return SymbolInformation {

semanticdb-kotlinc/src/snapshots/kotlin/com/sourcegraph/lsif_kotlin/Snapshot.kt

@@ -8,22 +8,21 @@ fun main() {
     val sourceroot = Path(System.getProperty("sourceroot"))
     val targetroot = Path(System.getProperty("targetroot"))
 
-    ScipJava.main(arrayOf(
-        "index-semanticdb",
-        "--no-emit-inverse-relationships",
-        "--cwd",
-        sourceroot.toString(),
-        "--output",
-        targetroot.resolve("index.scip").toString(),
-        targetroot.toString()
-    ))
-    ScipJava.main(arrayOf(
-        "snapshot",
-        "--cwd",
-        sourceroot.toString(),
-        "--output",
-        snapshotDir.toString(),
-        targetroot.toString()
-    ))
+    ScipJava.main(
+        arrayOf(
+            "index-semanticdb",
+            "--no-emit-inverse-relationships",
+            "--cwd",
+            sourceroot.toString(),
+            "--output",
+            targetroot.resolve("index.scip").toString(),
+            targetroot.toString()))
+    ScipJava.main(
+        arrayOf(
+            "snapshot",
+            "--cwd",
+            sourceroot.toString(),
+            "--output",
+            snapshotDir.toString(),
+            targetroot.toString()))
 }
-

semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/AnalyzerTest.kt

@@ -129,7 +129,8 @@ class AnalyzerTest {
             KotlinCompilation()
                 .apply {
                     sources = listOf(SourceFile.testKt(""))
-                    componentRegistrars = listOf(AnalyzerRegistrar { throw Exception("sample text") })
+                    componentRegistrars =
+                        listOf(AnalyzerRegistrar { throw Exception("sample text") })
                     verbose = false
                     pluginOptions =
                         listOf(

semanticdb-kotlinc/src/test/kotlin/com/sourcegraph/semanticdb_kotlinc/test/SemanticdbSymbolsTest.kt

@@ -7,8 +7,8 @@ import com.sourcegraph.semanticdb_kotlinc.Semanticdb.SymbolOccurrence.Role
 import com.sourcegraph.semanticdb_kotlinc.test.ExpectedSymbols.SemanticdbData
 import com.sourcegraph.semanticdb_kotlinc.test.ExpectedSymbols.SymbolCacheData
 import com.tschuchort.compiletesting.SourceFile
-import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import kotlin.contracts.ExperimentalContracts
+import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.junit.jupiter.api.TestFactory
 
 @ExperimentalCompilerApi