From 6352814d452c4cf0b2e9ec13f1e990db67ec7fe8 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Tue, 16 Feb 2021 13:28:58 +0100
Subject: [PATCH] Fix NPE

#KTIJ-898 Fixed

Original commit: 12d8e88b846f29598ca3904b49996bd6a9891ccd
---
 .../gradle/importing/KotlinDslScriptModelProcessor.kt     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt
index ad23a5c757c..d0638edeb62 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt
@@ -88,7 +88,7 @@ private fun Collection<KotlinDslScriptModel>.collectErrors(): List<KotlinDslScri
 }
 
 private fun KotlinDslScriptsModel.toListOfScriptModels(project: Project): List<KotlinDslScriptModel> =
-    scriptModels.map { (file, model) ->
+    scriptModels.mapNotNull { (file, model) ->
         val messages = mutableListOf<KotlinDslScriptModel.Message>()
 
         model.exceptions.forEach {
@@ -120,13 +120,13 @@ private fun KotlinDslScriptsModel.toListOfScriptModels(project: Project): List<K
             )
         }
 
-        // TODO: NPE
-        val virtualFile = VfsUtil.findFile(file.toPath(), true)!!
+        val virtualFile = VfsUtil.findFile(file.toPath(), true) ?: return@mapNotNull null
 
         // todo(KT-34440): take inputs snapshot before starting import
+        val gradleScriptInputsStamp = getGradleScriptInputsStamp(project, virtualFile) ?: return@mapNotNull null
         KotlinDslScriptModel(
             toSystemIndependentName(file.absolutePath),
-            getGradleScriptInputsStamp(project, virtualFile)!!, // TODO: NPE
+            gradleScriptInputsStamp,
             model.classPath.map { toSystemIndependentName(it.absolutePath) },
             model.sourcePath.map { toSystemIndependentName(it.absolutePath) },
             model.implicitImports,