Fix ignore always

Author: smaye81

conformance/expected-failures.yaml

@@ -107,24 +107,3 @@ custom_constraints:
   #ERROR: <input>:1:1: expression of type 'int' cannot be range of a comprehension (must be list, map, or dynamic)
   # | this.all(e, e == 1)
   # | ^
-standard_constraints/ignore:
-  - proto3/repeated/items/ignore_always/valid/zero_invalid_value
-  - proto3/map/values/ignore_always/valid/populated_invalid_value
-  - proto3/repeated/items/ignore_always/valid/populated_invalid_value
-  - proto2/map/keys/ignore_always/valid/zero_invalid_value
-  - proto/2023/map/values/ignore_always/valid/populated_invalid_value
-  - proto3/map/keys/ignore_always/valid/zero_invalid_value
-  - proto3/map/values/ignore_always/valid/zero_invalid_value
-  - proto2/map/values/ignore_always/valid/zero_valid_value
-  - proto/2023/repeated/expanded/items/ignore_always/valid/zero_invalid_value
-  - proto/2023/repeated/expanded/items/ignore_always/valid/populated_invalid_value
-  - proto/2023/map/keys/ignore_always/valid/zero_invalid_value
-  - proto2/map/values/ignore_always/valid/populated_invalid_value
-  - proto/2023/map/values/ignore_always/valid/zero_invalid_value
-  - proto2/repeated/items/ignore_always/valid/populated_invalid_value
-  - proto/2023/repeated/compact/items/ignore_always/valid/zero_invalid_value
-  - proto3/map/keys/ignore_always/valid/populated_invalid_value
-  - proto/2023/repeated/compact/items/ignore_always/valid/populated_invalid_value
-  - proto2/map/keys/ignore_always/valid/populated_invalid_value
-  - proto/2023/map/keys/ignore_always/valid/populated_invalid_value
-  - proto2/repeated/items/ignore_always/valid/zero_invalid_value

src/main/java/build/buf/protovalidate/EvaluatorBuilder.java

@@ -232,10 +232,6 @@ private FieldEvaluator buildField(
       return fieldEvaluator;
     }
 
-    private boolean shouldSkip(FieldConstraints constraints) {
-      return constraints.getIgnore() == Ignore.IGNORE_ALWAYS;
-    }
-
     private static boolean shouldIgnoreEmpty(FieldConstraints constraints) {
       return constraints.getIgnore() == Ignore.IGNORE_IF_UNPOPULATED
           || constraints.getIgnore() == Ignore.IGNORE_IF_DEFAULT_VALUE;
@@ -250,6 +246,11 @@ private void buildValue(
         FieldConstraints fieldConstraints,
         ValueEvaluator valueEvaluator)
         throws CompilationException {
+
+      if (fieldConstraints.getIgnore() == Ignore.IGNORE_ALWAYS) {
+        return;
+      }
+
       processIgnoreEmpty(fieldDescriptor, fieldConstraints, valueEvaluator);
       processFieldExpressions(fieldDescriptor, fieldConstraints, valueEvaluator);
       processEmbeddedMessage(fieldDescriptor, fieldConstraints, valueEvaluator);
@@ -371,7 +372,6 @@ private void processEmbeddedMessage(
         ValueEvaluator valueEvaluatorEval)
         throws CompilationException {
       if (fieldDescriptor.getJavaType() != FieldDescriptor.JavaType.MESSAGE
-          || shouldSkip(fieldConstraints)
           || fieldDescriptor.isMapField()
           || (fieldDescriptor.isRepeated() && !valueEvaluatorEval.hasNestedRule())) {
         return;
@@ -388,7 +388,6 @@ private void processWrapperConstraints(
         ValueEvaluator valueEvaluatorEval)
         throws CompilationException {
       if (fieldDescriptor.getJavaType() != FieldDescriptor.JavaType.MESSAGE
-          || shouldSkip(fieldConstraints)
           || fieldDescriptor.isMapField()
           || (fieldDescriptor.isRepeated() && !valueEvaluatorEval.hasNestedRule())) {
         return;