✨ Support Inline Conditions.

Author: johnmai-dev

.DS_Store

@@ -6,6 +6,10 @@
 
 ## [1.2.1] - 2023-07-19
 
+### Added
+
+- Support Inline Conditions.
+
 ### Fixed
 
 - Fix GoFrame ORM unsupported syntax.

CHANGELOG.md

@@ -12,11 +12,13 @@ type User struct {
 	Age    int32   // 年龄
 }
 
-func main() {
+func test1() (user *User) {
 	g.Model(&User{}).Where("id = ?")
-}
 
-func test1() (user *User) {
+	g.Model(&User{}).Where("id = ? and user_name = ? OR email != ?")
+
+	g.DB().Model(&User{}).Where("id = ? and")
+
 	g.Model(&user).Where("id = ?", 1)
 
 	g.Model(&User{}).Where(g.Map{"user_name": 1, "name": "john"})

example/goframe/main.go

@@ -79,3 +79,9 @@ func test6(db *gorm.DB) (user *User) {
 	query.Find(&user)
 	return
 }
+
+func test7(db *gorm.DB) (user *User) {
+	query := db.Where("id = ? and email != ? OR user_name = ?", "")
+	query.Find(&user)
+	return
+}

example/gorm/main.go

@@ -29,6 +29,10 @@ public interface Types {
             "%s BETWEEN ? AND ?",
             "%s NOT BETWEEN ? AND ?"
     );
+
+    List<String> LOGICAL_OPERATOR_EXPR = List.of("AND", "OR", "XOR", "NOT");
+    List<String> USE_LOGICAL_OPERATOR_SCENE = List.of(" ?", " IS NULL", " IS NOT NULL");
+
     String MODEL_ANNOTATION = "@Model";
     Pattern MODEL_ANNOTATION_PATTERN = Pattern.compile(MODEL_ANNOTATION + "\\((.*?)\\)");
     String TABLE_ANNOTATION = "@Table";

src/main/java/com/github/maiqingqiang/goormhelper/Types.java

@@ -14,7 +14,6 @@
 import com.intellij.codeInsight.completion.CompletionParameters;
 import com.intellij.codeInsight.completion.CompletionProvider;
 import com.intellij.codeInsight.completion.CompletionResultSet;
-import com.intellij.codeInsight.completion.CompletionUtil;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -26,6 +25,7 @@
 import com.intellij.psi.ResolveState;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ProcessingContext;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -40,7 +40,6 @@ public abstract class ORMCompletionProvider extends CompletionProvider<Completio
     private static final Logger LOG = Logger.getInstance(ORMCompletionProvider.class);
 
     protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) {
-
         PsiElement currentElement = parameters.getPosition();
 
         LOG.info("currentElement: " + currentElement + " text: " + currentElement.getText());
@@ -59,6 +58,37 @@ protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull
         if (!ORMPsiTreeUtil.callHasArgumentAtIndex(goCallExpr, argumentIndex, currentElement.getParent()) && !(currentElement.getParent().getParent() instanceof GoKey))
             return;
 
+        String prefix = result.getPrefixMatcher().getPrefix();
+        int lastSpace = prefix.lastIndexOf(' ');
+        if (lastSpace >= 0 && lastSpace < prefix.length() - 1) {
+            String previous = prefix.substring(0, lastSpace);
+            LOG.info("previous: " + previous + "origin prefix: " + prefix);
+
+            prefix = prefix.substring(lastSpace + 1);
+            LOG.info("new prefix: " + prefix);
+
+            result = result.withPrefixMatcher(prefix);
+
+            if (StringUtils.containsAnyIgnoreCase(previous, Types.USE_LOGICAL_OPERATOR_SCENE.toArray(new CharSequence[]{}))) {
+                for (String s : Types.LOGICAL_OPERATOR_EXPR) {
+                    if (StringUtils.containsIgnoreCase(s, prefix)) {
+                        result.addElement(LookupElementBuilder
+                                .create(s)
+                                .withPresentableText(s)
+                                .withIcon(getIcon()));
+
+                        String lowerCase = s.toLowerCase();
+
+                        result.addElement(LookupElementBuilder
+                                .create(lowerCase)
+                                .withPresentableText(lowerCase)
+                                .withIcon(getIcon()));
+                    }
+                }
+                return;
+            }
+        }
+
         GoCompositeElement argument = findTargetGoCompositeElement(currentElement);
 
         LOG.info("argument: " + argument);
@@ -352,20 +382,17 @@ private void scanFields(@NotNull CompletionParameters parameters, GoCallableDesc
                     comment = GoDocumentationProvider.getCommentText(GoDocumentationProvider.getCommentsForElement(field), false);
                 }
 
-                GoStringLiteral goStringLiteral = (GoStringLiteral) parameters.getPosition().getParent();
-                String currentString = goStringLiteral.getDecodedText().replace(CompletionUtil.DUMMY_IDENTIFIER, "");
-
-                if (column != null && !column.contains(currentString.trim())) continue;
+                if (column != null && !column.contains(result.getPrefixMatcher().getPrefix())) continue;
 
-                addElement(parameters, result, column, comment, type, goTypeSpec);
+                addElement(result, column, comment, type, goTypeSpec);
 
                 if (!(parameters.getPosition().getParent().getParent() instanceof GoKey)) {
                     Map<GoCallableDescriptor, List<String>> queryExpr = queryExpr();
                     if (queryExpr != null) {
                         List<String> whereExpr = queryExpr.get(descriptor);
                         if (whereExpr != null) {
                             for (String s : whereExpr) {
-                                addElement(parameters, result, String.format(s, column), comment, type, goTypeSpec);
+                                addElement(result, String.format(s, column), comment, type, goTypeSpec);
                             }
                         }
                     }
@@ -374,7 +401,7 @@ private void scanFields(@NotNull CompletionParameters parameters, GoCallableDesc
         }
     }
 
-    private void addElement(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet result, String column, String comment, String type, @NotNull GoTypeSpec goTypeSpec) {
+    private void addElement(@NotNull CompletionResultSet result, String column, String comment, String type, @NotNull GoTypeSpec goTypeSpec) {
         LookupElementBuilder builder = LookupElementBuilder
                 .createWithSmartPointer(column, goTypeSpec)
                 .withPresentableText(column)