Setup JDT LS extension

daplf · daplf · commit c17d2b72d183 · 2022-03-06T16:41:47.000Z
diff --git a/server/src/main/kotlin/org/javacs/kt/CompilerClassPath.kt b/server/src/main/kotlin/org/javacs/kt/CompilerClassPath.kt
@@ -5,8 +5,10 @@ import org.javacs.kt.classpath.defaultClassPathResolver
 import org.javacs.kt.compiler.Compiler
 import org.javacs.kt.util.AsyncExecutor
 import java.io.Closeable
+import java.io.File
 import java.nio.file.FileSystems
 import java.nio.file.Path
+import java.nio.file.Paths
 
 /**
  * Manages the class path (compiled JARs, etc), the Java source path
@@ -17,6 +19,7 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
     private val javaSourcePath = mutableSetOf<Path>()
     private val buildScriptClassPath = mutableSetOf<Path>()
     val classPath = mutableSetOf<ClassPathEntry>()
+    private var outputDirectory: File? = null
 
     var compiler = Compiler(javaSourcePath, classPath.map { it.compiledJar }.toSet(), buildScriptClassPath)
         private set
@@ -66,7 +69,7 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
         if (refreshCompiler) {
             LOG.info("Reinstantiating compiler")
             compiler.close()
-            compiler = Compiler(javaSourcePath, classPath.map { it.compiledJar }.toSet(), buildScriptClassPath)
+            compiler = Compiler(javaSourcePath, classPath.map { it.compiledJar }.toSet(), buildScriptClassPath, outputDirectory)
             updateCompilerConfiguration()
         }
 
@@ -95,6 +98,10 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
         workspaceRoots.add(root)
         javaSourcePath.addAll(findJavaSourceFiles(root))
 
+        val outputDir = Paths.get(root.toString(), "kls").toFile()
+        outputDirectory = outputDir
+        compiler.outputDirectory = outputDir
+
         return refresh()
     }
 
@@ -103,6 +110,8 @@ class CompilerClassPath(private val config: CompilerConfiguration) : Closeable {
 
         workspaceRoots.remove(root)
         javaSourcePath.removeAll(findJavaSourceFiles(root))
+        outputDirectory = null
+        compiler.outputDirectory = null
 
         return refresh()
     }
diff --git a/server/src/main/kotlin/org/javacs/kt/KotlinTextDocumentService.kt b/server/src/main/kotlin/org/javacs/kt/KotlinTextDocumentService.kt
@@ -179,6 +179,9 @@ class KotlinTextDocumentService(
         // Lint after saving to prevent inconsistent diagnostics
         val uri = parseURI(params.textDocument.uri)
         lintNow(uri)
+        debounceLint.schedule {
+            sp.save(uri)
+        }
     }
 
     override fun signatureHelp(position: SignatureHelpParams): CompletableFuture<SignatureHelp?> = async.compute {
@@ -263,6 +266,7 @@ class KotlinTextDocumentService(
     fun lintAll() {
         debounceLint.submitImmediately {
             sp.compileAllFiles()
+            sp.saveAllFiles()
             sp.refreshDependencyIndexes()
         }
     }
diff --git a/server/src/main/kotlin/org/javacs/kt/SourcePath.kt b/server/src/main/kotlin/org/javacs/kt/SourcePath.kt
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.CompositeBindingContext
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
+import java.lang.Exception
 import kotlin.concurrent.withLock
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -50,7 +51,8 @@ class SourcePath(
         var compiledContext: BindingContext? = null,
         var compiledContainer: ComponentProvider? = null,
         val language: Language? = null,
-        val isTemporary: Boolean = false // A temporary source file will not be returned by .all()
+        val isTemporary: Boolean = false, // A temporary source file will not be returned by .all()
+        var lastSavedFile: KtFile? = null,
     ) {
         val extension: String? = uri.fileExtension ?: "kt" // TODO: Use language?.associatedFileType?.defaultExtension again
         val isScript: Boolean = extension == "kts"
@@ -162,7 +164,10 @@ class SourcePath(
         }
 
     fun delete(uri: URI) {
-        files[uri]?.let { refreshWorkspaceIndexes(listOf(it), listOf()) }
+        files[uri]?.let {
+            refreshWorkspaceIndexes(listOf(it), listOf())
+            cp.compiler.removeGeneratedCode(listOfNotNull(it.lastSavedFile))
+        }
 
         files.remove(uri)
     }
@@ -250,10 +255,34 @@ class SourcePath(
         // TODO: Investigate the possibility of compiling all files at once, instead of iterating here
         // At the moment, compiling all files at once sometimes leads to an internal error from the TopDownAnalyzer
         files.keys.forEach {
-            compileFiles(listOf(it))
+            // If one of the files fails to compile, we compile the others anyway
+            try {
+                compileFiles(listOf(it))
+            } catch (ex: Exception) {
+                LOG.printStackTrace(ex)
+            }
         }
     }
 
+    /**
+     * Saves a file. This generates code for the file and deletes previously generated code for this file.
+     */
+    fun save(uri: URI) {
+        files[uri]?.let {
+            cp.compiler.removeGeneratedCode(listOfNotNull(it.lastSavedFile))
+            it.compiledContainer?.let { container ->
+                it.compiledContext?.let { context ->
+                    cp.compiler.generateCode(container, context, listOfNotNull(it.compiledFile))
+                    it.lastSavedFile = it.compiledFile
+                }
+            }
+        }
+    }
+
+    fun saveAllFiles() {
+        files.keys.forEach { save(it) }
+    }
+
     fun refreshDependencyIndexes() {
         compileAllFiles()
 
diff --git a/server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt b/server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt
@@ -1,15 +1,12 @@
 package org.javacs.kt.compiler
 
-import com.intellij.codeInsight.NullableNotNullManager
 import com.intellij.lang.Language
-import com.intellij.openapi.Disposable
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.vfs.StandardFileSystems
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.openapi.vfs.VirtualFileSystem
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiFileFactory
-import com.intellij.mock.MockProject
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.environment.setIdeaIoUseFallback
 import org.jetbrains.kotlin.cli.jvm.compiler.CliBindingTrace
@@ -18,7 +15,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
 import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoots
 import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
-import org.jetbrains.kotlin.cli.jvm.plugins.PluginCliParser
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration as KotlinCompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
@@ -39,26 +35,20 @@ import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer
 import org.jetbrains.kotlin.resolve.TopDownAnalysisMode
 import org.jetbrains.kotlin.resolve.calls.components.InferenceSession
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
-import org.jetbrains.kotlin.resolve.extensions.ExtraImportsProviderExtension
 import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigurationComponentRegistrar
 import org.jetbrains.kotlin.scripting.compiler.plugin.definitions.CliScriptDefinitionProvider
 import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys
-import org.jetbrains.kotlin.scripting.definitions.ScriptCompilationConfigurationFromDefinition
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionProvider
-import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider
-import org.jetbrains.kotlin.scripting.definitions.StandardScriptDefinition
 import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
 import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinition // Legacy
 import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition
 import org.jetbrains.kotlin.scripting.definitions.getEnvironment
-import org.jetbrains.kotlin.scripting.extensions.ScriptExtraImportsProviderExtension
 import org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices
 import org.jetbrains.kotlin.util.KotlinFrontEndException
-import org.jetbrains.kotlin.utils.PathUtil
 import java.io.Closeable
 import java.io.File
 import java.nio.file.Path
@@ -69,7 +59,6 @@ import kotlin.concurrent.withLock
 import kotlin.script.dependencies.Environment
 import kotlin.script.dependencies.ScriptContents
 import kotlin.script.experimental.dependencies.ScriptDependencies
-import kotlin.script.experimental.api.ScriptCompilationConfiguration
 import kotlin.script.experimental.dependencies.DependenciesResolver
 import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResult
 import kotlin.script.experimental.host.ScriptingHostConfiguration
@@ -80,6 +69,12 @@ import org.javacs.kt.LOG
 import org.javacs.kt.CompilerConfiguration
 import org.javacs.kt.util.KotlinLSException
 import org.javacs.kt.util.LoggingMessageCollector
+import org.jetbrains.kotlin.cli.common.output.writeAllTo
+import org.jetbrains.kotlin.codegen.ClassBuilderFactories
+import org.jetbrains.kotlin.codegen.KotlinCodegenFacade
+import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.container.getService
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 
 private val GRADLE_DSL_DEPENDENCY_PATTERN = Regex("^gradle-(?:kotlin-dsl|core).*\\.jar$")
 
@@ -445,7 +440,7 @@ enum class CompilationKind {
  * Incrementally compiles files and expressions.
  * The basic strategy for compiling one file at-a-time is outlined in OneFilePerformance.
  */
-class Compiler(javaSourcePath: Set<Path>, classPath: Set<Path>, buildScriptClassPath: Set<Path> = emptySet()) : Closeable {
+class Compiler(javaSourcePath: Set<Path>, classPath: Set<Path>, buildScriptClassPath: Set<Path> = emptySet(), var outputDirectory: File? = null) : Closeable {
     private var closed = false
     private val localFileSystem: VirtualFileSystem
 
@@ -553,6 +548,34 @@ class Compiler(javaSourcePath: Set<Path>, classPath: Set<Path>, buildScriptClass
         }
     }
 
+    fun removeGeneratedCode(files: Collection<KtFile>) {
+        files.forEach { file ->
+            file.declarations.forEach { declaration ->
+                outputDirectory?.resolve(
+                    file.packageFqName.asString().replace(".", File.separator) + File.separator + declaration.name + ".class"
+                )?.delete()
+            }
+        }
+    }
+
+    fun generateCode(container: ComponentProvider, bindingContext: BindingContext, files: Collection<KtFile>) {
+        outputDirectory?.let {
+            compileLock.withLock {
+                val compileEnv = compileEnvironmentFor(CompilationKind.DEFAULT)
+                val state = GenerationState.Builder(
+                    project = compileEnv.environment.project,
+                    builderFactory = ClassBuilderFactories.BINARIES,
+                    module = container.getService(ModuleDescriptor::class.java),
+                    bindingContext = bindingContext,
+                    files = files.toList(),
+                    configuration = compileEnv.environment.configuration
+                ).build()
+                KotlinCodegenFacade.compileCorrectFiles(state)
+                state.factory.writeAllTo(it)
+            }
+        }
+    }
+
     override fun close() {
         if (!closed) {
             defaultCompileEnvironment.close()
diff --git a/vscode-java-kotlin/.gitignore b/vscode-java-kotlin/.gitignore
@@ -0,0 +1,9 @@
+node_modules
+target
+*.vsix
+.idea
+*.iml
+.DS_Store
+**/.DS_Store
+jars
+.vscode/settings.json
diff --git a/vscode-java-kotlin/.vscode/launch.json b/vscode-java-kotlin/.vscode/launch.json
@@ -0,0 +1,21 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+// Use IntelliSense to learn about possible attributes.
+// Hover to view descriptions of existing attributes.
+// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+{
+	"version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Extension",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--extensionDevelopmentPath=${workspaceFolder}"
+            ],
+            "outFiles": [
+                "${workspaceFolder}/out/**/*.js"
+            ]
+        }
+    ]
+}
diff --git a/vscode-java-kotlin/.vscodeignore b/vscode-java-kotlin/.vscodeignore
@@ -0,0 +1,8 @@
+.vscode/**
+.idea/**
+*.iml
+javaConfig.json
+tsconfig.json
+org.javacs.kt.jdt.ls.extension
+build.sh
+.gitignore
diff --git a/vscode-java-kotlin/README.md b/vscode-java-kotlin/README.md
@@ -0,0 +1,11 @@
+# VSCode Extension for Java + Kotlin
+
+A VSCode extension that enchances [vscode-java](https://github.com/redhat-developer/vscode-java) and [vscode-kotlin](https://github.com/fwcd/vscode-kotlin) with java + kotlin interoperability. This uses a JDT LS extension with a custom project importer to allow Java code to have access to Kotlin code.
+
+**Disclaimer**: This is very experimental, but it seems to work for small maven projects at least.
+
+## Setup (for now)
+
+For now, to set this up, you need to run the `build.sh` script in this directory to package the JDT LS extension. Afterwards, you should run `npm install` to install the extension dependencies.
+
+To debug, you can use F5 on VSCode, as with any other extension. To package the extension you can use `vsce package`.
diff --git a/vscode-java-kotlin/build.sh b/vscode-java-kotlin/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+rm -fr jars
+mkdir -p jars
+
+cd jdt-ls-extension
+mvn clean package
+cp org.javacs.kt.jdt.ls.extension/target/org.javacs.kt.jdt.ls.extension-1.0.0-SNAPSHOT.jar ../jars/jdt-ls-extension.jar
diff --git a/vscode-java-kotlin/javaConfig.json b/vscode-java-kotlin/javaConfig.json
@@ -0,0 +1,6 @@
+{
+    "projects": [
+        "./jdt-ls-extension/org.javacs.kt.jdt.ls.extension"
+    ],
+    "targetPlatform": "./jdt-ls-extension/target.target"
+  }
diff --git a/vscode-java-kotlin/jdt-ls-extension/org.javacs.kt.jdt.ls.extension/META-INF/MANIFEST.MF b/vscode-java-kotlin/jdt-ls-extension/org.javacs.kt.jdt.ls.extension/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.javacs.kt.jdt.ls.extension
+Bundle-SymbolicName: org.javacs.kt.jdt.ls.extension;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: VMware, Inc.
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.jdt.ls.core,
+ org.eclipse.core.runtime,
+ org.eclipse.jdt.core,
+ org.eclipse.core.resources,
+ org.eclipse.m2e.core;resolution:=optional,
+ org.eclipse.m2e.jdt;resolution:=optional,
+ org.eclipse.m2e.maven.runtime;resolution:=optional,
+ org.eclipse.lsp4j,
+ org.eclipse.lsp4j.jsonrpc
diff --git a/vscode-java-kotlin/jdt-ls-extension/org.javacs.kt.jdt.ls.extension/build.properties b/vscode-java-kotlin/jdt-ls-extension/org.javacs.kt.jdt.ls.extension/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/vscode-java-kotlin/jdt-ls-extension/org.javacs.kt.jdt.ls.extension/plugin.xml b/vscode-java-kotlin/jdt-ls-extension/org.javacs.kt.jdt.ls.extension/plugin.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+      <extension
+            id="importers"
+            point="org.eclipse.jdt.ls.core.importers">
+            <importer
+                  id = "kotlinProjectImporter"
+                  order = "150"
+                  class = "org.javacs.kt.jdt.ls.extension.KotlinMavenImporter"/>  	
+      </extension>
+</plugin>
+ 
diff --git a/vscode-java-kotlin/jdt-ls-extension/org.javacs.kt.jdt.ls.extension/pom.xml b/vscode-java-kotlin/jdt-ls-extension/org.javacs.kt.jdt.ls.extension/pom.xml
@@ -0,0 +1,18 @@
+<project xmlns="https://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0
+	                             https://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>eclipse-plugin</packaging>
+	<groupId>org.javacs.kt</groupId>
+	<artifactId>org.javacs.kt.jdt.ls.extension</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<name>org.javacs.kt.jdt.ls.extension</name>
+	
+	<parent>
+		<groupId>org.javacs.kt</groupId>
+		<artifactId>jdt-ls-extension-parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+</project>
diff --git a/vscode-java-kotlin/jdt-ls-extension/org.javacs.kt.jdt.ls.extension/src/org/javacs/kt/jdt/ls/extension/KotlinMavenImporter.java b/vscode-java-kotlin/jdt-ls-extension/org.javacs.kt.jdt.ls.extension/src/org/javacs/kt/jdt/ls/extension/KotlinMavenImporter.java
diff --git a/vscode-java-kotlin/jdt-ls-extension/pom.xml b/vscode-java-kotlin/jdt-ls-extension/pom.xml
diff --git a/vscode-java-kotlin/jdt-ls-extension/target.target b/vscode-java-kotlin/jdt-ls-extension/target.target
diff --git a/vscode-java-kotlin/package-lock.json b/vscode-java-kotlin/package-lock.json
diff --git a/vscode-java-kotlin/package.json b/vscode-java-kotlin/package.json
diff --git a/vscode-java-kotlin/src/extension.ts b/vscode-java-kotlin/src/extension.ts
diff --git a/vscode-java-kotlin/tsconfig.json b/vscode-java-kotlin/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,9 @@ class KotlinTextDocumentService(`
`179`	`179`	`// Lint after saving to prevent inconsistent diagnostics`
`180`	`180`	`val uri = parseURI(params.textDocument.uri)`
`181`	`181`	`lintNow(uri)`
	`182`	`+ debounceLint.schedule {`
	`183`	`+ sp.save(uri)`
	`184`	`+ }`
`182`	`185`	`}`
`183`	`186`
`184`	`187`	`override fun signatureHelp(position: SignatureHelpParams): CompletableFuture<SignatureHelp?> = async.compute {`
`@@ -263,6 +266,7 @@ class KotlinTextDocumentService(`
`263`	`266`	`fun lintAll() {`
`264`	`267`	`debounceLint.submitImmediately {`
`265`	`268`	`sp.compileAllFiles()`
	`269`	`+ sp.saveAllFiles()`
`266`	`270`	`sp.refreshDependencyIndexes()`
`267`	`271`	`}`
`268`	`272`	`}`