Add info log for debugging

braisdom · Dec 14, 2020 · f8adc04 · f8adc04
1 parent 3fdd3e0
commit f8adc04
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'com.github.braisdom'
-version '1.3.1'
+version '1.3.2'
 
 repositories {
     mavenLocal()

diff --git a/src/main/java/com/github/braisdom/objsql/intellij/ObjSqlPsiAugmentProvider.java b/src/main/java/com/github/braisdom/objsql/intellij/ObjSqlPsiAugmentProvider.java
@@ -1,6 +1,5 @@
 package com.github.braisdom.objsql.intellij;
 
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.RecursionGuard;
 import com.intellij.openapi.util.RecursionManager;
@@ -20,7 +19,6 @@
 
 public class ObjSqlPsiAugmentProvider extends PsiAugmentProvider {
 
-    private static final Logger LOGGER = Logger.getInstance(ObjSqlPsiAugmentProvider.class.getName());
     public static final String DOMAIN_MODEL_CLASSNAME = "com.github.braisdom.objsql.annotations.DomainModel";
 
     private static final List LANG_PRIMARY_TYPES = Arrays.asList(new String[]{"Long", "Integer", "String", "Short"});
@@ -103,7 +101,6 @@ public Result<List<Psi>> compute() {
                     PersistenceMethodBuilder.buildMethod(psiClass, result);
                     ModelMethodBuilder.buildMethod(psiClass, result);
                     TableClassBuilder.buildMethod(psiClass, result);
-                    LOGGER.warn("Generated methods count: " + result.size());
                 } else if (type == PsiField.class) {
                     RelationFieldBuilder.buildField(psiClass, result);
                     PrimaryBuilder.buildField(psiClass, result);

diff --git a/src/main/java/com/github/braisdom/objsql/intellij/SetterGetterMethodBuilder.java b/src/main/java/com/github/braisdom/objsql/intellij/SetterGetterMethodBuilder.java
@@ -1,8 +1,10 @@
 package com.github.braisdom.objsql.intellij;
 
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.*;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiField;
+import com.intellij.psi.PsiModifier;
+import com.intellij.psi.PsiType;
 import com.intellij.psi.search.GlobalSearchScope;
 
 import java.util.Collection;
@@ -12,12 +14,9 @@
 
 final class SetterGetterMethodBuilder {
 
-    private static final Logger LOGGER = Logger.getInstance(SetterGetterMethodBuilder.class.getName());
-
     static void buildMethod(PsiClass psiClass, List result) {
         final Project project = psiClass.getProject();
         Collection<PsiField> fields = PsiClassUtil.collectClassFieldsIntern(psiClass);
-        LOGGER.warn("Field count: " + fields.size());
         for (PsiField field : fields) {
             String setterName = String.format("set%s", upperFirstChar(field.getName()));
             String getterName = String.format("%s%s", isBoolean(field.getType()) ? "is" : "get",

diff --git a/src/main/java/com/github/braisdom/objsql/intellij/oo/OOHighlightVisitorImpl.java b/src/main/java/com/github/braisdom/objsql/intellij/oo/OOHighlightVisitorImpl.java
@@ -14,10 +14,12 @@
  */
 package com.github.braisdom.objsql.intellij.oo;
 
+import com.github.braisdom.objsql.intellij.ObjSqlPsiAugmentProvider;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder;
 import com.intellij.codeInsight.daemon.impl.analysis.HighlightVisitorImpl;
 import com.intellij.lang.annotation.HighlightSeverity;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import org.jetbrains.annotations.NotNull;
@@ -29,6 +31,8 @@
 
 public class OOHighlightVisitorImpl extends HighlightVisitorImpl {
 
+    private static final Logger LOGGER = Logger.getInstance(ObjSqlPsiAugmentProvider.class.getName());
+
     private HighlightInfoHolder myHolder;
     private PsiResolveHelper resolveHelper;
 
@@ -62,7 +66,8 @@ public void visitPolyadicExpression(PsiPolyadicExpression expression) {
             }
             if (lType != OOResolver.NoType)
                 removeLastHighlight();
-        }
+            else LOGGER.info("visitPolyadicExpression lType = OOResolver.NoType, lType:" + lType);
+        } else LOGGER.info("visitPolyadicExpression ignore highlihted");
     }
 
     @Override // Unary OO
@@ -71,7 +76,8 @@ public void visitPrefixExpression(PsiPrefixExpression expression) {
         if (isHighlighted(expression)
                 && OOResolver.getOOType(expression) != OOResolver.NoType) {
             removeLastHighlight();
-        }
+        } else LOGGER.info("visitPrefixExpression ignore highlihted, Highlighted: "
+                + isHighlighted(expression) + ", OOType: " + OOResolver.getOOType(expression));
     }
 
     @Override // Index-Get OO
@@ -82,6 +88,8 @@ public void visitExpression(PsiExpression expression) {
             if (isHighlighted(paa.getArrayExpression())
                     && OOResolver.indexGet((PsiArrayAccessExpression) expression) != OOResolver.NoType)
                 removeLastHighlight();
+            else LOGGER.info("visitExpression ignore highlihted, Highlighted: "
+                    + isHighlighted(paa.getArrayExpression()) + ", OOType: " + OOResolver.indexGet((PsiArrayAccessExpression) expression));
         }
     }
 
@@ -95,10 +103,15 @@ && isHighlighted(ass.getLExpression())) {
                 PsiArrayAccessExpression paa = (PsiArrayAccessExpression) ass.getLExpression();
                 if (OOResolver.indexSet(paa, ass.getRExpression()) != OOResolver.NoType)
                     removeLastHighlight();
-            }
+                else LOGGER.info("visitAssignmentExpression ignore highlihted, OOType: "
+                        + OOResolver.indexSet(paa, ass.getRExpression()));
+            } else LOGGER.info("visitAssignmentExpression ignore highlihted, Highlighted: "
+                    + isHighlighted(ass.getLExpression()));
             // Implicit type conversion in assignment
             if (isHighlighted(ass) && OOResolver.isTypeConvertible(ass.getLExpression().getType(), ass.getRExpression()))
                 removeLastHighlight();
+            else LOGGER.info("visitAssignmentExpression ignore highlihted, Highlighted: "
+                    + isHighlighted(ass) + ", isTypeConvertible: " + OOResolver.isTypeConvertible(ass.getLExpression().getType(), ass.getRExpression()));
         }
     }
 
@@ -107,6 +120,8 @@ public void visitVariable(PsiVariable var) {
         super.visitVariable(var);
         if (var.hasInitializer() && isHighlighted(var) && OOResolver.isTypeConvertible(var.getType(), var.getInitializer()))
             removeLastHighlight();
+        else LOGGER.info("visitVariable hasInitializer: " + var.hasInitializer()
+                + ", isHighlighted: " + isHighlighted(var) + ", isTypeConvertible: " + OOResolver.isTypeConvertible(var.getType(), var.getInitializer()));
     }
 
     private boolean isHighlighted(@NotNull PsiElement expression) {

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -2,7 +2,7 @@
     <id>com.github.braisdom.object-sql-intellij</id>
     <name>ObjectiveSql</name>
     <vendor email="[email protected]" url="http://www.objsql.com">ObjectiveSql</vendor>
-    <version>1.3.1</version>
+    <version>1.3.2</version>
     <idea-version since-build="191.1"/>
     <category>Tools Integration</category>
     <description><![CDATA[