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

Minor: rename KotlinEvaluateExpressionCache

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2016-01-25 15:06:48 +03:00
parent ccd22cd5ca
commit b5b2bbc9ab
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+2 -2
View File
@@ -255,8 +255,8 @@
<projectService serviceInterface="org.jetbrains.kotlin.asJava.KtLightClassForFacade$FacadeStubCache" <projectService serviceInterface="org.jetbrains.kotlin.asJava.KtLightClassForFacade$FacadeStubCache"
serviceImplementation="org.jetbrains.kotlin.asJava.KtLightClassForFacade$FacadeStubCache"/> serviceImplementation="org.jetbrains.kotlin.asJava.KtLightClassForFacade$FacadeStubCache"/>
<projectService serviceInterface="org.jetbrains.kotlin.idea.debugger.evaluate.KotlinEvaluateExpressionCache" <projectService serviceInterface="org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches"
serviceImplementation="org.jetbrains.kotlin.idea.debugger.evaluate.KotlinEvaluateExpressionCache"/> serviceImplementation="org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches"/>
<projectService serviceInterface="org.jetbrains.kotlin.idea.debugger.KotlinPositionManagerCache" <projectService serviceInterface="org.jetbrains.kotlin.idea.debugger.KotlinPositionManagerCache"
serviceImplementation="org.jetbrains.kotlin.idea.debugger.KotlinPositionManagerCache"/> serviceImplementation="org.jetbrains.kotlin.idea.debugger.KotlinPositionManagerCache"/>
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt → idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinDebuggerCaches.kt
+3 -3
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import java.util.* import java.util.*
class KotlinEvaluateExpressionCache(val project: Project) { class KotlinDebuggerCaches(private val project: Project) {
private val cachedCompiledData = CachedValuesManager.getManager(project).createCachedValue( private val cachedCompiledData = CachedValuesManager.getManager(project).createCachedValue(
{ {
@@ -42,9 +42,9 @@ class KotlinEvaluateExpressionCache(val project: Project) {
}, false) }, false)
companion object { companion object {
private val LOG = Logger.getLogger(KotlinEvaluateExpressionCache::class.java)!! private val LOG = Logger.getLogger(KotlinDebuggerCaches::class.java)!!
fun getInstance(project: Project) = ServiceManager.getService(project, KotlinEvaluateExpressionCache::class.java)!! fun getInstance(project: Project) = ServiceManager.getService(project, KotlinDebuggerCaches::class.java)!!
fun getOrCreateCompiledData( fun getOrCreateCompiledData(
codeFragment: KtCodeFragment, codeFragment: KtCodeFragment,
idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
+3 -3
View File
@@ -54,8 +54,8 @@ import org.jetbrains.kotlin.diagnostics.Severity
import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.caches.resolve.getJavaClassDescriptor import org.jetbrains.kotlin.idea.caches.resolve.getJavaClassDescriptor
import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinEvaluateExpressionCache.CompiledDataDescriptor import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches.CompiledDataDescriptor
import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinEvaluateExpressionCache.ParametersDescriptor import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinDebuggerCaches.ParametersDescriptor
import org.jetbrains.kotlin.idea.debugger.evaluate.compilingEvaluator.loadClasses import org.jetbrains.kotlin.idea.debugger.evaluate.compilingEvaluator.loadClasses
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractionResult import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractionResult
import org.jetbrains.kotlin.idea.refactoring.quoteIfNeeded import org.jetbrains.kotlin.idea.refactoring.quoteIfNeeded
@@ -129,7 +129,7 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, val sourcePosition: Sour
var isCompiledDataFromCache = true var isCompiledDataFromCache = true
try { try {
val compiledData = KotlinEvaluateExpressionCache.getOrCreateCompiledData(codeFragment, sourcePosition, context) { val compiledData = KotlinDebuggerCaches.getOrCreateCompiledData(codeFragment, sourcePosition, context) {
fragment, position -> fragment, position ->
isCompiledDataFromCache = false isCompiledDataFromCache = false
extractAndCompile(fragment, position, context) extractAndCompile(fragment, position, context)
idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt
+1 -1
View File
@@ -62,7 +62,7 @@ import java.util.*
import javax.swing.tree.TreeNode import javax.swing.tree.TreeNode
abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestBase() { abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestBase() {
private val logger = Logger.getLogger(KotlinEvaluateExpressionCache::class.java)!! private val logger = Logger.getLogger(KotlinDebuggerCaches::class.java)!!
private var appender: AppenderSkeleton? = null private var appender: AppenderSkeleton? = null