Skip to content

Commit 8470cba

Browse files
fwcdfwcd
committed
Drop dependency on ktlint and use non-embedded compiler again
1 parent 50da025 commit 8470cba

File tree

16 files changed

+58
-62
lines changed

16 files changed

+58
-62
lines changed

‎server/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,12 @@ dependencies {
4444
implementation project(':shared')
4545
implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.7.0'
4646
implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.7.0'
47-
implementation 'org.jetbrains.kotlin:kotlin-compiler-embeddable'
48-
implementation 'org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable'
49-
implementation 'org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable'
47+
implementation 'org.jetbrains.kotlin:kotlin-compiler'
48+
implementation 'org.jetbrains.kotlin:kotlin-scripting-compiler'
49+
implementation 'org.jetbrains.kotlin:kotlin-scripting-compiler-impl'
5050
implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm-host-unshaded'
5151
implementation 'org.jetbrains.kotlin:kotlin-reflect'
5252
implementation 'org.jetbrains:fernflower:1.0'
53-
implementation 'com.pinterest.ktlint:ktlint-core:0.38.1'
54-
implementation 'com.pinterest.ktlint:ktlint-ruleset-standard:0.38.1'
5553
implementation 'com.beust:jcommander:1.78'
5654

5755
// Re-add to depend on Kotlin plugin classes directly. Note that

‎server/src/main/kotlin/org/javacs/kt/CompiledFile.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.javacs.kt
22

3-
import org.jetbrains.kotlin.com.intellij.openapi.util.TextRange
4-
import org.jetbrains.kotlin.com.intellij.psi.PsiElement
5-
import org.jetbrains.kotlin.com.intellij.psi.PsiIdentifier
3+
import com.intellij.openapi.util.TextRange
4+
import com.intellij.psi.PsiElement
5+
import com.intellij.psi.PsiIdentifier
66
import org.javacs.kt.position.changedRegion
77
import org.javacs.kt.position.position
88
import org.javacs.kt.util.findParent

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package org.javacs.kt
22

3-
import org.jetbrains.kotlin.com.intellij.codeInsight.NullableNotNullManager
4-
import org.jetbrains.kotlin.com.intellij.lang.Language
5-
import org.jetbrains.kotlin.com.intellij.openapi.Disposable
6-
import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer
7-
import org.jetbrains.kotlin.com.intellij.openapi.vfs.StandardFileSystems
8-
import org.jetbrains.kotlin.com.intellij.openapi.vfs.VirtualFileManager
9-
import org.jetbrains.kotlin.com.intellij.openapi.vfs.VirtualFileSystem
10-
import org.jetbrains.kotlin.com.intellij.psi.PsiFile
11-
import org.jetbrains.kotlin.com.intellij.psi.PsiFileFactory
12-
import org.jetbrains.kotlin.com.intellij.mock.MockProject
3+
import com.intellij.codeInsight.NullableNotNullManager
4+
import com.intellij.lang.Language
5+
import com.intellij.openapi.Disposable
6+
import com.intellij.openapi.util.Disposer
7+
import com.intellij.openapi.vfs.StandardFileSystems
8+
import com.intellij.openapi.vfs.VirtualFileManager
9+
import com.intellij.openapi.vfs.VirtualFileSystem
10+
import com.intellij.psi.PsiFile
11+
import com.intellij.psi.PsiFileFactory
12+
import com.intellij.mock.MockProject
1313
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
1414
import org.jetbrains.kotlin.cli.common.environment.setIdeaIoUseFallback
1515
import org.jetbrains.kotlin.cli.jvm.compiler.CliBindingTrace

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.javacs.kt
22

3-
import org.jetbrains.kotlin.com.intellij.openapi.project.Project
3+
import com.intellij.openapi.project.Project
44
import org.eclipse.lsp4j.*
55
import org.eclipse.lsp4j.services.WorkspaceService
66
import org.eclipse.lsp4j.services.LanguageClient

‎server/src/main/kotlin/org/javacs/kt/SourceFiles.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.javacs.kt
22

3-
import org.jetbrains.kotlin.com.intellij.openapi.util.text.StringUtil.convertLineSeparators
4-
import org.jetbrains.kotlin.com.intellij.lang.java.JavaLanguage
5-
import org.jetbrains.kotlin.com.intellij.lang.Language
3+
import com.intellij.openapi.util.text.StringUtil.convertLineSeparators
4+
import com.intellij.lang.java.JavaLanguage
5+
import com.intellij.lang.Language
66
import org.jetbrains.kotlin.idea.KotlinLanguage
77
import org.eclipse.lsp4j.TextDocumentContentChangeEvent
88
import org.javacs.kt.util.KotlinLSException

‎server/src/main/kotlin/org/javacs/kt/SourcePath.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package org.javacs.kt
33
import org.javacs.kt.util.fileExtension
44
import org.javacs.kt.util.filePath
55
import org.javacs.kt.util.describeURI
6-
import org.jetbrains.kotlin.com.intellij.lang.Language
7-
import org.jetbrains.kotlin.com.intellij.psi.PsiFile
6+
import com.intellij.lang.Language
7+
import com.intellij.psi.PsiFile
88
import org.jetbrains.kotlin.container.ComponentProvider
99
import org.jetbrains.kotlin.psi.KtFile
1010
import org.jetbrains.kotlin.resolve.BindingContext

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

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
package org.javacs.kt.formatting
22

33
import org.eclipse.lsp4j.FormattingOptions
4-
import com.pinterest.ktlint.core.KtLint
5-
import com.pinterest.ktlint.core.LintError
6-
import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider
74

85
fun formatKotlinCode(
96
code: String,
10-
lintCallback: (error: LintError, corrected: Boolean) -> Unit = { _, _ -> Unit },
117
isScript: Boolean = false,
128
options: FormattingOptions = FormattingOptions(4, true)
13-
): String = KtLint.format(
14-
KtLint.Params(
15-
text = code,
16-
script = isScript,
17-
ruleSets = listOf(StandardRuleSetProvider().get()),
18-
userData = mapOf(
19-
"indent_size" to options.tabSize.toString(),
20-
"indent_style" to if (options.isInsertSpaces) "space" else "tab"
21-
),
22-
cb = lintCallback
23-
)
24-
)
9+
): String = code // TODO
10+
11+
// KtLint.format(
12+
// KtLint.Params(
13+
// text = code,
14+
// script = isScript,
15+
// ruleSets = listOf(StandardRuleSetProvider().get()),
16+
// userData = mapOf(
17+
// "indent_size" to options.tabSize.toString(),
18+
// "indent_style" to if (options.isInsertSpaces) "space" else "tab"
19+
// ),
20+
// cb = lintCallback
21+
// )
22+
// )

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import org.eclipse.lsp4j.Hover
44
import org.eclipse.lsp4j.MarkedString
55
import org.eclipse.lsp4j.Range
66
import org.eclipse.lsp4j.jsonrpc.messages.Either
7-
import org.jetbrains.kotlin.com.intellij.openapi.util.TextRange
8-
import org.jetbrains.kotlin.com.intellij.psi.PsiElement
7+
import com.intellij.openapi.util.TextRange
8+
import com.intellij.psi.PsiElement
99
import org.jetbrains.kotlin.psi.KtExpression
1010
import org.jetbrains.kotlin.psi.KtCallableDeclaration
1111
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -87,7 +87,7 @@ private fun renderTypeOf(element: KtExpression, bindingContext: BindingContext):
8787

8888
val expressionType = bindingContext[BindingContext.EXPRESSION_TYPE_INFO, element]?.type ?: element.getType(bindingContext)
8989
val result = expressionType?.let { TYPE_RENDERER.renderType(it) } ?: return null
90-
90+
9191
val smartCast = bindingContext[BindingContext.SMARTCAST, element]
9292
if (smartCast != null && element is KtReferenceExpression) {
9393
val declaredType = (bindingContext[BindingContext.REFERENCE_TARGET, element] as? CallableDescriptor)?.returnType

‎server/src/main/kotlin/org/javacs/kt/j2k/JavaElementConverter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.javacs.kt.j2k
22

33
import org.javacs.kt.LOG
4-
import org.jetbrains.kotlin.com.intellij.psi.*
5-
import org.jetbrains.kotlin.com.intellij.psi.javadoc.*
4+
import com.intellij.psi.*
5+
import com.intellij.psi.javadoc.*
66

77
/**
88
* A Psi visitor that converts Java elements into

‎server/src/main/kotlin/org/javacs/kt/j2k/JavaToKotlinConverter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.javacs.kt.j2k
22

3-
import org.jetbrains.kotlin.com.intellij.lang.java.JavaLanguage
4-
import org.jetbrains.kotlin.com.intellij.psi.PsiFileFactory
5-
import org.jetbrains.kotlin.com.intellij.openapi.project.Project
3+
import com.intellij.lang.java.JavaLanguage
4+
import com.intellij.psi.PsiFileFactory
5+
import com.intellij.openapi.project.Project
66
// import org.jetbrains.kotlin.j2k.JavaToKotlinTranslator
77
import org.javacs.kt.LOG
88
import org.javacs.kt.Compiler

0 commit comments

Comments
 (0)