fixed GoParamDefinition Completion

Author: johnmai-dev

src/main/java/com/github/maiqingqiang/goormhelper/actions/EditorPasteListener.java

@@ -75,14 +75,9 @@ protected void doExecute(@NotNull Editor editor, @Nullable Caret caret, DataCont
     }
 
     private boolean verifySQL(String sql) {
-
         Validation validation = new Validation(Collections.singletonList(FeaturesAllowed.CREATE), sql);
         List<ValidationError> errors = validation.validate();
 
-        for (ValidationError error : errors) {
-            LOG.warn(error.toString());
-        }
-
         return errors.size() == 0;
     }
 

src/main/java/com/github/maiqingqiang/goormhelper/orm/gorm/codeInsights/completion/GormColumnCompletionProvider.java

@@ -193,7 +193,6 @@ private String searchGoVarDefinitionReferences(GoVarDefinition goVarDefinition)
         for (PsiReference psiReference : GoReferencesSearch.search(goVarDefinition)) {
             GoStatement statement = (GoStatement) PsiTreeUtil.findFirstParent(psiReference.getElement(), element -> element instanceof GoStatement);
             if (statement == null) continue;
-            System.out.println("statement " + statement.getText());
             schema = findSchema(statement);
             if (!schema.isEmpty()) return schema;
 
@@ -225,29 +224,32 @@ private static String findSchema(@NotNull GoStatement statement) {
         if (!schema.isEmpty()) return schema;
 
         for (GoCallExpr goCallExpr : PsiTreeUtil.findChildrenOfType(statement, GoCallExpr.class)) {
+
             GoCallableDescriptor descriptor = GormTypes.ORM_MODEL_CALLABLES_SET.find(goCallExpr, false);
             if (descriptor == null) continue;
 
             Integer argumentIndex = GormTypes.GORM_MODEL_CALLABLES.get(descriptor);
 
-            System.out.println("argumentIndex " + argumentIndex);
-            System.out.println("getExpressionList " + goCallExpr.getArgumentList().getExpressionList().get(argumentIndex));
-
             GoExpression argument = goCallExpr.getArgumentList().getExpressionList().get(argumentIndex);
 
             if (argument instanceof GoUnaryExpr goUnaryExpr) {
                 if (goUnaryExpr.getExpression() instanceof GoCompositeLit goCompositeLit) {
                     if (goCompositeLit.getTypeReferenceExpression() == null) continue;
                     schema = goCompositeLit.getTypeReferenceExpression().getIdentifier().getText();
                 } else if (goUnaryExpr.getExpression() instanceof GoReferenceExpression goReferenceExpression) {
-                    GoVarDefinition goVarDefinition = (GoVarDefinition) goReferenceExpression.resolve();
-
-                    if (goVarDefinition == null) continue;
-
-                    GoType goType = goVarDefinition.getGoType(ResolveState.initial());
-                    if (goType == null || goType.getTypeReferenceExpression() == null) continue;
-
-                    schema = goType.getTypeReferenceExpression().getIdentifier().getText();
+                    if (goReferenceExpression.resolve() instanceof GoVarDefinition goVarDefinition) {
+                        GoType goType = goVarDefinition.getGoType(ResolveState.initial());
+                        if (goType == null || goType.getTypeReferenceExpression() == null) continue;
+
+                        schema = goType.getTypeReferenceExpression().getIdentifier().getText();
+                    } else if (goReferenceExpression.resolve() instanceof GoParamDefinition goParamDefinition) {
+                        GoPointerType goPointerType = PsiTreeUtil.findChildOfType(goParamDefinition.getParent(), GoPointerType.class);
+                        GoType goType = PsiTreeUtil.findChildOfType(goPointerType, GoType.class);
+                        if (goType != null) {
+                            if (goType.getTypeReferenceExpression() == null) continue;
+                            schema = goType.getTypeReferenceExpression().getIdentifier().getText();
+                        }
+                    }
                 }
             } else if (argument instanceof GoBuiltinCallExpr goBuiltinCallExpr) {
                 GoType goType = PsiTreeUtil.findChildOfType(goBuiltinCallExpr, GoType.class);

src/main/java/com/github/maiqingqiang/goormhelper/orm/xorm/completion/XormColumnCompletionProvider.java

@@ -242,14 +242,19 @@ private static String findSchema(@NotNull GoStatement statement) {
                     if (goCompositeLit.getTypeReferenceExpression() == null) continue;
                     schema = goCompositeLit.getTypeReferenceExpression().getIdentifier().getText();
                 } else if (goUnaryExpr.getExpression() instanceof GoReferenceExpression goReferenceExpression) {
-                    GoVarDefinition goVarDefinition = (GoVarDefinition) goReferenceExpression.resolve();
-
-                    if (goVarDefinition == null) continue;
-
-                    GoType goType = goVarDefinition.getGoType(ResolveState.initial());
-                    if (goType == null || goType.getTypeReferenceExpression() == null) continue;
-
-                    schema = goType.getTypeReferenceExpression().getIdentifier().getText();
+                    if (goReferenceExpression.resolve() instanceof GoVarDefinition goVarDefinition) {
+                        GoType goType = goVarDefinition.getGoType(ResolveState.initial());
+                        if (goType == null || goType.getTypeReferenceExpression() == null) continue;
+
+                        schema = goType.getTypeReferenceExpression().getIdentifier().getText();
+                    } else if (goReferenceExpression.resolve() instanceof GoParamDefinition goParamDefinition) {
+                        GoPointerType goPointerType = PsiTreeUtil.findChildOfType(goParamDefinition.getParent(), GoPointerType.class);
+                        GoType goType = PsiTreeUtil.findChildOfType(goPointerType, GoType.class);
+                        if (goType != null) {
+                            if (goType.getTypeReferenceExpression() == null) continue;
+                            schema = goType.getTypeReferenceExpression().getIdentifier().getText();
+                        }
+                    }
                 }
             } else if (argument instanceof GoBuiltinCallExpr goBuiltinCallExpr) {
                 GoType goType = PsiTreeUtil.findChildOfType(goBuiltinCallExpr, GoType.class);