Fix comments regex. (#13)

Signed-off-by: Nikolay Chakarov <[email protected]> Signed-off-by: Nikolay Chakarov <[email protected]> Co-authored-by: Nikolay Chakarov <[email protected]>
vmware-archive · Sep 19, 2022 · c3eac95 · c3eac95
1 parent 69c72c3
commit c3eac95
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/src/main/java/org/sonar/plugins/its/java/checks/ITSJavaFilesSensor.java b/src/main/java/org/sonar/plugins/its/java/checks/ITSJavaFilesSensor.java
@@ -42,16 +42,21 @@ public void execute(SensorContext context) {
         FileSystem fs = context.fileSystem();
         Iterable<InputFile> files = fs.inputFiles(fs.predicates().all());
         for (InputFile file : files) {
+            try {
+                String filename = file.filename();
+                String fileExt = FilenameUtils.getExtension(filename).toLowerCase();
+                if (fileExt.toLowerCase().equalsIgnoreCase("jar") || fileExt.toLowerCase().equalsIgnoreCase("zip")) {
+                    logger.info("ITSRule: skipping binary file " + filename);
+                    continue;
+                }
+                logger.info("Scanning " + file.filename());
 
-            String filename = file.filename();
-            String fileExt = FilenameUtils.getExtension(filename).toLowerCase();
-            if (fileExt.toLowerCase().equalsIgnoreCase("jar") || fileExt.toLowerCase().equalsIgnoreCase("zip")) {
-                logger.info("ITSRule: skipping binary file " + filename);
-                continue;
+                ItsFileScanner scanner = new ItsFileScanner();
+                scanner.scanFile(context, this, file);
+            } catch (Exception e) {
+                logger.error("An error occurred with file " + file.filename());
+                logger.error(e.getMessage(), e.getStackTrace());
             }
-
-            ItsFileScanner scanner = new ItsFileScanner();
-            scanner.scanFile(context, this, file);
         }
     }
 

diff --git a/src/main/java/org/sonar/plugins/its/service/ItsFileScanner.java b/src/main/java/org/sonar/plugins/its/service/ItsFileScanner.java
@@ -35,14 +35,16 @@ public void scanFile(SensorContext context, Sensor sensor, InputFile file) {
 
         List<SourceComment> comments = new ArrayList<SourceComment>();
 
+        // TODO add support for comments in Python, Ruby, HTML, JSON
+        // Check file extension and get the regex for the different file
         String slComment = "//[^\r\n]*";
         String mlComment = "/\\*[\\s\\S]*?\\*/";
-        String strLit = "\"(?:\\\\.|[^\\\\\"\r\n])*\"";
-        String chLit = "'(?:\\\\.|[^\\\\'\r\n])+'";
-        String any = "[\\s\\S]";
+//        String strLit = "\"(?:\\\\.|[^\\\\\"\r\n])*\"";
+//        String chLit = "'(?:\\\\.|[^\\\\'\r\n])+'";
+//        String any = "[\\s\\S]";
 
         Pattern p = Pattern.compile(
-                String.format("(%s)|(%s)|%s|%s|%s", slComment, mlComment, strLit, chLit, any));
+                String.format("(%s)|(%s)", slComment, mlComment)); //strLit, chLit, any));
 
         Path path = file.file().toPath();
         String entireFileAsString;