Clean up

MituuZ · Aug 25, 2024 · 2572e77 · 2572e77
1 parent a42e1ec
commit 2572e77
Showing 1 changed file with 16 additions and 24 deletions.
diff --git a/src/main/kotlin/com/mituuz/fuzzier/FuzzierFS.kt b/src/main/kotlin/com/mituuz/fuzzier/FuzzierFS.kt
@@ -133,67 +133,56 @@ class FuzzierFS : Fuzzier() {
             override fun visitClass(node: UClass): Boolean {
                 val name = node.name
                 val displayString = getTextRepresentation(node, name)
-                if (!name.isNullOrBlank() && displayString != null) {
-                    createStaticContainer(listModel, name, displayString)
-                }
+                createStaticContainer(listModel, name, displayString)
                 return super.visitClass(node)
             }
 
             override fun visitMethod(node: UMethod): Boolean {
                 val name = node.name
                 val displayString = getTextRepresentation(node, name)
-                if (name.isNotBlank() && displayString != null) {
-                    createStaticContainer(listModel, name, displayString)
-                }
+                createStaticContainer(listModel, name, displayString)
                 return super.visitMethod(node)
             }
 
             override fun visitVariable(node: UVariable): Boolean {
                 val name = node.name
                 val displayString = getTextRepresentation(node, name)
-                if (!name.isNullOrBlank() && displayString != null) {
-                    createStaticContainer(listModel, name, displayString)
-                }
+                createStaticContainer(listModel, name, displayString)
                 return super.visitVariable(node)
             }
         }
     }
 
     private fun createStaticContainer(listModel: DefaultListModel<FuzzyMatchContainer>,
-                                      name: String?, displayString: String) {
-        if (!name.isNullOrBlank()) {
-            val container = FuzzyMatchContainer(FuzzyScore(), displayString, name)
-            listModel.addElement(container)
+                                      name: String?, displayString: String?) {
+        if (name.isNullOrBlank() || displayString == null) {
+            return
         }
+        val container = FuzzyMatchContainer(FuzzyScore(), displayString, name)
+        listModel.addElement(container)
     }
 
     private fun getVisitor(listModel: DefaultListModel<FuzzyMatchContainer>,
                            searchString: String = ""): AbstractUastVisitor {
         return object : AbstractUastVisitor() {
             override fun visitClass(node: UClass): Boolean {
                 val name = node.name
-                if (!name.isNullOrBlank()) {
-                    val displayString = getTextRepresentation(node, name)
-                    if (displayString != null) createContainer(listModel, searchString, displayString, name)
-                }
+                val displayString = getTextRepresentation(node, name)
+                createContainer(listModel, searchString, displayString, name)
                 return super.visitClass(node)
             }
 
             override fun visitMethod(node: UMethod): Boolean {
                 val name = node.name
                 val displayString = getTextRepresentation(node, name)
-                if (name.isNotBlank() && displayString != null) {
-                    createContainer(listModel, searchString, displayString, name)
-                }
+                createContainer(listModel, searchString, displayString, name)
                 return super.visitMethod(node)
             }
 
             override fun visitVariable(node: UVariable): Boolean {
                 val name = node.name
                 val displayString = getTextRepresentation(node, name)
-                if (!name.isNullOrBlank() && displayString != null) {
-                    createContainer(listModel, searchString, displayString, name)
-                }
+                createContainer(listModel, searchString, displayString, name)
                 return super.visitVariable(node)
             }
         }
@@ -234,7 +223,10 @@ class FuzzierFS : Fuzzier() {
     }
 
     private fun createContainer(listModel: DefaultListModel<FuzzyMatchContainer>, searchString: String,
-                                displayString: String, name: String) {
+                                displayString: String?, name: String?) {
+        if (name.isNullOrBlank() || displayString == null) {
+            return;
+        }
         val scoreCalculator = ScoreCalculator(searchString)
         val fs = scoreCalculator.calculateScore(name)
         if (fs != null) {