Work on accuracy for code counter

Author: boyter

src/main/java/com/searchcode/app/util/SlocCounter.java

@@ -162,6 +162,7 @@ public SlocCount countStats(String contents, String languageName) {
                         if (fileClassifierResult.nestedmultiline || endComments.size() == 0) {
                             endString = this.checkForMatchMultiOpen(contents.charAt(index), index, endPoint, fileClassifierResult.multi_line, contents);
                             if (endString != null) {
+                                index += endString.length() - 1;
                                 endComments.add(endString);
                                 currentState = State.S_MULTICOMMENT_CODE;
                                 break;
@@ -192,6 +193,7 @@ public SlocCount countStats(String contents, String languageName) {
                         if (fileClassifierResult.nestedmultiline || endComments.size() == 0) {
                             endString = this.checkForMatchMultiOpen(contents.charAt(index), index, endPoint, fileClassifierResult.multi_line, contents);
                             if (endString != null) {
+                                index += endString.length() - 1;
                                 endComments.add(endString);
                                 currentState = State.S_MULTICOMMENT_CODE;
                                 break;
@@ -220,8 +222,9 @@ public SlocCount countStats(String contents, String languageName) {
                         if (fileClassifierResult.nestedmultiline || endComments.size() == 0) {
                             endString = this.checkForMatchMultiOpen(contents.charAt(index), index, endPoint, fileClassifierResult.multi_line, contents);
                             if (endString != null) {
+                                index += endString.length() - 1;
                                 endComments.add(endString);
-                                currentState = State.S_MULTICOMMENT_CODE;
+                                currentState = State.S_MULTICOMMENT;
                                 break;
                             }
                         }

src/test/java/com/searchcode/app/util/SlocCounterTest.java

@@ -48,6 +48,76 @@ public void testBoundsExceptions() {
         assertThat(slocCount.complexity).isEqualTo(8);
     }
 
+    public void testMultiLine() {
+        String language = "C++";
+        String contents = "/*\n" +
+                "*\n" +
+                "*/";
+
+        SlocCounter.SlocCount slocCount = this.slocCounter.countStats(contents, language);
+        assertThat(slocCount.linesCount).isEqualTo(3);
+        assertThat(slocCount.codeCount).isEqualTo(0);
+        assertThat(slocCount.commentCount).isEqualTo(3);
+    }
+
+    public void testRegression() {
+        String language = "C++";
+        String contents = "/**/\n" +
+                "i\n";
+
+        SlocCounter.SlocCount slocCount = this.slocCounter.countStats(contents, language);
+
+        assertThat(slocCount.linesCount).isEqualTo(2);
+        assertThat(slocCount.codeCount).isEqualTo(1);
+        assertThat(slocCount.commentCount).isEqualTo(1);
+        assertThat(slocCount.blankCount).isEqualTo(1);
+    }
+
+    public void testRakefile() {
+        String language = "Rakefile";
+        String contents = "# 10 lines 4 code 2 comments 4 blanks\n" +
+                "\n" +
+                "# this is a rakefile\n" +
+                "\n" +
+                "task default: %w[test]\n" +
+                "\n" +
+                "task :test do # not counted\n" +
+                "  ruby \"test/unittest.rb\"\n" +
+                "end\n" +
+                "\n";
+
+        SlocCounter.SlocCount slocCount = this.slocCounter.countStats(contents, language);
+        assertThat(slocCount.linesCount).isEqualTo(10);
+        assertThat(slocCount.codeCount).isEqualTo(4);
+        assertThat(slocCount.commentCount).isEqualTo(2);
+        assertThat(slocCount.blankCount).isEqualTo(4);
+    }
+
+    public void testCPlusPlus() {
+        String language = "C++";
+        String contents = "/* 15 lines 7 code 4 comments 4 blanks */\n" +
+                "\n" +
+                "#include <iostream>\n" +
+                "\n" +
+                "\n" +
+                "using namespace std;\n" +
+                "\n" +
+                "/*\n" +
+                " * Simple test\n" +
+                " */\n" +
+                "int main()\n" +
+                "{\n" +
+                "    cout<<\"Hello world\"<<endl;\n" +
+                "    return 0;\n" +
+                "}\n";
+
+        SlocCounter.SlocCount slocCount = this.slocCounter.countStats(contents, language);
+        assertThat(slocCount.linesCount).isEqualTo(15);
+        assertThat(slocCount.codeCount).isEqualTo(7);
+        assertThat(slocCount.commentCount).isEqualTo(4);
+        assertThat(slocCount.blankCount).isEqualTo(4);
+    }
+
     public void testTokeiTest() {
         String language = "Rust";
         String contents = "// 39 lines 32 code 2 comments 5 blanks\n" +