From ec7d294fcc9c8876d4b83639079bded9750e436e Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Fri, 26 Sep 2014 17:03:04 +0400
Subject: [PATCH] Minor: remove some redundant not null assertions from Kotlin
 code

---
 .../codeInsight/KotlinShortenReferencesRefactoringHelper.kt   | 4 ++--
 .../conversion/copy/ConvertJavaCopyPastePostProcessor.kt      | 4 ++--
 .../jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt    | 4 ++--
 .../jet/plugin/versions/KotlinUpdatePluginComponent.kt        | 4 ++--
 j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinShortenReferencesRefactoringHelper.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinShortenReferencesRefactoringHelper.kt
index 3a33384a8f1..5336fc971bd 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinShortenReferencesRefactoringHelper.kt
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinShortenReferencesRefactoringHelper.kt
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.psi.JetQualifiedExpression
 import org.jetbrains.jet.lang.psi.JetUserType
 
 public class KotlinShortenReferencesRefactoringHelper: RefactoringHelper<Any> {
-    private val LOG = Logger.getInstance(javaClass<KotlinShortenReferencesRefactoringHelper>().getCanonicalName())!!
+    private val LOG = Logger.getInstance(javaClass<KotlinShortenReferencesRefactoringHelper>().getCanonicalName())
 
     override fun prepareOperation(usages: Array<out UsageInfo>?): Any? {
         if (usages != null && usages.isNotEmpty()) {
@@ -74,5 +74,5 @@ private fun Project.clearElementsToShorten() {
 public fun JetElement.addToShorteningWaitSet() {
     assert (ApplicationManager.getApplication()!!.isWriteAccessAllowed(), "Write access needed")
     val project = getProject()
-    project.getElementsToShorten(true)!!.add(SmartPointerManager.getInstance(project)!!.createSmartPsiElementPointer(this))
+    project.getElementsToShorten(true)!!.add(SmartPointerManager.getInstance(project).createSmartPsiElementPointer(this))
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
index e82a0e19921..a64441f38e4 100644
--- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
+++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
@@ -51,7 +51,7 @@ public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBl
     public override fun collectTransferableData(file: PsiFile, editor: Editor, startOffsets: IntArray, endOffsets: IntArray): List<TextBlockTransferableData> {
         if (file !is PsiJavaFile) return listOf()
 
-        val lightFile = PsiFileFactory.getInstance(file.getProject())!!.createFileFromText(file.getText()!!, file)
+        val lightFile = PsiFileFactory.getInstance(file.getProject()).createFileFromText(file.getText()!!, file)
         return listOf(CopiedCode(lightFile as? PsiJavaFile, startOffsets, endOffsets))
     }
 
@@ -172,6 +172,6 @@ public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBl
     }
 
     class object {
-        private val LOG = Logger.getInstance("#org.jetbrains.jet.plugin.conversion.copy.ConvertJavaCopyPastePostProcessor")!!
+        private val LOG = Logger.getInstance("#org.jetbrains.jet.plugin.conversion.copy.ConvertJavaCopyPastePostProcessor")
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt
index e0a37e5b0f2..09a4bade1ce 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt
@@ -110,14 +110,14 @@ fun createKotlinFile(fileName: String, targetDir: PsiDirectory): JetFile {
     val packageName = targetDir.getPackage()?.getQualifiedName()
 
     targetDir.checkCreateFile(fileName)
-    val file = PsiFileFactory.getInstance(targetDir.getProject())!!.createFileFromText(
+    val file = PsiFileFactory.getInstance(targetDir.getProject()).createFileFromText(
             fileName, JetFileType.INSTANCE, if (packageName != null) "package $packageName \n\n" else ""
     )
 
     return targetDir.add(file) as JetFile
 }
 
-public fun File.toVirtualFile(): VirtualFile? = LocalFileSystem.getInstance()!!.findFileByIoFile(this)
+public fun File.toVirtualFile(): VirtualFile? = LocalFileSystem.getInstance().findFileByIoFile(this)
 
 public fun File.toPsiFile(project: Project): PsiFile? {
     return toVirtualFile()?.let { vfile -> PsiManager.getInstance(project).findFile(vfile) }
diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinUpdatePluginComponent.kt b/idea/src/org/jetbrains/jet/plugin/versions/KotlinUpdatePluginComponent.kt
index be0ee472abe..1080d6bd0d8 100644
--- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinUpdatePluginComponent.kt
+++ b/idea/src/org/jetbrains/jet/plugin/versions/KotlinUpdatePluginComponent.kt
@@ -57,7 +57,7 @@ class KotlinUpdatePluginComponent : ApplicationComponent {
             requestFullJarUpdate(ideaPluginPaths.getAndroidSdkAnnotationsPath())
 
             // Force update indices for files under config directory
-            val fileBasedIndex = FileBasedIndex.getInstance()!!
+            val fileBasedIndex = FileBasedIndex.getInstance()
             fileBasedIndex.requestRebuild(KotlinAbiVersionIndex.INSTANCE.getName())
             fileBasedIndex.requestRebuild(KotlinClassFileIndex.KEY)
 
@@ -73,7 +73,7 @@ class KotlinUpdatePluginComponent : ApplicationComponent {
     }
 
     private fun requestFullJarUpdate(jarFilePath: File) {
-        val localVirtualFile = LocalFileSystem.getInstance()!!.refreshAndFindFileByIoFile(jarFilePath)
+        val localVirtualFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(jarFilePath)
 
         // Build and update JarHandler
         val jarFile = JarFileSystem.getInstance()!!.getJarRootForLocalFile(localVirtualFile!!)
diff --git a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt
index 32e92aa135d..10f99da126f 100644
--- a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.kt
@@ -33,7 +33,7 @@ public object JavaToKotlinTranslator {
 
     private fun createFile(text: String): PsiFile? {
         val javaCoreEnvironment: JavaCoreProjectEnvironment? = setUpJavaCoreEnvironment()
-        return PsiFileFactory.getInstance(javaCoreEnvironment?.getProject()!!)?.createFileFromText("test.java", JavaLanguage.INSTANCE, text)
+        return PsiFileFactory.getInstance(javaCoreEnvironment?.getProject()!!).createFileFromText("test.java", JavaLanguage.INSTANCE, text)
     }
 
     fun setUpJavaCoreEnvironment(): JavaCoreProjectEnvironment {