azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2/2 Extract code which is required for :kotlin-scripting-ide-services from ide-common into seprate module

Browse Source 
Extract the code and keep it in Kotlin repo. See previous preparation commit as well
This commit is contained in:
Nikita Bobko
2021-07-02 16:22:11 +02:00
parent cf3f35e1c8
commit 365821ae54
24 changed files with 123 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-ide-services/build.gradle.kts
+1 -1
View File
@@ -13,7 +13,7 @@ publish()
dependencies {
compile(project(":kotlin-script-runtime"))
compile(kotlinStdlib())
compileOnly(project(":idea:ide-common"))
compileOnly(project(":kotlin-scripting-ide-common"))
compile(project(":kotlin-scripting-common"))
compile(project(":kotlin-scripting-jvm"))
compileOnly(project(":kotlin-scripting-compiler"))
plugins/scripting/scripting-ide-services/src/org/jetbrains/kotlin/scripting/ide_services/compiler/impl/KJvmReplCompleter.kt
+3 -3
View File
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor
import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl
import org.jetbrains.kotlin.idea.codeInsight.ReferenceVariantsHelper
import org.jetbrains.kotlin.idea.util.CallTypeAndReceiver
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderersScripting
import org.jetbrains.kotlin.idea.util.getResolutionScope
import org.jetbrains.kotlin.lexer.KtKeywordToken
import org.jetbrains.kotlin.lexer.KtTokens
@@ -414,11 +414,11 @@ private class KJvmReplCompleter(
}
private val RENDERER =
IdeDescriptorRenderers.SOURCE_CODE.withOptions {
IdeDescriptorRenderersScripting.SOURCE_CODE.withOptions {
this.classifierNamePolicy =
ClassifierNamePolicy.SHORT
this.typeNormalizer =
IdeDescriptorRenderers.APPROXIMATE_FLEXIBLE_TYPES
IdeDescriptorRenderersScripting.APPROXIMATE_FLEXIBLE_TYPES
this.parameterNameRenderingPolicy =
ParameterNameRenderingPolicy.NONE
this.renderDefaultAnnotationArguments = false
plugins/scripting/scripting-ide-services/src/org/jetbrains/kotlin/scripting/ide_services/compiler/impl/KotlinResolutionFacadeForRepl.kt
-16
View File
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class KotlinResolutionFacadeForRepl(
private val environment: KotlinCoreEnvironment,
@@ -31,13 +30,6 @@ class KotlinResolutionFacadeForRepl(
override val project: Project
get() = environment.project
override fun analyze(
element: KtElement,
bodyResolveMode: BodyResolveMode
): BindingContext {
throw UnsupportedOperationException()
}
override val moduleDescriptor: ModuleDescriptor = provider.getService(ModuleDescriptor::class.java)
@FrontendInternals
@@ -69,10 +61,6 @@ class KotlinResolutionFacadeForRepl(
throw UnsupportedOperationException()
}
override fun analyze(elements: Collection<KtElement>, bodyResolveMode: BodyResolveMode): BindingContext {
throw UnsupportedOperationException()
}
override fun analyzeWithAllCompilerChecks(
elements: Collection<KtElement>,
callback: DiagnosticSink.DiagnosticsCallback?
@@ -80,8 +68,4 @@ class KotlinResolutionFacadeForRepl(
throw UnsupportedOperationException()
}
override fun resolveToDescriptor(declaration: KtDeclaration, bodyResolveMode: BodyResolveMode): DeclarationDescriptor {
throw UnsupportedOperationException()
}
}