From 5652b7f52179bc61b2d59840f62c589010236a36 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 14 Aug 2014 14:52:49 +0400 Subject: [PATCH] Fix usages of javaClass property --- .../jet/plugin/libraries/AbstractDecompiledTextTest.kt | 3 +-- .../jet/plugin/libraries/InternalCompiledClassesTest.kt | 2 +- .../org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt index 4f032c548eb..bf3198307bc 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt @@ -34,8 +34,7 @@ public abstract class AbstractDecompiledTextTest() : JetLightCodeInsightFixtureT public fun doTest(path: String) { val classFile = NavigateToDecompiledLibraryTest.getClassFile("test", getTestName(false), myModule!!) val clsFileForClassFile = PsiManager.getInstance(getProject()!!).findFile(classFile) - assertNotNull(clsFileForClassFile) - assertTrue("Expecting java class file, was: " + clsFileForClassFile.javaClass, clsFileForClassFile is ClsFileImpl) + assertTrue("Expecting java class file, was: " + clsFileForClassFile!!.javaClass, clsFileForClassFile is ClsFileImpl) val decompiledPsiFile = (clsFileForClassFile as ClsFileImpl).getDecompiledPsiFile() assertNotNull(decompiledPsiFile) assertSameLinesWithFile(path.substring(0, path.length - 1) + ".expected.kt", decompiledPsiFile!!.getText()) diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt index b8655a5ae77..213469b8600 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt @@ -59,7 +59,7 @@ public class InternalCompiledClassesTest : JetLightCodeInsightFixtureTestCase() fun testTraitImplClassIsVisibleAsJavaClass() { val project = getProject()!! doTest("trait impl", isSyntheticClassOfKind(TRAIT_IMPL)) { - val psiFile = PsiManager.getInstance(project).findFile(this) + val psiFile = PsiManager.getInstance(project).findFile(this)!! Assert.assertTrue("Should not be kotlin file", psiFile !is JetClsFile) Assert.assertTrue("Should be java file, was ${psiFile.javaClass.getSimpleName()}", diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt index 1b5d82085bc..6b1d3f5fbd0 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt @@ -48,7 +48,7 @@ class HtmlKotlinVisitor: JetTreeVisitor() { if (child is PsiComment || child is PsiWhiteSpace) { // ignore } else { - println("------- Child $child of type ${child.javaClass}") + println("------- Child $child of type ${child?.javaClass}") } child?.accept(this) }