Simplify code

Author: rixafy

src/main/kotlin/org/nette/helpers/utils/MethodUtil.kt

@@ -4,45 +4,45 @@ import com.jetbrains.php.lang.psi.elements.Method
 import java.util.Locale.getDefault
 
 fun Method.asControlName(): String {
-    if (!this.name.startsWith("createComponent") || this.name == "createComponent") {
+    if (!isControl()) {
         throw IllegalStateException("Method is not a control")
     }
 
-    return this.name.removePrefix("createComponent").replaceFirstChar { it.lowercase(getDefault()) }
+    return name.removePrefix("createComponent").replaceFirstChar { it.lowercase(getDefault()) }
 }
 
 fun Method.isAnyPresenterMethod(): Boolean {
     return isControl() || isAction() || isRender() || isSignal() || isStartup() || isBeforeRender() || isAfterRender() || isShutdown()
 }
 
 fun Method.isControl(): Boolean {
-    return this.name.startsWith("createComponent") && this.name != "createComponent"
+    return name.startsWith("createComponent") && name != "createComponent"
 }
 
 fun Method.isAction(): Boolean {
-    return this.name.startsWith("action") && this.name != "action"
+    return name.startsWith("action") && name != "action"
 }
 
 fun Method.isRender(): Boolean {
-    return this.name.startsWith("render") && this.name != "render"
+    return name.startsWith("render") && name != "render"
+}
+
+fun Method.isSignal(): Boolean {
+    return name.startsWith("handle") && name != "handle"
 }
 
 fun Method.isStartup(): Boolean {
-    return this.name == "startup"
+    return name == "startup"
 }
 
 fun Method.isBeforeRender(): Boolean {
-    return this.name == "beforeRender"
+    return name == "beforeRender"
 }
 
 fun Method.isAfterRender(): Boolean {
-    return this.name == "afterRender"
+    return name == "afterRender"
 }
 
 fun Method.isShutdown(): Boolean {
-    return this.name == "shutdown"
-}
-
-fun Method.isSignal(): Boolean {
-    return this.name.startsWith("handle") && this.name != "handle"
+    return name == "shutdown"
 }

src/main/kotlin/org/nette/helpers/utils/PhpClassUtil.kt

@@ -3,7 +3,7 @@ package org.nette.helpers.utils
 import com.jetbrains.php.lang.psi.elements.*
 
 fun PhpClass.isComponent(): Boolean {
-    return this.isInstanceOf("\\Nette\\Application\\UI\\Component")
+    return isInstanceOf("\\Nette\\Application\\UI\\Component")
 }
 
 fun PhpClass.isInstanceOf(fqn: String): Boolean {
@@ -25,7 +25,5 @@ fun PhpClass.isInstanceOf(fqn: String): Boolean {
 }
 
 fun PhpClass.getControls(): List<Method> {
-    return this.methods.filter {
-        it.name.startsWith("createComponent") && it.name != "createComponent"
-    }
+    return methods.filter { it.isControl() }
 }

src/main/kotlin/org/nette/helpers/utils/PsiUtil.kt

@@ -11,26 +11,26 @@ import com.jetbrains.php.lang.psi.elements.Variable
 
 fun PsiElement.resolvePhpClasses(): List<PhpClass> {
     // $this -> containing class
-    if (this is Variable && this.name == "this") {
+    if (this is Variable && name == "this") {
         PsiTreeUtil.getParentOfType(this, PhpClass::class.java)?.let { return listOf(it) }
     }
 
     // Direct resolves
     if (this is ClassReference) {
-        val resolved = this.resolve()
+        val resolved = resolve()
         if (resolved is PhpClass) return listOf(resolved)
     }
 
     if (this is NewExpression) {
-        val resolved = this.classReference?.resolve()
+        val resolved = classReference?.resolve()
         if (resolved is PhpClass) return listOf(resolved)
     }
 
     if (this is PhpClass) return listOf(this)
 
     // Resolve via type information
     val typed = this as? PhpTypedElement ?: return emptyList()
-    val project = this.project
+    val project = project
     val index = PhpIndex.getInstance(project)
     val completed = index.completeType(project, typed.type, null)