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

Fixed JetLanguage + used better api

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-07 18:15:38 +03:00
parent 9d51e8e0e6
commit cb24d3df1a
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt
+3 -9
View File
@@ -23,10 +23,9 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiWhiteSpace
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.idea.JetLanguage import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources
import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.psiUtil.allChildren import org.jetbrains.kotlin.psi.psiUtil.allChildren
@@ -55,7 +54,7 @@ abstract class AbstractParameterInfoTest : LightCodeInsightFixtureTestCase() {
val context = ShowParameterInfoContext(editor, project, file, editor.caretModel.offset, -1) val context = ShowParameterInfoContext(editor, project, file, editor.caretModel.offset, -1)
val handlers = ShowParameterInfoHandler.getHandlers(project, JetLanguage.INSTANCE)!! val handlers = ShowParameterInfoHandler.getHandlers(project, KotlinLanguage.INSTANCE)!!
val handler = handlers.firstOrNull { it.findElementForParameterInfo(context) != null } val handler = handlers.firstOrNull { it.findElementForParameterInfo(context) != null }
?: error("Could not find parameter info handler") ?: error("Could not find parameter info handler")
@@ -64,12 +63,7 @@ abstract class AbstractParameterInfoTest : LightCodeInsightFixtureTestCase() {
val textToType = InTextDirectivesUtils.findStringWithPrefixes(file.text, "// TYPE:") val textToType = InTextDirectivesUtils.findStringWithPrefixes(file.text, "// TYPE:")
if (textToType != null) { if (textToType != null) {
project.executeWriteCommand("") { myFixture.type(textToType)
val caretModel = myFixture.editor.caretModel
val offset = caretModel.offset
myFixture.getDocument(file).insertString(offset, textToType)
caretModel.moveToOffset(offset + textToType.length())
}
PsiDocumentManager.getInstance(project).commitAllDocuments() PsiDocumentManager.getInstance(project).commitAllDocuments()
} }