viartemev#201 ignore whitespaces

impl
ikopysov · Sep 28, 2019 · 1aee2e5 · 1aee2e5
1 parent 4eb2be3
commit 1aee2e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/kotlin/com/viartemev/requestmapper/RequestMappingContributor.kt b/src/main/kotlin/com/viartemev/requestmapper/RequestMappingContributor.kt
@@ -21,8 +21,9 @@ class RequestMappingContributor(private val annotationSearcher: (string: String,
     }
 
     override fun getItemsByName(name: String, pattern: String, project: Project, includeNonProjectItems: Boolean): Array<NavigationItem> {
+        val normalizedName = name.replace("\\s+".toRegex(), " ").trim()
         return navigationItems
-            .filter { it.name == name }
+            .filter { it.name == normalizedName }
             .toTypedArray()
     }
 

diff --git a/src/main/kotlin/com/viartemev/requestmapper/RequestMappingModel.kt b/src/main/kotlin/com/viartemev/requestmapper/RequestMappingModel.kt
@@ -35,15 +35,16 @@ class RequestMappingModel(project: Project) : FilteringGotoByModel<FileType>(pro
     override fun willOpenEditor(): Boolean = false
 
     override fun matches(popupItem: String, userPattern: String): Boolean {
-        return if (userPattern == "/") {
+        val normalizedUserPattern = userPattern.replace("\\s+".toRegex(), " ").trim()
+        return if (normalizedUserPattern == "/") {
             true
-        } else if (!userPattern.contains('/')) {
+        } else if (!normalizedUserPattern.contains('/')) {
             val (method, path) = popupItem.split(" ", limit = 2)
-            path.contains(userPattern) || method.contains(userPattern, ignoreCase = true)
+            path.contains(normalizedUserPattern) || method.contains(normalizedUserPattern, ignoreCase = true)
         } else {
             Path.isSubpathOf(
                 PopupPath(popupItem).toPath(),
-                RequestedUserPath(userPattern).toPath()
+                RequestedUserPath(normalizedUserPattern).toPath()
             )
         }
     }