Improve metric NCLOC to consider whitespace and comment only lines

> Lines of code (ncloc): The number of physical lines that contain at least one character which is neither a whitespace nor a tabulation nor part of a comment.
https://docs.sonarsource.com/sonarqube/latest/user-guide/metric-definitions/

Author: froque

src/main/java/com/premiumminds/sonar/postgres/PostgresSqlSensor.java

@@ -64,12 +64,6 @@ public void execute(SensorContext context) {
                 LOGGER.warn("Analysis cancelled");
             }
 
-            context.<Integer>newMeasure()
-                    .on(file)
-                    .withValue(file.lines())
-                    .forMetric(CoreMetrics.NCLOC)
-                    .save();
-
             try {
                 PostgreSqlFile postgreSqlFile = new PostgreSqlFile(file);
                 parseContents(context, postgreSqlFile);
@@ -135,6 +129,23 @@ private void scanContents(SensorContext context, PostgreSqlFile file) throws Inv
                             RULE_IDENTIFIER_MAX_LENGTH);
                 });
 
+        final var ncloc = scanResult.getTokensList()
+                .stream()
+                .filter(st -> !st.getToken().equals(Token.SQL_COMMENT))
+                .filter(st -> !st.getToken().equals(Token.C_COMMENT))
+                .map(st -> {
+                    final TextRange textRange = file.convertAbsoluteOffsetsToTextRange(st.getStart(), st.getEnd());
+                    return textRange.start().line();
+                })
+                .distinct()
+                .count();
+
+        context.<Integer>newMeasure()
+                .on(file.getInputFile())
+                .withValue((int) ncloc)
+                .forMetric(CoreMetrics.NCLOC)
+                .save();
+
         final var nclocData = scanResult.getTokensList()
                 .stream()
                 .map(st -> {

src/test/java/com/premiumminds/sonar/postgres/PostgresSqlSensorTest.java

@@ -45,7 +45,6 @@
 import static com.premiumminds.sonar.postgres.PostgresSqlRulesDefinition.RULE_SETTING_NOT_NULLABLE_FIELD;
 import static com.premiumminds.sonar.postgres.PostgresSqlRulesDefinition.RULE_VACUUM_FULL;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.sonar.api.measures.CoreMetrics.NCLOC;
 import static org.sonar.api.measures.CoreMetrics.NCLOC_DATA;
@@ -129,13 +128,33 @@ void metricsNcloc() {
         createFile(contextTester, "file1.sql", "SELECT 1;\r\nSELECT 2;\r\nSELECT 3;");
         createFile(contextTester, "file2.sql", "SELECT 'Évora 1';\nSELECT 'Évora 2';\nSELECT 'Évora 3';");
         createFile(contextTester, "file3.sql", "INSERT INTO foo VALUES ('éééééééééééé'), ('a');");
+        createFile(contextTester, "file4.sql", "--comment\nSELECT 1;");
+        createFile(contextTester, "file5.sql", "\n" +
+                " select bar from foo;;\n" +
+                " \n" +
+                " select \n" +
+                " -- some comment\n" +
+                "    bar2\n" +
+                " ,\n" +
+                " baz2\n" +
+                " /* some other comment */\n" +
+                "  from foo2;\n" +
+                "\n" +
+                "COMMENT ON TABLE mytable IS 'This is my table.';\n" +
+                "\n" +
+                "create table foo (\n" +
+                "    like bar\n" +
+                "    including comments\n" +
+                ");\n");
 
         PostgresSqlSensor sensor = getPostgresSqlSensor();
         sensor.execute(contextTester);
 
         assertEquals(3, contextTester.measure(":file1.sql", NCLOC).value());
         assertEquals(3, contextTester.measure(":file2.sql", NCLOC).value());
         assertEquals(1, contextTester.measure(":file3.sql", NCLOC).value());
+        assertEquals(1, contextTester.measure(":file4.sql", NCLOC).value());
+        assertEquals(11, contextTester.measure(":file5.sql", NCLOC).value());
     }
 
     @Test