Fix the predicate matching

Author: 0nko

wordpress-shortcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/extensions/CaptionExtensions.kt

@@ -45,11 +45,12 @@ fun AztecText.removeImageCaption(attributePredicate: AztecText.AttributePredicat
 
 fun AztecText.hasImageCaption(attributePredicate: AztecText.AttributePredicate): Boolean {
     this.text.getSpans(0, this.text.length, AztecImageSpan::class.java)
-        .firstOrNull {
-            val wrapper = SpanWrapper<AztecImageSpan>(text, it)
-            return text.getSpans(wrapper.start, wrapper.end, CaptionShortcodeSpan::class.java)
-                    .map { span -> span as CaptionShortcodeSpan }
-                    .any { span -> attributePredicate.matches(span.attributes) }
+            .firstOrNull {
+                attributePredicate.matches(it.attributes)
+            }
+            ?.let {
+                val wrapper = SpanWrapper(text, it)
+                return text.getSpans(wrapper.start, wrapper.end, CaptionShortcodeSpan::class.java).isNotEmpty()
         }
 
     return false