From 0640a89000a6cc62bfbb01ca861a31a2fc9babed Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 31 Jan 2019 20:34:25 +0100
Subject: [PATCH] IDEA-CR-42742 cleanup

---
 .../NonDefaultConstructorInspection.kt        |  3 +-
 .../devkit-core/src/util/ExtensionLocator.kt  | 30 ++++---------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/plugins/devkit/devkit-core/src/inspections/NonDefaultConstructorInspection.kt b/plugins/devkit/devkit-core/src/inspections/NonDefaultConstructorInspection.kt
index 96f7ceafb0ba..f47f55372d27 100644
--- a/plugins/devkit/devkit-core/src/inspections/NonDefaultConstructorInspection.kt
+++ b/plugins/devkit/devkit-core/src/inspections/NonDefaultConstructorInspection.kt
@@ -41,7 +41,8 @@ internal class NonDefaultConstructorInspection : DevKitUastInspectionBase() {
       if (!isReferencedByExtension(aClass, manager.project)) {
         return null
       }
-    } else if (javaPsi.name == "VcsConfigurableEP") {
+    }
+    else if (javaPsi.name == "VcsConfigurableEP") {
       // VcsConfigurableEP extends ConfigurableEP but used directly, for now just ignore it as hardcoded exclusion
       return null
     }
diff --git a/plugins/devkit/devkit-core/src/util/ExtensionLocator.kt b/plugins/devkit/devkit-core/src/util/ExtensionLocator.kt
index 2f03f07dd354..8cd9f3a79235 100644
--- a/plugins/devkit/devkit-core/src/util/ExtensionLocator.kt
+++ b/plugins/devkit/devkit-core/src/util/ExtensionLocator.kt
@@ -64,34 +64,16 @@ private fun findExtensionsByClassName(project: Project, className: String): List
 
 internal inline fun processExtensionsByClassName(project: Project, className: String, crossinline processor: (XmlTag, ExtensionPoint) -> Boolean) {
   processExtensionDeclarations(className, project, true) { extension, tag ->
-    val point = extension.extensionPoint
-    if (point == null) {
-      true
-    }
-    else {
-      processor(tag, point)
-    }
+    extension.extensionPoint?.let { processor(tag, it) } ?: true
   }
 }
 
-internal class ExtensionByExtensionPointLocator : ExtensionLocator {
-  private val project: Project
-  private val pointQualifiedName: String
-  private val extensionId: String?
+internal class ExtensionByExtensionPointLocator(private val project: Project,
+                                                extensionPoint: ExtensionPoint,
+                                                private val extensionId: String?) : ExtensionLocator() {
+  private val pointQualifiedName = extensionPoint.effectiveQualifiedName
 
-  constructor(project: Project, extensionPoint: ExtensionPoint, extensionId: String?) {
-    this.project = project
-    pointQualifiedName = extensionPoint.effectiveQualifiedName
-    this.extensionId = extensionId
-  }
-
-  constructor(project: Project, pointQualifiedName: String, extensionId: String? = null) {
-    this.project = project
-    this.pointQualifiedName = pointQualifiedName
-    this.extensionId = extensionId
-  }
-
-   fun processCandidates(processor: (XmlTag) -> Boolean) {
+  private fun processCandidates(processor: (XmlTag) -> Boolean) {
     // We must search for the last part of EP name, because for instance 'com.intellij.console.folding' extension
     // may be declared as <extensions defaultExtensionNs="com"><intellij.console.folding ...
     val epNameToSearch = if (pointQualifiedName == "com.intellij.compiler.task") "compiler.task" else StringUtil.substringAfterLast(pointQualifiedName, ".") ?: return