From 7cfeb15e347911d3ca1f1920a1311bf80c3d449e Mon Sep 17 00:00:00 2001
From: GeorgCantor <cupsman1986@gmail.com>
Date: Sun, 6 Oct 2024 15:48:51 +0300
Subject: [PATCH] Update AndroidGradleModuleUtils.kt

---
 .../idea/npw/project/AndroidGradleModuleUtils.kt      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/android-npw/src/com/android/tools/idea/npw/project/AndroidGradleModuleUtils.kt b/android-npw/src/com/android/tools/idea/npw/project/AndroidGradleModuleUtils.kt
index 472541c205dc..213fa9c6faa5 100644
--- a/android-npw/src/com/android/tools/idea/npw/project/AndroidGradleModuleUtils.kt
+++ b/android-npw/src/com/android/tools/idea/npw/project/AndroidGradleModuleUtils.kt
@@ -48,12 +48,9 @@ fun NamedModuleTemplate.getSourceProvider() = SourceProviderAdapter(name, paths)
  * If the file is not contained by any project then return null
  */
 fun getContainingModule(file: File?, project: Project): Module? {
-  if (project.isDisposed) return null
-  val vFile = VfsUtil.findFileByIoFile(file!!, false)
-  return if (vFile == null || vFile.isDirectory)
-    null
-  else
-    ProjectFileIndex.getInstance(project).getModuleForFile(vFile, false)
+  if (project.isDisposed || file == null) return null
+  val vFile = VfsUtil.findFileByIoFile(file, false) ?: return null
+  return if (vFile.isDirectory) null else ProjectFileIndex.getInstance(project).getModuleForFile(vFile, false)
 }
 
 /**
@@ -88,4 +85,4 @@ fun determineVersionCatalogUse(project: Project): Boolean {
 }
 
 // TODO(b/322863175): Establish process/tests to ensure the default version gets updated.
-const val DEFAULT_KOTLIN_VERSION_FOR_NEW_PROJECTS = "1.9.24"
\ No newline at end of file
+const val DEFAULT_KOTLIN_VERSION_FOR_NEW_PROJECTS = "1.9.24"