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

Fixed compilation error for IDEA 14.1+ (140 branch)

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2015-01-29 20:59:35 +03:00
committed by Nikolay Krasko
parent 042230fefc
commit f870388962
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt
+2 -5
View File
@@ -32,9 +32,6 @@ class FoldingAfterOptimizeImportsTest : AbstractKotlinFoldingTest() {
private val fixture: JavaCodeInsightTestFixture private val fixture: JavaCodeInsightTestFixture
get() = myFixture!! get() = myFixture!!
private val editor: Editor
get() = fixture.getEditor()!!
private val fileText: String private val fileText: String
get() = fixture.getFile()!!.getText()!! get() = fixture.getFile()!!.getText()!!
@@ -51,7 +48,7 @@ class FoldingAfterOptimizeImportsTest : AbstractKotlinFoldingTest() {
doTestWithSettings(fileText) { doTestWithSettings(fileText) {
fileText -> fileText ->
CodeFoldingManager.getInstance(fixture.getProject())!!.buildInitialFoldings(editor) CodeFoldingManager.getInstance(fixture.getProject())!!.buildInitialFoldings(getEditor())
getFoldingRegion(0).checkRegion(false, findStringWithPrefixes("// REGION BEFORE: ")) getFoldingRegion(0).checkRegion(false, findStringWithPrefixes("// REGION BEFORE: "))
CommandProcessor.getInstance()?.executeCommand(fixture.getProject(), CommandProcessor.getInstance()?.executeCommand(fixture.getProject(),
@@ -65,7 +62,7 @@ class FoldingAfterOptimizeImportsTest : AbstractKotlinFoldingTest() {
private fun getFoldingRegion(number: Int): FoldRegion { private fun getFoldingRegion(number: Int): FoldRegion {
fixture.doHighlighting() fixture.doHighlighting()
val model = editor.getFoldingModel() val model = getEditor().getFoldingModel()
val foldingRegions = model.getAllFoldRegions() val foldingRegions = model.getAllFoldRegions()
assert(foldingRegions.size >= number) { "There is no enough folding regions in file: in file - ${foldingRegions.size} , expected = ${number}" } assert(foldingRegions.size >= number) { "There is no enough folding regions in file: in file - ${foldingRegions.size} , expected = ${number}" }
return foldingRegions[number] return foldingRegions[number]