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

Remove interface for JetExpressionCodeFragment

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-04-24 17:15:27 +04:00
parent 429be58685
commit eb8b5c0823
6 changed files with 10 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/debugger/KotlinEditorTextProvider.kt
+2 -2
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.psi.JetThisExpression
import org.jetbrains.jet.lang.psi.JetSimpleNameExpression
import org.jetbrains.jet.lang.psi.JetOperationExpression
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lang.psi.JetExpressionCodeFragmentImpl
import org.jetbrains.jet.lang.psi.JetExpressionCodeFragment
import org.jetbrains.jet.lang.psi.JetSuperExpression
class KotlinEditorTextProvider : EditorTextProvider {
@@ -55,7 +55,7 @@ class KotlinEditorTextProvider : EditorTextProvider {
return containingFile.getImportList()?.getImports()
?.map { it.getText() }
?.makeString(JetExpressionCodeFragmentImpl.IMPORT_SEPARATOR) ?: ""
?.makeString(JetExpressionCodeFragment.IMPORT_SEPARATOR) ?: ""
}
fun findExpressionInner(element: PsiElement): JetExpression? {
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt
+2 -2
View File
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement
import com.intellij.openapi.project.Project
import com.intellij.psi.JavaCodeFragment
import org.jetbrains.jet.plugin.JetFileType
import org.jetbrains.jet.lang.psi.JetExpressionCodeFragmentImpl
import org.jetbrains.jet.lang.psi.JetExpressionCodeFragment
import com.intellij.psi.PsiCodeBlock
import com.intellij.debugger.engine.evaluation.CodeFragmentKind
import com.intellij.psi.JavaCodeFragmentFactory
@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.psi.JetExpression
class KotlinCodeFragmentFactory: CodeFragmentFactory() {
override fun createCodeFragment(item: TextWithImports, context: PsiElement?, project: Project): JavaCodeFragment {
if (item.getKind() == CodeFragmentKind.EXPRESSION) {
val codeFragment = JetExpressionCodeFragmentImpl(project, "fragment.kt", item.getText(), getContextElement(context))
val codeFragment = JetExpressionCodeFragment(project, "fragment.kt", item.getText(), getContextElement(context))
if (item.getImports().isNotEmpty()) {
codeFragment.addImportsFromString(item.getImports())
}
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
+2 -2
View File
@@ -63,7 +63,7 @@ import org.jetbrains.jet.codegen.ClassFileFactory
import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils
import org.jetbrains.jet.OutputFileCollection
import org.jetbrains.jet.lang.psi.JetExpressionCodeFragment
import org.jetbrains.jet.lang.psi.JetExpressionCodeFragmentImpl
import org.jetbrains.jet.lang.psi.JetExpressionCodeFragment
import org.jetbrains.jet.plugin.caches.resolve.getAnalysisResults
object KotlinEvaluationBuilder: EvaluatorBuilder {
@@ -222,7 +222,7 @@ private fun createFileForDebugger(codeFragment: JetExpressionCodeFragment,
): JetFile {
var fileText = template.replace("!IMPORT_LIST!",
codeFragment.importsToString()
.split(JetExpressionCodeFragmentImpl.IMPORT_SEPARATOR)
.split(JetExpressionCodeFragment.IMPORT_SEPARATOR)
.makeString("\n"))
fileText = fileText.replace("!FUNCTION!", extractedFunction.getText())