Merge pull request #891 from aireilly/fix-ifdef-rule

Fix conditions rule for single line ifdefs

Author: aireilly

.vale/fixtures/AsciiDoc/ValidConditions/testvalid.adoc

@@ -40,3 +40,6 @@ endif::[]
 ifeval::["{docname}{outfilesuffix}" == "main.html"]
 Some text!
 endif::[]
+
+//vale-fixture
+ifndef::olmv1-pullsecret-proc[For more information, see "Creating a pull secret for catalogs hosted on a secure registry".]

.vale/styles/AsciiDoc/ValidConditions.yml

@@ -13,13 +13,15 @@ script: |
   //add a newline, it might be missing
   scope += "\n"
 
-  if_regex := "^(ifdef::.+\\[\\]|ifndef::.+\\[\\]|ifeval::.*)"
-  endif_regex := "^endif::.*"
+  if_regex := "^ifdef::.+\\[\\]"
+  ifn_regex := "^ifndef::.+\\[\\]"
+  ifeval_regex := "ifeval::\\[.+\\]"
+  endif_regex := "^endif::.*\\[\\]"
 
   for line in text.split(scope, "\n") {
     // trim trailing whitespace
     line = text.trim_space(line)
-    if text.re_match(if_regex, line) {
+    if text.re_match(if_regex, line) || text.re_match(ifn_regex, line) || text.re_match(ifeval_regex, line) {
       start := text.index(scope, line)
       matches = append(matches, {begin: start, end: start + len(line)})
     } else if text.re_match(endif_regex, line) {

tengo-rule-scripts/ValidConditions.tengo

@@ -16,13 +16,15 @@ scope = text.re_replace("(?s) *(\n////.*?////\n)", scope, "")
 //add a newline, it might be missing
 scope += "\n"
 
-if_regex := "^(ifdef::.+\\[\\]|ifndef::.+\\[\\]|ifeval::.*)"
-endif_regex := "^endif::.*"
+if_regex := "^ifdef::.+\\[\\]"
+ifn_regex := "^ifndef::.+\\[\\]"
+ifeval_regex := "ifeval::\\[.+\\]"
+endif_regex := "^endif::.*\\[\\]"
 
 for line in text.split(scope, "\n") {
   // trim trailing whitespace
   line = text.trim_space(line)
-  if text.re_match(if_regex, line) {
+  if text.re_match(if_regex, line) || text.re_match(ifn_regex, line) || text.re_match(ifeval_regex, line) {
     start := text.index(scope, line)
     matches = append(matches, {begin: start, end: start + len(line)})
   } else if text.re_match(endif_regex, line) {