From 2b4775e237fa3bf434c026c078e7ad7cafbc6416 Mon Sep 17 00:00:00 2001
From: denuno <valliantster@gmail.com>
Date: Sun, 11 Aug 2024 19:34:47 -0600
Subject: [PATCH 1/2] add test with empty rule set and test for ignore:line fix

this add the current source and a check for an ignore line where a bug is found
eventually we should maybe add the option of outputting the whole line in question so this is a start toward that
closes #741
---
 src/main/java/com/cflint/CFLint.java          | 18 +++++++++
 src/test/java/com/cflint/TestIgnoreLine.java  | 37 +++++++++++++++++++
 .../com/cflint/tests/IgnoresAll/.cflintrc     |  6 +++
 .../com/cflint/tests/IgnoresAll/ignoreAll.cfc |  7 ++++
 .../tests/IgnoresAll/ignoreAll.expected.txt   | 11 ++++++
 .../cflint/tests/IgnoresAll/ignoreLines.cfc   |  7 ++++
 .../tests/IgnoresAll/ignoreLines.expected.txt | 11 ++++++
 7 files changed, 97 insertions(+)
 create mode 100644 src/test/java/com/cflint/TestIgnoreLine.java
 create mode 100644 src/test/resources/com/cflint/tests/IgnoresAll/.cflintrc
 create mode 100644 src/test/resources/com/cflint/tests/IgnoresAll/ignoreAll.cfc
 create mode 100644 src/test/resources/com/cflint/tests/IgnoresAll/ignoreAll.expected.txt
 create mode 100644 src/test/resources/com/cflint/tests/IgnoresAll/ignoreLines.cfc
 create mode 100644 src/test/resources/com/cflint/tests/IgnoresAll/ignoreLines.expected.txt

diff --git a/src/main/java/com/cflint/CFLint.java b/src/main/java/com/cflint/CFLint.java
index 6fe266f99..f8ba82de5 100644
--- a/src/main/java/com/cflint/CFLint.java
+++ b/src/main/java/com/cflint/CFLint.java
@@ -107,6 +107,7 @@ public class CFLint implements IErrorReporter {
     private static final String MISSING_SEMI = "MISSING_SEMI";
     private static final String AVOID_EMPTY_FILES = "AVOID_EMPTY_FILES";
     private static final String RESOURCE_BUNDLE_NAME = "com.cflint.cflint";
+    private static final Pattern IGNORE_LINE_PATTERN = Pattern.compile("(?i).*cflint\\s+ignore:\\s*line.*");
 
     private CFMLTagInfo tagInfo;
     private CFMLParser cfmlParser = new CFMLParser();
@@ -130,11 +131,14 @@ public class CFLint implements IErrorReporter {
 	private Element currentElement = null;
     private boolean strictInclude;
     private Set<List<Object>> processed = new HashSet<>();
+    private String currentSource = "";
+
 
     // Stack to store include file depth to ensure no recursion
     private final Stack<File> includeFileStack = new Stack<>();
     private int[] lineOffsets;
 
+
     public CFLint(final CFLintConfiguration configFile) throws IOException {
         final CFLintFilter filter = CFLintFilter.createFilter(verbose);
         bugs = new BugList(filter);
@@ -325,6 +329,7 @@ public void process(final String src, final String filename) throws CFLintScanEx
                 final Context context = new Context(filename, null, null, false, handler,configuration);
                 reportRule(null, null, context, null, new ContextMessage(AVOID_EMPTY_FILES, null));
             } else {
+                currentSource = src;
                 lineOffsets = getLineOffsets(src.split("\n"));
                 final CFMLSource cfmlSource = new CFMLSource(src.contains("<!---") ? CommentReformatting.wrap(src) : src);
                 final ParserTag firstTag = getFirstTagQuietly(cfmlSource);
@@ -1430,6 +1435,14 @@ protected boolean suppressed(final BugInfo bugInfo, final Token token, final Con
         if (context == null || context.isSuppressed(bugInfo)) {
             return true;
         }
+
+        if(hasIgnoreLineComment(bugInfo.getLine())) {
+            if (verbose) {
+                System.out.println("ignoring " + bugInfo.getMessage() + " at line " + bugInfo.getLine());
+            }
+            return true;
+        }
+
         if(token == null){
             return false;
         }
@@ -1578,6 +1591,11 @@ public void setProgressUsesThread(final boolean progressUsesThread) {
         this.progressUsesThread = progressUsesThread;
     }
 
+    public boolean hasIgnoreLineComment(final int lineNr) {
+        String line = currentSource.split("\n")[lineNr-1];
+        return IGNORE_LINE_PATTERN.matcher(line).matches();
+    }
+
     @Override
     public void syntaxError(final Recognizer<?, ?> recognizer, final Object offendingSymbol, int line,
             int charPositionInLine, final String msg, final org.antlr.v4.runtime.RecognitionException re) {
diff --git a/src/test/java/com/cflint/TestIgnoreLine.java b/src/test/java/com/cflint/TestIgnoreLine.java
new file mode 100644
index 000000000..9fd540550
--- /dev/null
+++ b/src/test/java/com/cflint/TestIgnoreLine.java
@@ -0,0 +1,37 @@
+package com.cflint;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.cflint.api.CFLintAPI;
+import com.cflint.api.CFLintResult;
+import com.cflint.config.ConfigBuilder;
+import com.cflint.exception.CFLintScanException;
+
+public class TestIgnoreLine {
+
+    private CFLintAPI cfBugs;
+
+    @Before
+    public void setUp() throws Exception {
+        final ConfigBuilder configBuilder = new ConfigBuilder();
+        cfBugs = new CFLintAPI(configBuilder.build());
+    }
+
+    @Test
+    public void testIgnoreLines() throws CFLintScanException {
+        final String scriptSrc = "component { // cflint ignore:line\n" + 
+                "    function functionFour() { // cflint ignore:line\n" + 
+                "        if (a == 1) { // cflint ignore:line\n" + 
+                "            b =  // cflint ignore:line\n" + 
+                "        }\n" + 
+                "    }\n" + 
+                "}";
+        cfBugs.setLogError(true);
+        CFLintResult lintresult = cfBugs.scan(scriptSrc, "test");
+        assertEquals(0, lintresult.getIssues().size());
+    }
+
+}
diff --git a/src/test/resources/com/cflint/tests/IgnoresAll/.cflintrc b/src/test/resources/com/cflint/tests/IgnoresAll/.cflintrc
new file mode 100644
index 000000000..16aa663b9
--- /dev/null
+++ b/src/test/resources/com/cflint/tests/IgnoresAll/.cflintrc
@@ -0,0 +1,6 @@
+{
+  "rule" : [ ],
+  "excludes" : [ ],
+  "includes" : [{}],
+  "inheritParent" : false
+}
\ No newline at end of file
diff --git a/src/test/resources/com/cflint/tests/IgnoresAll/ignoreAll.cfc b/src/test/resources/com/cflint/tests/IgnoresAll/ignoreAll.cfc
new file mode 100644
index 000000000..e7d3cbec9
--- /dev/null
+++ b/src/test/resources/com/cflint/tests/IgnoresAll/ignoreAll.cfc
@@ -0,0 +1,7 @@
+component {
+    function functionFour() { 
+        if (a == 1) { 
+            b = 1; 
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/com/cflint/tests/IgnoresAll/ignoreAll.expected.txt b/src/test/resources/com/cflint/tests/IgnoresAll/ignoreAll.expected.txt
new file mode 100644
index 000000000..19fa5137d
--- /dev/null
+++ b/src/test/resources/com/cflint/tests/IgnoresAll/ignoreAll.expected.txt
@@ -0,0 +1,11 @@
+{
+  "version" : "",
+  "timestamp" : 0,
+  "issues" : [ ],
+  "counts" : {
+    "totalFiles" : 0,
+    "totalLines" : 0,
+    "countByCode" : [ ],
+    "countBySeverity" : [ ]
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/com/cflint/tests/IgnoresAll/ignoreLines.cfc b/src/test/resources/com/cflint/tests/IgnoresAll/ignoreLines.cfc
new file mode 100644
index 000000000..5a58dc17a
--- /dev/null
+++ b/src/test/resources/com/cflint/tests/IgnoresAll/ignoreLines.cfc
@@ -0,0 +1,7 @@
+component { // cflint ignore:line
+    function functionFour() { // cflint ignore:line
+        if (a == 1) { // cflint ignore:line
+            b = 1; // cflint ignore:line
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/com/cflint/tests/IgnoresAll/ignoreLines.expected.txt b/src/test/resources/com/cflint/tests/IgnoresAll/ignoreLines.expected.txt
new file mode 100644
index 000000000..19fa5137d
--- /dev/null
+++ b/src/test/resources/com/cflint/tests/IgnoresAll/ignoreLines.expected.txt
@@ -0,0 +1,11 @@
+{
+  "version" : "",
+  "timestamp" : 0,
+  "issues" : [ ],
+  "counts" : {
+    "totalFiles" : 0,
+    "totalLines" : 0,
+    "countByCode" : [ ],
+    "countBySeverity" : [ ]
+  }
+}
\ No newline at end of file

From 61367bc7c88361fa66790141313de3fd65d45f4b Mon Sep 17 00:00:00 2001
From: denuno <valliantster@gmail.com>
Date: Sun, 11 Aug 2024 20:57:06 -0600
Subject: [PATCH 2/2] bumpt build java up to 11

---
 .github/workflows/gradle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 566bc03f7..3d2ea058c 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -17,11 +17,11 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v4
       with:
         distribution: temurin
-        java-version: 8
+        java-version: 11
 
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v3