fix c/c++ guessing based on pattern

SonarOpenCommunity · Jul 7, 2016 · 3acba94 · guwirth · Jul 7, 2016 · jmecosta
1 parent 6b91f60
commit 3acba94
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 209 deletions.
diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/CheckList.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/CheckList.java
@@ -76,8 +76,6 @@ public static List<Class> getChecks() {
       UsingNamespaceInHeaderCheck.class,
       SafetyTagCheck.class,
       UseCorrectIncludeCheck.class,
-      // XPathCheck.class, this gives class not found exception in 5.6
-      // XPath no longer found in other plugins
       BooleanEqualityComparisonCheck.class,
       NestedStatementsCheck.class,
       TooManyParametersCheck.class,

diff --git a/cxx-checks/src/main/java/org/sonar/cxx/checks/XPathCheck.java b/cxx-checks/src/main/java/org/sonar/cxx/checks/XPathCheck.java
diff --git a/cxx-checks/src/test/java/org/sonar/cxx/checks/XPathCheckTest.java b/cxx-checks/src/test/java/org/sonar/cxx/checks/XPathCheckTest.java
diff --git a/cxx-squid/src/main/java/org/sonar/cxx/preprocessor/CxxPreprocessor.java b/cxx-squid/src/main/java/org/sonar/cxx/preprocessor/CxxPreprocessor.java
@@ -287,17 +287,13 @@ public Collection<Include> getMissingIncludeFiles(File file) {
 
   private boolean isCFile(String filePath) {
     for (String pattern : cFilesPatterns) {
-      String regex = pattern.replace("?", ".?").replace("*", ".*?");
-      if (filePath.matches(regex)) {
-        if (LOG.isTraceEnabled()) {
-          LOG.trace("Parse '{}' as C file, matches '{}' pattern", filePath, pattern);
-        }
+      String patt = pattern.replace("*", "");
+      if (filePath.endsWith(patt)) {
+          LOG.debug("Parse '{}' as C file, ends in '{}'", filePath, pattern);
         return true;
       }
     }
-    if (LOG.isTraceEnabled()) {
-      LOG.trace("Parse '{}' as C++ file", filePath);
-    }
+    LOG.debug("Parse '{}' as C++ file", filePath);
     return false;
   }