🐛 Fix matching USE_LOGICAL_OPERATOR_SCENE

johnmai-dev · Jul 22, 2023 · d6d39a0 · d6d39a0
1 parent 0bab2d5
commit d6d39a0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ## [Unreleased]
 
-## [1.2.1] - 2023-07-19
+## [1.2.1] - 2023-07-22
 
 ### Added
 

diff --git a/src/main/java/com/github/maiqingqiang/goormhelper/orm/ORMCompletionProvider.java b/src/main/java/com/github/maiqingqiang/goormhelper/orm/ORMCompletionProvider.java
@@ -69,7 +69,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
 
             result = result.withPrefixMatcher(prefix);
 
-            if (StringUtils.containsAnyIgnoreCase(previous, Types.USE_LOGICAL_OPERATOR_SCENE.toArray(new CharSequence[]{}))) {
+            if (Strings.endsWithIgnoreCaseAny(previous, Types.USE_LOGICAL_OPERATOR_SCENE.toArray(new CharSequence[]{}))) {
                 for (String s : Types.LOGICAL_OPERATOR_EXPR) {
                     if (StringUtils.containsIgnoreCase(s, prefix)) {
                         result.addElement(LookupElementBuilder

diff --git a/src/main/java/com/github/maiqingqiang/goormhelper/utils/Strings.java b/src/main/java/com/github/maiqingqiang/goormhelper/utils/Strings.java
@@ -1,5 +1,8 @@
 package com.github.maiqingqiang.goormhelper.utils;
 
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Map;
 
 public class Strings {
@@ -66,4 +69,14 @@ public static String clearSingleQuotn(String s) {
         return s;
     }
 
+    public static boolean endsWithIgnoreCaseAny(CharSequence sequence, CharSequence... searchStrings) {
+        if (!StringUtils.isEmpty(sequence) && !ArrayUtils.isEmpty(searchStrings)) {
+            for (CharSequence searchString : searchStrings) {
+                if (StringUtils.endsWithIgnoreCase(sequence, searchString)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }