fix #1719

Author: guwirth

cxx-sensors/src/main/java/org/sonar/cxx/sensors/clangtidy/CxxClangTidySensor.java

@@ -44,7 +44,7 @@ public class CxxClangTidySensor extends CxxIssuesReportSensor {
   private static final Logger LOG = Loggers.get(CxxClangTidySensor.class);
 
   private static final String REGEX
-          = "(.+|[a-zA-Z]:\\\\.+):([0-9]+):([0-9]+): ([^:]+): ([^]]+)( \\[([^]]+)\\])?";
+          = "(.+|[a-zA-Z]:\\\\.+):([0-9]+):([0-9]+): ([^:]+): (.+)";
   private static final Pattern PATTERN = Pattern.compile(REGEX);
 
   /**
@@ -59,10 +59,10 @@ public CxxClangTidySensor(CxxLanguage language) {
   @Override
   public void describe(SensorDescriptor descriptor) {
     descriptor
-      .name(getLanguage().getName() + " ClangTidySensor")
-      .onlyOnLanguage(getLanguage().getKey())
-      .createIssuesForRuleRepository(getRuleRepositoryKey())
-      .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathKey()));
+            .name(getLanguage().getName() + " ClangTidySensor")
+            .onlyOnLanguage(getLanguage().getKey())
+            .createIssuesForRuleRepository(getRuleRepositoryKey())
+            .onlyWhenConfiguration(conf -> conf.hasKey(getReportPathKey()));
   }
 
   @Override
@@ -82,15 +82,33 @@ protected void processReport(final SensorContext context, File report) {
         String nextLine = scanner.nextLine();
         final Matcher matcher = PATTERN.matcher(nextLine);
         if (matcher.matches()) {
-          // group: 1      2      3         4        5       7
-          //      <path>:<line>:<column>: <level>: <info> [<ruleId>]
+          // group: 1      2      3         4        5
+          //      <path>:<line>:<column>: <level>: <txt>
           MatchResult m = matcher.toMatchResult();
           String path = m.group(1); // relative paths
           String line = m.group(2);
           //String column = m.group(3);
-          String level = m.group(4); // error, warning, note, ...
-          String info = m.group(5);
-          String ruleId = m.group(7); // optional
+          String level = m.group(4); // error, warning, note, ...          
+          String txt = m.group(5); // info( [ruleId])?
+          String info = null;
+          String ruleId = null;
+
+          if (txt.endsWith("]")) { // [ruleId]
+            for (int i = txt.length() - 2; i >= 0; i--) {
+              char c = txt.charAt(i);
+              if (c == '[') {
+                info = txt.substring(0, i - 1);
+                ruleId = txt.substring(i + 1, txt.length() - 1);
+                break;
+              }
+              if (!(Character.isLetterOrDigit(c) || c == '-' || c == '.')) {
+                break;
+              }
+            }
+          }
+          if (info == null) {
+            info = txt;
+          }
 
           if (ruleId != null) {
             if (issue != null) {

cxx-sensors/src/test/java/org/sonar/cxx/sensors/clangtidy/CxxClangTidySensorTest.java

@@ -105,6 +105,24 @@ public void shouldReportWarnings() {
     assertThat(context.allIssues()).hasSize(1);
   }
 
+  @Test
+  public void shouldReportNodiscard() {
+    SensorContextTester context = SensorContextTester.create(fs.baseDir());
+
+    settings.setProperty(
+            language.getPluginProperty(CxxClangTidySensor.REPORT_PATH_KEY),
+            "clang-tidy-reports/cpd.report-nodiscard.txt"
+    );
+    context.setSettings(settings);
+
+    context.fileSystem().add(TestInputFileBuilder.create("ProjectKey", "sources/utils/code_chunks.cpp")
+            .setLanguage("cpp").initMetadata("asd\nasdas\nasda\n").build());
+
+    CxxClangTidySensor sensor = new CxxClangTidySensor(language);
+    sensor.execute(context);
+    assertThat(context.allIssues()).hasSize(1);
+  }
+
   @Test
   public void shouldReportFlow() {
     SensorContextTester context = SensorContextTester.create(fs.baseDir());

cxx-sensors/src/test/resources/org/sonar/cxx/sensors/reports-project/clang-tidy-reports/cpd.report-nodiscard.txt

@@ -0,0 +1,5 @@
+1 warning generated.
+sources\utils\code_chunks.cpp:2:3: warning: function 'empty' should be marked [[nodiscard]] [modernize-use-nodiscard]
+  bool empty() const;
+  ^
+  [[nodiscard]]