🦄 refactor: Revise annotation detection

caoccao · Jul 3, 2023 · 7f36bc9 · 7f36bc9
1 parent 112f059
commit 7f36bc9
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/scripts/node/jaspiler/jaspiler.js b/scripts/node/jaspiler/jaspiler.js
@@ -202,11 +202,8 @@ const JTTypeKind = Object.freeze({
 });
 
 function canBeIgnoredByAnnotations(annotations, context) {
-  if (annotations) {
-    const annotation = findAnnotation(annotations, 'JaspilerContract.Ignore');
-    return evaluateAnnotationAttribute(annotation, context, 'condition', true, false);
-  }
-  return false;
+  const annotation = findAnnotation(annotations, 'JaspilerContract.Ignore');
+  return evaluateAnnotationAttribute(annotation, context, 'condition', true, false);
 }
 
 function evaluateAnnotationAttribute(annotation, context, attributeName, defaultValueForAttributeFound, defaultValueForAttributeNotFound) {
@@ -248,11 +245,9 @@ function getAnnotationAttributeValueByName(annotation, attributeName) {
 }
 
 function getChangeInstructionByAnnotations(annotations, context) {
-  if (annotations) {
-    const annotation = findAnnotation(annotations, 'JaspilerContract.Change');
-    if (evaluateAnnotationAttribute(annotation, context, 'condition', true, false)) {
-      return evaluateAnnotationAttribute(annotation, context, 'instruction', undefined, undefined);
-    }
+  const annotation = findAnnotation(annotations, 'JaspilerContract.Change');
+  if (evaluateAnnotationAttribute(annotation, context, 'condition', true, false)) {
+    return evaluateAnnotationAttribute(annotation, context, 'instruction', undefined, undefined);
   }
   return undefined;
 }