From b4cc5703de99a7c00871562e7bfdcfa4a87ff94c Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 18 Sep 2019 16:31:29 +0900 Subject: [PATCH] Minor: Reformat several IDEA debugger tests --- ...AbstractEditorForEvaluateExpressionTest.kt | 27 ++++++++++--------- .../CodeFragmentCompletionInLibraryTest.kt | 7 ++--- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index c2e46dea068..b4c55b038e3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -45,7 +45,7 @@ abstract class AbstractCodeFragmentHighlightingTest : AbstractPsiCheckerTest() { val file = myFixture.file as KtFile InTextDirectivesUtils.findListWithPrefixes(fileText, "// IMPORT: ").forEach { val descriptor = file.resolveImportReference(FqName(it)).singleOrNull() - ?: error("Could not resolve descriptor to import: $it") + ?: error("Could not resolve descriptor to import: $it") ImportInsertHelper.getInstance(project).importDescriptor(file, descriptor) } } @@ -95,10 +95,10 @@ abstract class AbstractCodeFragmentAutoImportTest : AbstractPsiCheckerTest() { myFixture.doHighlighting() val importFix = myFixture.availableIntentions.singleOrNull { it.familyName == "Import" } - ?: error("No import fix available") + ?: error("No import fix available") importFix.invoke(project, editor, file) - myFixture.checkResultByFile(filePath + ".after") + myFixture.checkResultByFile("$filePath.after") val fragment = myFixture.file as KtCodeFragment fragment.checkImports(testDataPath + File.separator + filePath) @@ -114,13 +114,12 @@ abstract class AbstractCodeFragmentAutoImportTest : AbstractPsiCheckerTest() { private fun KtCodeFragment.checkImports(testPath: String) { val importList = importsAsImportList() val importsText = StringUtil.convertLineSeparators(importList?.text ?: "") - val fragmentAfterFile = File(testPath + ".after.imports") + val fragmentAfterFile = File("$testPath.after.imports") if (fragmentAfterFile.exists()) { KotlinTestUtils.assertEqualsToFile(fragmentAfterFile, importsText) - } - else { - assertTrue(importsText.isEmpty(), "Unexpected imports found: $importsText" ) + } else { + assertTrue(importsText.isEmpty(), "Unexpected imports found: $importsText") } } @@ -132,19 +131,23 @@ private fun JavaCodeInsightTestFixture.configureByCodeFragment(filePath: String) val typeStr = InTextDirectivesUtils.findStringWithPrefixes(getFile().text, "// ${ExpectedCompletionUtils.RUNTIME_TYPE} ") if (typeStr != null) { - file.putCopyableUserData(KtCodeFragment.RUNTIME_TYPE_EVALUATOR, { - val codeFragment = KtPsiFactory(project).createBlockCodeFragment("val xxx: $typeStr", PsiTreeUtil.getParentOfType(elementAt, KtElement::class.java)) + file.putCopyableUserData(KtCodeFragment.RUNTIME_TYPE_EVALUATOR) { + val codeFragment = KtPsiFactory(project).createBlockCodeFragment( + "val xxx: $typeStr", + PsiTreeUtil.getParentOfType(elementAt, KtElement::class.java) + ) val context = codeFragment.analyzeWithContent() - val typeReference: KtTypeReference = PsiTreeUtil.getChildOfType(codeFragment.getContentElement().firstChild, KtTypeReference::class.java)!! + val typeReference: KtTypeReference = + PsiTreeUtil.getChildOfType(codeFragment.getContentElement().firstChild, KtTypeReference::class.java)!! context[BindingContext.TYPE, typeReference] - }) + } } configureFromExistingVirtualFile(file.virtualFile!!) } private fun createCodeFragment(filePath: String, contextElement: PsiElement): KtCodeFragment { - val fileForFragment = File(filePath + ".fragment") + val fileForFragment = File("$filePath.fragment") val codeFragmentText = FileUtil.loadFile(fileForFragment, true).trim() val psiFactory = KtPsiFactory(contextElement.project) if (fileForFragment.readLines().size == 1) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt index 259fd137314..2af06628a7b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt @@ -25,12 +25,13 @@ import org.jetbrains.kotlin.test.KotlinTestUtils import org.junit.runner.RunWith import java.io.File -private val LIBRARY_SRC_PATH = KotlinTestUtils.getHomeDirectory() + "/idea/idea-completion/testData/codeFragmentInLibrarySource/customLibrary/" +private val LIBRARY_SRC_PATH = + KotlinTestUtils.getHomeDirectory() + "/idea/idea-completion/testData/codeFragmentInLibrarySource/customLibrary/" @RunWith(JUnit3WithIdeaConfigurationRunner::class) class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTest() { - override fun getProjectDescriptor() = object: SdkAndMockLibraryProjectDescriptor(LIBRARY_SRC_PATH, false) { + override fun getProjectDescriptor() = object : SdkAndMockLibraryProjectDescriptor(LIBRARY_SRC_PATH, false) { override fun configureModule(module: Module, model: ModifiableRootModel) { super.configureModule(module, model) @@ -60,7 +61,7 @@ class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTest() { private fun testCompletionInLibraryCodeFragment(fragmentText: String, vararg completionDirectives: String) { setupFixtureByCodeFragment(fragmentText) - val directives = completionDirectives.map { "//$it" }.joinToString(separator = "\n") + val directives = completionDirectives.joinToString(separator = "\n") { "//$it" } testCompletion(directives, JvmPlatforms.unspecifiedJvmPlatform, { completionType, count -> myFixture.complete(completionType, count) }) }