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

Allow slice rewrite in trace when in IDE

Browse Source
This commit is contained in:
Valentin Kipyatkov
2017-06-01 20:06:57 +03:00
parent 61d9a6b9cd
commit 8fabb6945e
10 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
+1 -1
View File
@@ -159,7 +159,7 @@ private object KotlinResolveDataProvider {
}
val resolveSession = componentProvider.get<ResolveSession>()
val trace = DelegatingBindingTrace(resolveSession.bindingContext, "Trace for resolution of " + analyzableElement)
val trace = DelegatingBindingTrace(resolveSession.bindingContext, "Trace for resolution of " + analyzableElement, allowSliceRewrite = true)
val targetPlatform = TargetPlatformDetector.getPlatform(analyzableElement.containingKtFile)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+2 -2
View File
@@ -344,7 +344,7 @@ class ResolveElementCache(
}
}
val controlFlowTrace = DelegatingBindingTrace(trace.bindingContext, "Element control flow resolve", resolveElement)
val controlFlowTrace = DelegatingBindingTrace(trace.bindingContext, "Element control flow resolve", resolveElement, allowSliceRewrite = true)
ControlFlowInformationProvider(resolveElement, controlFlowTrace, resolveElement.languageVersionSettings).checkDeclaration()
controlFlowTrace.addOwnDataTo(trace, null, false)
@@ -595,7 +595,7 @@ class ResolveElementCache(
// All additional resolve should be done to separate trace
private fun createDelegatingTrace(resolveElement: KtElement, filter: BindingTraceFilter): BindingTrace {
return resolveSession.storageManager.createSafeTrace(
DelegatingBindingTrace(resolveSession.bindingContext, "trace to resolve element", resolveElement, filter))
DelegatingBindingTrace(resolveSession.bindingContext, "trace to resolve element", resolveElement, filter, allowSliceRewrite = true))
}
private class BodyResolveContextForLazy(