Fixed comments

jetbrains-academy · Jul 27, 2023 · 78288e0 · 78288e0
1 parent 6b43be9
commit 78288e0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/ij/src/main/kotlin/org/jetbrains/academy/test/system/ij/analyzer/IjCodeAnalyzerUtil.kt b/ij/src/main/kotlin/org/jetbrains/academy/test/system/ij/analyzer/IjCodeAnalyzerUtil.kt
@@ -90,7 +90,7 @@ fun PsiFile.findMethodUsages(methodName: String): List<String> =
     ApplicationManager.getApplication().runReadAction<List<String>> {
         val callExpression = extractElementsOfTypes(KtCallExpression::class.java)
         callExpression.filter { it.text == methodName }.mapNotNull {
-            it.parentsOfType(KtNamedFunction::class.java).first().name
+            it.parentsOfType(KtNamedFunction::class.java).firstOrNull()?.name
         }.toList()
     }
 

diff --git a/ij/src/test/kotlin/org/jetbrains/academy/test/system/ij/formatting/BaseIjTestClassTests.kt b/ij/src/test/kotlin/org/jetbrains/academy/test/system/ij/formatting/BaseIjTestClassTests.kt
@@ -143,23 +143,28 @@ class BaseIjTestClassTests : BaseIjTestClass() {
                     return squaredX + 10
                 }
                 
-                    fun method(message: String) {
-                        println(message)
-                    }
+                fun method(message: String) {
+                    println(message)
+                }
                     
-                  fun method1(y: Int) {
-                            val actions = "Some actions"
-                        if (y > 5) {
-                            method("y is greater than 5")
-                        } else {
-                            method("y is less than 5")
-                        }
-                  }
+                fun method1(y: Int) {
+                    val actions = "Some actions"
+                    if (y > 5) {
+                        method("y is greater than 5")
+                    } else {
+                        method("y is less than 5")
+                    }
+                }
+                
+                fun method2() {
+                    method("Content")
+                    println("Content")
+                }
             }
         """.trimIndent()
         myFixture.configureByText("Task.kt", example)
         var methodName = "method(\"Content\")"
-        var methodsList = listOf("innerFunction")
+        var methodsList = listOf("innerFunction", "method2")
         assert(methodsList.equals(findMethodUsages(methodName))) {
             "Method $methodName should be called in methods: $methodsList"
         }
@@ -173,6 +178,11 @@ class BaseIjTestClassTests : BaseIjTestClass() {
         assert(methodsList.equals(findMethodUsages(methodName))) {
             "Method $methodName should be called in methods: $methodsList"
         }
+        methodName = "method(content)"
+        methodsList = listOf()
+        assert(methodsList.equals(findMethodUsages(methodName))) {
+            "Method $methodName should not be called"
+        }
     }
 
     fun testHasProperty() {