Remove obsolete InlineStrategy
Replace corresponding metadata property in js.ast with Boolean. This allows to get rid of dependency of 'js.ast' on 'frontend'.
This commit is contained in:
committed by
Alexander Udalov
parent
4156a9c80b
commit
8dd04789ad
@@ -1,12 +1,10 @@
|
||||
|
||||
plugins {
|
||||
kotlin("jvm")
|
||||
id("jps-compatible")
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile(project(":compiler:util"))
|
||||
compile(project(":compiler:frontend"))
|
||||
compile(project(":core:descriptors"))
|
||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
|
||||
compileOnly(intellijDep()) { includeJars("trove4j") }
|
||||
}
|
||||
@@ -15,4 +13,3 @@ sourceSets {
|
||||
"main" { projectDefault() }
|
||||
"test" {}
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
||||
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
|
||||
import org.jetbrains.kotlin.js.backend.ast.*
|
||||
import org.jetbrains.kotlin.resolve.inline.InlineStrategy
|
||||
import org.jetbrains.kotlin.types.KotlinType
|
||||
|
||||
var JsName.staticRef: JsNode? by MetadataProperty(default = null)
|
||||
@@ -38,8 +37,7 @@ var JsName.specialFunction: SpecialFunction? by MetadataProperty(default = null)
|
||||
|
||||
var JsExpression.localAlias: JsImportedModule? by MetadataProperty(default = null)
|
||||
|
||||
// TODO: move this to module 'js.inliner' and change dependency on 'frontend' to dependency on 'descriptors'
|
||||
var JsInvocation.inlineStrategy: InlineStrategy? by MetadataProperty(default = null)
|
||||
var JsInvocation.isInline: Boolean? by MetadataProperty(default = null)
|
||||
|
||||
var JsInvocation.isCallableReference by MetadataProperty(default = false)
|
||||
|
||||
@@ -51,7 +49,7 @@ var JsInvocation.psiElement: PsiElement? by MetadataProperty(default = null)
|
||||
|
||||
var JsNameRef.isJsCall: Boolean by MetadataProperty(default = false)
|
||||
|
||||
var JsNameRef.inlineStrategy: InlineStrategy? by MetadataProperty(default = null)
|
||||
var JsNameRef.isInline: Boolean? by MetadataProperty(default = null)
|
||||
|
||||
var JsNameRef.descriptor: CallableDescriptor? by MetadataProperty(default = null)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user