Merge pull request #372 from lsp4j-0.14

Author: fwcd

gradle.properties

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

server/src/main/kotlin/org/javacs/kt/KotlinTextDocumentService.kt

@@ -156,6 +156,7 @@ class KotlinTextDocumentService(
         TODO("not implemented")
     }
 
+    @Suppress("DEPRECATION")
     override fun documentSymbol(params: DocumentSymbolParams): CompletableFuture<List<Either<SymbolInformation, DocumentSymbol>>> = async.compute {
         LOG.info("Find symbols in {}", describeURI(params.textDocument.uri))
 

server/src/main/kotlin/org/javacs/kt/KotlinWorkspaceService.kt

@@ -1,6 +1,5 @@
 package org.javacs.kt
 
-import com.intellij.openapi.project.Project
 import org.eclipse.lsp4j.*
 import org.eclipse.lsp4j.services.WorkspaceService
 import org.eclipse.lsp4j.services.LanguageClient
@@ -9,12 +8,9 @@ import org.eclipse.lsp4j.jsonrpc.messages.Either
 import org.javacs.kt.symbols.workspaceSymbols
 import org.javacs.kt.command.JAVA_TO_KOTLIN_COMMAND
 import org.javacs.kt.j2k.convertJavaToKotlin
-import org.javacs.kt.KotlinTextDocumentService
 import org.javacs.kt.position.extractRange
 import org.javacs.kt.util.filePath
 import org.javacs.kt.util.parseURI
-import org.javacs.kt.resolve.resolveMain
-import java.net.URI
 import java.nio.file.Paths
 import java.util.concurrent.CompletableFuture
 import com.google.gson.JsonElement
@@ -30,7 +26,7 @@ class KotlinWorkspaceService(
 ) : WorkspaceService, LanguageClientAware {
     private val gson = Gson()
     private var languageClient: LanguageClient? = null
- 
+
     override fun connect(client: LanguageClient): Unit {
         languageClient = client
     }
@@ -143,10 +139,11 @@ class KotlinWorkspaceService(
         LOG.info("Updated configuration: {}", settings)
     }
 
-    override fun symbol(params: WorkspaceSymbolParams): CompletableFuture<List<SymbolInformation>> {
+    @Suppress("DEPRECATION")
+    override fun symbol(params: WorkspaceSymbolParams): CompletableFuture<Either<List<SymbolInformation>, List<WorkspaceSymbol>>> {
         val result = workspaceSymbols(params.query, sp)
 
-        return CompletableFuture.completedFuture(result)
+        return CompletableFuture.completedFuture(Either.forRight(result))
     }
 
     override fun didChangeWorkspaceFolders(params: DidChangeWorkspaceFoldersParams) {

server/src/main/kotlin/org/javacs/kt/symbols/Symbols.kt

@@ -1,10 +1,13 @@
+@file:Suppress("DEPRECATION")
+
 package org.javacs.kt.symbols
 
 import com.intellij.psi.PsiElement
-import org.eclipse.lsp4j.Location
 import org.eclipse.lsp4j.SymbolInformation
 import org.eclipse.lsp4j.SymbolKind
 import org.eclipse.lsp4j.DocumentSymbol
+import org.eclipse.lsp4j.WorkspaceSymbol
+import org.eclipse.lsp4j.WorkspaceSymbolLocation
 import org.eclipse.lsp4j.jsonrpc.messages.Either
 import org.javacs.kt.SourcePath
 import org.javacs.kt.position.range
@@ -15,7 +18,7 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.parents
 
 fun documentSymbols(file: KtFile): List<Either<SymbolInformation, DocumentSymbol>> =
-        doDocumentSymbols(file).map { Either.forRight<SymbolInformation, DocumentSymbol>(it) }
+        doDocumentSymbols(file).map { Either.forRight(it) }
 
 private fun doDocumentSymbols(element: PsiElement): List<DocumentSymbol> {
     val children = element.children.flatMap(::doDocumentSymbols)
@@ -30,10 +33,10 @@ private fun doDocumentSymbols(element: PsiElement): List<DocumentSymbol> {
     } ?: children
 }
 
-fun workspaceSymbols(query: String, sp: SourcePath): List<SymbolInformation> =
+fun workspaceSymbols(query: String, sp: SourcePath): List<WorkspaceSymbol> =
         doWorkspaceSymbols(sp)
                 .filter { containsCharactersInOrder(it.name!!, query, false) }
-                .mapNotNull(::symbolInformation)
+                .mapNotNull(::workspaceSymbol)
                 .toList()
 
 private fun doWorkspaceSymbols(sp: SourcePath): Sequence<KtNamedDeclaration> =
@@ -53,10 +56,10 @@ private fun pickImportantElements(node: PsiElement, includeLocals: Boolean): KtN
             else -> null
         }
 
-private fun symbolInformation(d: KtNamedDeclaration): SymbolInformation? {
+private fun workspaceSymbol(d: KtNamedDeclaration): WorkspaceSymbol? {
     val name = d.name ?: return null
 
-    return SymbolInformation(name, symbolKind(d), symbolLocation(d), symbolContainer(d))
+    return WorkspaceSymbol(name, symbolKind(d), Either.forRight(workspaceLocation(d)), symbolContainer(d))
 }
 
 private fun symbolKind(d: KtNamedDeclaration): SymbolKind =
@@ -70,12 +73,11 @@ private fun symbolKind(d: KtNamedDeclaration): SymbolKind =
             else -> throw IllegalArgumentException("Unexpected symbol $d")
         }
 
-private fun symbolLocation(d: KtNamedDeclaration): Location {
+private fun workspaceLocation(d: KtNamedDeclaration): WorkspaceSymbolLocation {
     val file = d.containingFile
     val uri = file.toPath().toUri().toString()
-    val range = range(file.text, d.textRange)
 
-    return Location(uri, range)
+    return WorkspaceSymbolLocation(uri)
 }
 
 private fun symbolContainer(d: KtNamedDeclaration): String? =

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

@@ -28,6 +28,19 @@ class ClassPathTest {
         assertThat(classPath, hasItem(containsString("junit")))
     }
 
+    @Test fun `find maven classpath`() {
+        val workspaceRoot = testResourcesRoot().resolve("mavenWorkspace")
+        val buildFile = workspaceRoot.resolve("pom.xml")
+
+        assertTrue(Files.exists(buildFile))
+
+        val resolvers = defaultClassPathResolver(listOf(workspaceRoot))
+        print(resolvers)
+        val classPath = resolvers.classpathOrEmpty.map { it.toString() }
+
+        assertThat(classPath, hasItem(containsString("junit")))
+    }
+
     @Test fun `find kotlin stdlib`() {
         assertThat(findKotlinStdlib(), notNullValue())
     }

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

@@ -5,12 +5,11 @@ import org.eclipse.lsp4j.WorkspaceSymbolParams
 import org.hamcrest.Matchers.hasItem
 import org.hamcrest.Matchers.not
 import org.junit.Assert.assertThat
-import org.junit.Before
 import org.junit.Test
 
 class WorkspaceSymbolsTest : SingleFileTestFixture("symbols", "DocumentSymbols.kt") {
     @Test fun `find symbols in OtherFileSymbols`() {
-        val found = languageServer.workspaceService.symbol(WorkspaceSymbolParams("")).get()
+        val found = languageServer.workspaceService.symbol(WorkspaceSymbolParams("")).get().right
         val byKind = found.groupBy({ it.kind }, { it.name })
         val all = found.map { it.name }.toList()
 

server/src/test/resources/mavenWorkspace/pom.xml

@@ -0,0 +1,18 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.example</groupId>
+  <artifactId>test-project</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>test-project</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

server/src/test/resources/mavenWorkspace/src/main/java/com/example/App.java

@@ -0,0 +1,10 @@
+package com.example;
+
+/**
+ * Hello world!
+ */
+public class App {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
+    }
+}

server/src/test/resources/mavenWorkspace/src/test/java/com/example/AppTest.java

@@ -0,0 +1,33 @@
+package com.example;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest extends TestCase {
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest(String testName) {
+        super(testName);
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite() {
+        return new TestSuite(AppTest.class);
+    }
+
+    /**
+     * Rigorous Test :-)
+     */
+    public void testApp() {
+        assertTrue(true);
+    }
+}