Merge branch 'fwcd:main' into main

Author: Henry Fraser

gradle.properties

@@ -1,5 +1,5 @@
 projectVersion=1.3.2
-kotlinVersion=1.6.10
+kotlinVersion=1.8.10
 exposedVersion=0.37.3
 lsp4jVersion=0.15.0
 javaVersion=11

server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt

@@ -1,3 +1,6 @@
+@file:OptIn(ExperimentalCompilerApi::class)
+@file:Suppress("DEPRECATION")
+
 package org.javacs.kt.compiler
 
 import com.intellij.lang.Language
@@ -67,6 +70,8 @@ import org.jetbrains.kotlin.cli.jvm.compiler.CliBindingTrace
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
+import org.jetbrains.kotlin.cli.jvm.config.configureJdkClasspathRoots
+import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.resolve.scopes.LexicalScope
 import org.jetbrains.kotlin.samWithReceiver.CliSamWithReceiverComponentContributor
@@ -111,6 +116,9 @@ private class CompilationEnvironment(
                 add(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, ScriptingCompilerConfigurationComponentRegistrar())
                 put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, true)
 
+                // configure jvm runtime classpaths
+                configureJdkClasspathRoots()
+
                 addJvmClasspathRoots(classPath.map { it.toFile() })
                 addJavaSourceRoots(javaSourcePath.map { it.toFile() })
 

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

@@ -9,20 +9,13 @@ import org.jetbrains.kotlin.builtins.isFunctionType
 import org.jetbrains.kotlin.renderer.ClassifierNamePolicy
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.renderer.ParameterNameRenderingPolicy
-import org.jetbrains.kotlin.types.ErrorUtils
-import org.jetbrains.kotlin.types.UnresolvedType
 
 val DECL_RENDERER = DescriptorRenderer.withOptions {
     withDefinedIn = false
     modifiers = emptySet()
     classifierNamePolicy = ClassifierNamePolicy.SHORT
     parameterNameRenderingPolicy = ParameterNameRenderingPolicy.ONLY_NON_SYNTHESIZED
-    typeNormalizer = {
-        when (it) {
-            is UnresolvedType ->  ErrorUtils.createErrorTypeWithCustomDebugName(it.presentableName)
-            else -> it
-        }
-    }
+    typeNormalizer = { it -> it }
 }
 
 private val GOOD_IDENTIFIER = Regex("[a-zA-Z]\\w*")

server/src/main/kotlin/org/javacs/kt/hover/Hovers.kt

@@ -20,6 +20,7 @@ import org.javacs.kt.completion.DECL_RENDERER
 import org.javacs.kt.position.position
 import org.javacs.kt.util.findParent
 import org.javacs.kt.signaturehelp.getDocString
+import org.jetbrains.kotlin.utils.IDEAPluginsCompatibilityAPI
 
 fun hoverAt(file: CompiledFile, cursor: Int): Hover? {
     val (ref, target) = file.referenceAtPoint(cursor) ?: return typeHoverAt(file, cursor)
@@ -67,6 +68,7 @@ private fun renderJavaDoc(text: String): String {
     }.joinToString("\n")
 }
 
+@OptIn(IDEAPluginsCompatibilityAPI::class)
 private fun renderTypeOf(element: KtExpression, bindingContext: BindingContext): String? {
     if (element is KtCallableDeclaration) {
         val descriptor = bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, element]

server/src/main/kotlin/org/javacs/kt/imports/Imports.kt

@@ -3,6 +3,8 @@ package org.javacs.kt.imports
 import org.eclipse.lsp4j.Position
 import org.eclipse.lsp4j.Range
 import org.eclipse.lsp4j.TextEdit
+import org.jetbrains.kotlin.lexer.KtKeywordToken
+import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
 import org.javacs.kt.position.location
@@ -15,7 +17,7 @@ fun getImportTextEditEntry(parsedFile: KtFile, fqName: FqName): TextEdit {
 
     val pos = findImportInsertionPosition(parsedFile, fqName)
     val prefix = if (importedNames.isEmpty()) "\n\n" else "\n"
-    return TextEdit(Range(pos, pos), "${prefix}import ${fqName}")
+    return TextEdit(Range(pos, pos), "${prefix}import ${backtickBultins(fqName)}")
 }
 
 /** Finds a good insertion position for a new import of the given fully-qualified name. */
@@ -36,3 +38,25 @@ private fun matchingPrefixLength(left: FqName, right: FqName): Int =
     left.pathSegments().asSequence().zip(right.pathSegments().asSequence())
         .takeWhile { it.first == it.second }
         .count()
+
+private fun backtickBultins(fqName: FqName): String {
+    val builtInKeywords = (KtTokens.SOFT_KEYWORDS.getTypes() + KtTokens.KEYWORDS.getTypes())
+        .asSequence()
+        .mapNotNull { (it as? KtKeywordToken)?.value }
+    var result = fqName.asString()
+    for (builtin in builtInKeywords) {
+        if (result.contains(builtin)) {
+            // need to go through each part to handle words
+            // that are part of other words (e.g, as and class)
+            result = result.split('.').map {
+                if (builtin == it) {
+                    "`$builtin`"
+                } else {
+                    it
+                }
+            }.joinToString(".")
+        }
+    }
+
+    return result
+}

server/src/test/kotlin/org/javacs/kt/ImportsTest.kt

@@ -0,0 +1,50 @@
+package org.javacs.kt
+
+import org.javacs.kt.imports.getImportTextEditEntry
+import org.jetbrains.kotlin.name.FqName
+import org.hamcrest.Matchers.*
+import org.junit.Assert.assertThat
+import org.junit.Test
+
+class ImportTextEditTest : SingleFileTestFixture("imports", "Simple.kt") {
+
+    @Test
+    fun `should return normal import name`() {
+        val ktFile = languageServer.sourcePath.parsedFile(workspaceRoot.resolve(file).toUri())
+        val importName = FqName("org.jetbrains.kotlin.name.FqName")
+        val result = getImportTextEditEntry(ktFile, importName)
+
+        assertThat(result.range, equalTo(range(1, 23, 1, 23)))
+        assertThat(result.newText, equalTo("\n\nimport org.jetbrains.kotlin.name.FqName"))
+    }
+
+    @Test
+    fun `should wrap -class- in backticks`() {
+        val ktFile = languageServer.sourcePath.parsedFile(workspaceRoot.resolve(file).toUri())
+        val importName = FqName("com.class.myMethod")
+        val result = getImportTextEditEntry(ktFile, importName)
+
+        assertThat(result.range, equalTo(range(1, 23, 1, 23)))
+        assertThat(result.newText, equalTo("\n\nimport com.`class`.myMethod"))
+    }
+
+    @Test
+    fun `should wrap -fun- in backticks`() {
+        val ktFile = languageServer.sourcePath.parsedFile(workspaceRoot.resolve(file).toUri())
+        val importName = FqName("com.fun.myMethod")
+        val result = getImportTextEditEntry(ktFile, importName)
+
+        assertThat(result.range, equalTo(range(1, 23, 1, 23)))
+        assertThat(result.newText, equalTo("\n\nimport com.`fun`.myMethod"))
+    }
+
+    @Test
+    fun `should wrap multiple built in keywords in backticks`() {
+        val ktFile = languageServer.sourcePath.parsedFile(workspaceRoot.resolve(file).toUri())
+        val importName = FqName("fun.class.someother.package.method.var.val")
+        val result = getImportTextEditEntry(ktFile, importName)
+
+        assertThat(result.range, equalTo(range(1, 23, 1, 23)))
+        assertThat(result.newText, equalTo("\n\nimport `fun`.`class`.someother.`package`.method.`var`.`val`"))
+    }
+}

server/src/test/kotlin/org/javacs/kt/OneFilePerformance.kt

@@ -19,8 +19,8 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.resolve.BindingTraceContext
 import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer
 import org.jetbrains.kotlin.resolve.TopDownAnalysisMode
-import org.jetbrains.kotlin.resolve.calls.callUtil.getParentResolvedCall
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfoFactory
+import org.jetbrains.kotlin.resolve.calls.util.getParentResolvedCall
 import org.junit.Test
 import org.openjdk.jmh.annotations.*
 import org.openjdk.jmh.runner.Runner

server/src/test/resources/imports/Simple.kt

@@ -0,0 +1,4 @@
+package test.mypackage
+
+
+val something = 1