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

jps, daemon: fix javascript inline functions tracking

Browse Source 
inline function hash should computed after compilation
This commit is contained in:
Sergey Rostov
2018-06-07 11:02:33 +03:00
parent 5a2ed364fe
commit ce96c1b9a8
7 changed files with 82 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-common/build.gradle.kts
+1
View File
@@ -12,6 +12,7 @@ dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
compile(projectDist(":kotlin-stdlib"))
compileOnly(project(":js:js.frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
}
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt
+2 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.daemon.common
import org.jetbrains.kotlin.incremental.components.LookupInfo
import org.jetbrains.kotlin.incremental.js.JsInlineFunctionHash
import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto
import org.jetbrains.kotlin.modules.TargetId
import java.io.Serializable
@@ -109,7 +110,7 @@ interface CompilerCallbackServicesFacade : Remote {
fun incrementalResultsConsumer_processPackagePart(sourceFilePath: String, packagePartMetadata: ByteArray, binaryAst: ByteArray)
@Throws(RemoteException::class)
fun incrementalResultsConsumer_processInlineFunction(sourceFilePath: String, fqName: String, inlineFunction: Any, line: Int, column: Int)
fun incrementalResultsConsumer_processInlineFunctions(functions: Collection<JsInlineFunctionHash>)
// ---------------------------------------------------
// IncrementalDataProvider (js)