Merge branch 'main' of github.com:fwcd/kotlin-language-server into dependency-caching

Author: daplf

.github/workflows/build.yml

@@ -1,17 +1,18 @@
 name: Build
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['11']
+        java: ['11', '17']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Build
         run: ./gradlew :server:build :shared:build

.github/workflows/deploy.yml

@@ -8,11 +8,12 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Setup JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '11'
       - name: Build distribution
         run: ./gradlew :server:distZip :grammars:distZip
       - name: Create release

.gitignore

@@ -1,23 +1,29 @@
+# General
+.DS_Store
+hs_err_*
+
+# Java/Eclipse/IDEA
 .settings
 .classpath
 .project
 .factorypath
 .gradle
-
 .idea
 *.iml
-
-lib-kotlin
 bin
 build
 target
 out
+
+# Python
 __pycache__
-*.vsix
 
+# Node.js
 node_modules
-.vscode-test
-
-.DS_Store
 
-hs_err_*
+# VSCode
+.vscode-test
+.vscode/*
+!.vscode/launch.json
+!.vscode/tasks.json
+*.vsix

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to the language server will be documented in this file.
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## [1.3.0]
+- Bump to Kotlin 1.6
+- Support JDK 17
+- Add incremental indexing
+- Improve logged Gradle errors
+
 ## [1.2.0]
 - Support for renaming
 - Improved semantic highlighting for enum members

gradle.properties

@@ -1,5 +1,5 @@
-projectVersion=1.3.0
-kotlinVersion=1.5.20
-exposedVersion=0.32.1
+projectVersion=1.4.0
+kotlinVersion=1.6.10
+exposedVersion=0.37.3
 lsp4jVersion=0.12.0
 javaVersion=11

server/build.gradle

@@ -46,7 +46,7 @@ dependencies {
     implementation "org.jetbrains.exposed:exposed-dao:$exposedVersion"
     implementation "org.jetbrains.exposed:exposed-jdbc:$exposedVersion"
     implementation 'com.h2database:h2:1.4.200'
-    implementation 'com.github.fwcd.ktfmt:ktfmt:8ef3ee752a'
+    implementation 'com.github.fwcd.ktfmt:ktfmt:b5d31d1'
     implementation 'com.beust:jcommander:1.78'
 
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
@@ -72,7 +72,7 @@ applicationDistribution.into('bin') {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 

server/src/main/kotlin/org/javacs/kt/formatting/Formatter.kt

@@ -1,13 +1,13 @@
 package org.javacs.kt.formatting
 
-import com.facebook.ktfmt.format
-import com.facebook.ktfmt.FormattingOptions as KtfmtOptions
+import com.facebook.ktfmt.format.Formatter
+import com.facebook.ktfmt.format.FormattingOptions as KtfmtOptions
 import org.eclipse.lsp4j.FormattingOptions
 
 fun formatKotlinCode(
     code: String,
     options: FormattingOptions = FormattingOptions(4, true)
-): String = format(KtfmtOptions(
+): String = Formatter.format(KtfmtOptions(
     style = KtfmtOptions.Style.GOOGLE,
     blockIndent = options.tabSize,
     continuationIndent = 2 * options.tabSize

shared/src/main/kotlin/org/javacs/kt/classpath/GradleClassPathResolver.kt

@@ -92,9 +92,14 @@ private fun readDependenciesViaGradleCLI(projectDirectory: Path, gradleScripts:
 
 private fun findGradleCLIDependencies(command: String, projectDirectory: Path): Set<Path>? {
     val (result, errors) = execAndReadStdoutAndStderr(command, projectDirectory)
-    LOG.debug(result)
     if ("FAILURE: Build failed" in errors) {
-        LOG.warn("Gradle task failed: {}", errors.lines().joinToString("\n"))
+        LOG.warn("Gradle task failed: {}", errors)
+    } else {
+        for (error in errors.lines()) {
+            if ("ERROR: " in error) {
+                LOG.warn("Gradle error: {}", error)
+            }
+        }
     }
     return parseGradleCLIDependencies(result)
 }

shared/src/main/kotlin/org/javacs/kt/classpath/MavenClassPathResolver.kt

@@ -2,6 +2,7 @@ package org.javacs.kt.classpath
 
 import org.javacs.kt.LOG
 import org.javacs.kt.util.findCommandOnPath
+import org.javacs.kt.util.findProjectCommandWithName
 import org.javacs.kt.util.execAndReadStdoutAndStderr
 import java.nio.file.Path
 import java.nio.file.Files
@@ -106,14 +107,14 @@ private fun mavenJarName(a: Artifact, source: Boolean) =
 
 private fun generateMavenDependencyList(pom: Path): Path {
     val mavenOutput = Files.createTempFile("deps", ".txt")
-    val command = "$mvnCommand dependency:list -DincludeScope=test -DoutputFile=$mavenOutput -Dstyle.color=never"
+    val command = "${mvnCommand(pom)} dependency:list -DincludeScope=test -DoutputFile=$mavenOutput -Dstyle.color=never"
     runCommand(pom, command)
     return mavenOutput
 }
 
 private fun generateMavenDependencySourcesList(pom: Path): Path {
     val mavenOutput = Files.createTempFile("sources", ".txt")
-    val command = "$mvnCommand dependency:sources -DincludeScope=test -DoutputFile=$mavenOutput -Dstyle.color=never"
+    val command = "${mvnCommand(pom)} dependency:sources -DincludeScope=test -DoutputFile=$mavenOutput -Dstyle.color=never"
     runCommand(pom, command)
     return mavenOutput
 }
@@ -128,8 +129,14 @@ private fun runCommand(pom: Path, command: String) {
     }
 }
 
-private val mvnCommand: Path by lazy {
-    requireNotNull(findCommandOnPath("mvn")) { "Unable to find the 'mvn' command" }
+private val mvnCommandFromPath: Path? by lazy {
+    findCommandOnPath("mvn")
+}
+
+private fun mvnCommand(pom: Path): Path {
+    return requireNotNull(mvnCommandFromPath ?: findProjectCommandWithName("mvnw", pom)?.also {
+        LOG.info("Using mvn wrapper (mvnw) in place of mvn command")
+    }) { "Unable to find the 'mvn' command or suitable wrapper" }
 }
 
 fun parseMavenArtifact(rawArtifact: String, version: String? = null): Artifact {

shared/src/main/kotlin/org/javacs/kt/util/ShellPathUtils.kt

@@ -33,3 +33,17 @@ private fun findExecutableOnPath(fileName: String): Path? {
 
     return null
 }
+
+fun findProjectCommandWithName(name: String, projectFile: Path): Path? =
+    if (isOSWindows()) {
+        findFileRelativeToProjectFile("$name.cmd", projectFile)
+    } else {
+        findFileRelativeToProjectFile(name, projectFile)
+    }
+
+private fun findFileRelativeToProjectFile(name: String, projectFile: Path): Path? =
+    projectFile.resolveSibling(name).toFile().takeIf { file ->
+        file.isFile && file.canExecute()
+    }?.let { file ->
+        Paths.get(file.absolutePath)
+    }