Fixed unexpected behavior with KSValidateVisitor

1. visitFunctionDeclaration was always returning false for validate if
   the predicate lambda returned false to skip.
2. visitPropertyDeclaration wasn't visiting the type unlike other visit
   methods.

1 files changed, 2 insertions, 2 deletions

diff --git a/api/src/main/kotlin/com/google/devtools/ksp/visitor/KSValidateVisitor.kt b/api/src/main/kotlin/com/google/devtools/ksp/visitor/KSValidateVisitor.kt
index 8e2747df..4947a41f 100644
--- a/api/src/main/kotlin/com/google/devtools/ksp/visitor/KSValidateVisitor.kt
+++ b/api/src/main/kotlin/com/google/devtools/ksp/visitor/KSValidateVisitor.kt
@@ -75,7 +75,7 @@ open class KSValidateVisitor(
 
     override fun visitFunctionDeclaration(function: KSFunctionDeclaration, data: KSNode?): Boolean {
         if (function.returnType != null &&
-            !(predicate(function, function.returnType!!) && function.returnType!!.accept(this, data))
+            predicate(function, function.returnType!!) && !function.returnType!!.accept(this, data)
         ) {
             return false
         }
@@ -89,7 +89,7 @@ open class KSValidateVisitor(
     }
 
     override fun visitPropertyDeclaration(property: KSPropertyDeclaration, data: KSNode?): Boolean {
-        if (predicate(property, property.type) && property.type.resolve().isError) {
+        if (predicate(property, property.type) && !property.type.accept(this, data)) {
             return false
         }
         if (!this.visitDeclaration(property, data)) {