Skip to content

Commit d6d39a0

Browse files
committed
🐛 Fix matching USE_LOGICAL_OPERATOR_SCENE
1 parent 0bab2d5 commit d6d39a0

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## [Unreleased]
66

7-
## [1.2.1] - 2023-07-19
7+
## [1.2.1] - 2023-07-22
88

99
### Added
1010

src/main/java/com/github/maiqingqiang/goormhelper/orm/ORMCompletionProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
6969

7070
result = result.withPrefixMatcher(prefix);
7171

72-
if (StringUtils.containsAnyIgnoreCase(previous, Types.USE_LOGICAL_OPERATOR_SCENE.toArray(new CharSequence[]{}))) {
72+
if (Strings.endsWithIgnoreCaseAny(previous, Types.USE_LOGICAL_OPERATOR_SCENE.toArray(new CharSequence[]{}))) {
7373
for (String s : Types.LOGICAL_OPERATOR_EXPR) {
7474
if (StringUtils.containsIgnoreCase(s, prefix)) {
7575
result.addElement(LookupElementBuilder

src/main/java/com/github/maiqingqiang/goormhelper/utils/Strings.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.github.maiqingqiang.goormhelper.utils;
22

3+
import org.apache.commons.lang3.ArrayUtils;
4+
import org.apache.commons.lang3.StringUtils;
5+
36
import java.util.Map;
47

58
public class Strings {
@@ -66,4 +69,14 @@ public static String clearSingleQuotn(String s) {
6669
return s;
6770
}
6871

72+
public static boolean endsWithIgnoreCaseAny(CharSequence sequence, CharSequence... searchStrings) {
73+
if (!StringUtils.isEmpty(sequence) && !ArrayUtils.isEmpty(searchStrings)) {
74+
for (CharSequence searchString : searchStrings) {
75+
if (StringUtils.endsWithIgnoreCase(sequence, searchString)) {
76+
return true;
77+
}
78+
}
79+
}
80+
return false;
81+
}
6982
}

0 commit comments

Comments
 (0)