#46 improved JCP comment line remover, now removing comments for jcp markers

Author: raydac

jcp/src/main/java/com/igormaznitsa/jcp/removers/JcpCommentLineRemover.java

@@ -21,6 +21,9 @@
 
 package com.igormaznitsa.jcp.removers;
 
+import static com.igormaznitsa.jcp.directives.AbstractDirectiveHandler.PREFIX_FOR_KEEPING_LINES;
+import static com.igormaznitsa.jcp.directives.AbstractDirectiveHandler.PREFIX_FOR_KEEPING_LINES_PROCESSED_DIRECTIVES;
+
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
@@ -71,18 +74,35 @@ public Writer process() throws IOException {
           switch (chr) {
             case '$':
             case '#': {
-              jcpBuffer.setLength(0);
-              skipTillNextString();
-              state = STATE_NORMAL;
-            }
-            break;
-            default: {
-              if (Character.isSpaceChar(chr) && this.whiteSpaceAllowed) {
-                jcpBuffer.append((char) chr);
+              if (jcpBuffer.toString().equals("//") ||
+                  (jcpBuffer.substring(2).trim().isEmpty() && this.whiteSpaceAllowed)) {
+                jcpBuffer.setLength(0);
+                skipTillNextString();
+                state = STATE_NORMAL;
               } else {
                 this.dstWriter.write(jcpBuffer.toString());
                 this.dstWriter.write(chr);
+                this.copyTillNextString();
+              }
+            }
+            break;
+            default: {
+              jcpBuffer.append((char) chr);
+              final String currentBuffer = jcpBuffer.toString();
+              if (currentBuffer.startsWith(PREFIX_FOR_KEEPING_LINES) ||
+                  currentBuffer.startsWith(PREFIX_FOR_KEEPING_LINES_PROCESSED_DIRECTIVES)) {
+                jcpBuffer.setLength(0);
+                this.skipTillNextString();
+                state = STATE_NORMAL;
+              } else if (chr == '\n') {
+                this.dstWriter.write(currentBuffer);
+                jcpBuffer.setLength(0);
+                state = STATE_NORMAL;
+              } else if ((!PREFIX_FOR_KEEPING_LINES.startsWith(currentBuffer) &&
+                  !PREFIX_FOR_KEEPING_LINES_PROCESSED_DIRECTIVES.startsWith(currentBuffer)) &&
+                  (!this.whiteSpaceAllowed || !Character.isSpaceChar(chr))) {
                 jcpBuffer.setLength(0);
+                this.dstWriter.write(currentBuffer);
                 this.copyTillNextString();
                 state = STATE_NORMAL;
               }

jcp/src/test/java/com/igormaznitsa/jcp/removers/JcpCommentLineRemoverTest.java

@@ -93,6 +93,21 @@ public void testCommentedJcpDirective() throws Exception {
     }
   }
 
+  @Test
+  public void testCommentedJcpDirectiveAndJcpMarkedLines() throws Exception {
+    this.assertCommentRemove(
+        "/\n//\n// JCP> test\n//JCP test\n//JCP! some jcp\n/** some multiline //$  //# test\nwith jcp directives*/\n//$ some\n//JCP> some line \n//$$$ some two\n// hello world\n////#if DEBUG\nSystem.out.println(\"DEBUG\");\n//#else\nSystem.out.println(\"RELEASE\");\n//#endif\n// end\n//JCP",
+        "/\n//\n// JCP> test\n//JCP test\n\n/** some multiline //$  //# test\nwith jcp directives*/\n\n\n\n// hello world\n////#if DEBUG\nSystem.out.println(\"DEBUG\");\n\nSystem.out.println(\"RELEASE\");\n\n// end\n//JCP"
+    );
+
+    if (this.whiteSpaced) {
+      this.assertCommentRemove(
+          "/\n//\n// JCP> test\n//JCP test\n//JCP! some jcp\n/** some multiline //$  //# test\nwith jcp directives*/\n//  $ some\n//JCP> some line \n//    $$$ some two\n// hello world\n////  #if DEBUG\nSystem.out.println(\"DEBUG\");\n//   # else\nSystem.out.println(\"RELEASE\");\n//   #endif\n// end\n//JCP",
+          "/\n//\n// JCP> test\n//JCP test\n\n/** some multiline //$  //# test\nwith jcp directives*/\n\n\n\n// hello world\n////  #if DEBUG\nSystem.out.println(\"DEBUG\");\n\nSystem.out.println(\"RELEASE\");\n\n// end\n//JCP"
+      );
+    }
+  }
+
   @Test
   public void testLineCommentInTheEnd() throws Exception {
     this.assertCommentRemove(