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

Fix tracking lookups when compile using daemon

Browse Source 
Original commit: 6305bbda5d
This commit is contained in:
Zalim Bashorov
2015-11-13 20:14:05 +03:00
parent 97f2891ae9
commit 60200f2a65
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt
+7 -4
View File
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.jps.incremental
import com.intellij.util.containers.MultiMap
import org.jetbrains.annotations.TestOnly
import org.jetbrains.jps.builders.storage.StorageProvider
import org.jetbrains.kotlin.incremental.components.LocationInfo
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.incremental.components.Position
import org.jetbrains.kotlin.incremental.components.ScopeKind
import org.jetbrains.kotlin.jps.incremental.storage.*
import org.jetbrains.kotlin.utils.Printer
@@ -184,9 +184,12 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() {
class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker {
val lookups = MultiMap<LookupSymbol, String>()
override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) {
lookups.putValue(LookupSymbol(name, scopeFqName), locationInfo.filePath)
delegate.record(locationInfo, scopeFqName, scopeKind, name)
override val requiresPosition: Boolean
get() = delegate.requiresPosition
override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
lookups.putValue(LookupSymbol(name, scopeFqName), filePath)
delegate.record(filePath, position, scopeFqName, scopeKind, name)
}
}
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+7 -5
View File
@@ -17,11 +17,10 @@
package org.jetbrains.kotlin.jps.build
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.kotlin.incremental.components.LocationInfo
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.incremental.components.Position
import org.jetbrains.kotlin.incremental.components.ScopeKind
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.join
import java.io.File
import java.util.*
@@ -120,9 +119,12 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest(
class TestLookupTracker : LookupTracker {
val lookups = arrayListOf<LookupInfo>()
override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) {
val (line, column) = locationInfo.position
lookups.add(LookupInfo(locationInfo.filePath, line, column, scopeFqName, scopeKind, name))
override val requiresPosition: Boolean
get() = true
override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
val (line, column) = position
lookups.add(LookupInfo(filePath, line, column, scopeFqName, scopeKind, name))
}
data class LookupInfo(