refactoring

Author: raydac

jcp/src/main/java/com/igormaznitsa/jcp/containers/FileInfoContainer.java

@@ -44,6 +44,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import lombok.Data;
 
 /**
@@ -447,28 +448,42 @@ private void flushTextBufferForRemovedComments(
 
     if (textBuffer.length() > 0) {
       final List<CommentTextProcessor> processors = context.getCommentTextProcessors();
-      final String origText = textBuffer.toString();
+      final String textToProcess = textBuffer.toString();
       textBuffer.setLength(0);
-      String text = origText;
+      String text = textToProcess;
 
       if (!processors.isEmpty()) {
-        processors.forEach(x -> {
-          try {
-            final FilePositionInfo filePositionInfo =
-                new FilePositionInfo(this.sourceFile, stringIndex);
-            final String result = x.processUncommentedText(
-                firstUncommentLine == null ? 0 : firstUncommentLine.getKey().length(), origText,
-                this, filePositionInfo, context, state);
-            textBuffer.append(result);
-          } catch (Exception ex) {
-            throw new PreprocessorException(
-                "Error during external comment text processor call",
-                origText, state.makeIncludeStack(), ex);
-          }
-        });
+        final FilePositionInfo filePositionInfo =
+            new FilePositionInfo(this.sourceFile, stringIndex);
+        final int indent = firstUncommentLine == null ? 0 : firstUncommentLine.getKey().length();
+
+        final List<String> results = processors
+            .stream()
+            .filter(x -> x.isEnabled(this, filePositionInfo, context, state))
+            .map(x -> {
+              try {
+                return x.processUncommentedText(
+                    indent,
+                    textToProcess,
+                    this,
+                    filePositionInfo,
+                    context,
+                    state
+                );
+              } catch (Exception ex) {
+                throw new PreprocessorException(
+                    "Error during external comment text processor call: " +
+                        x.getClass().getCanonicalName(),
+                    textToProcess, state.makeIncludeStack(), ex);
+              }
+            }).collect(Collectors.toList());
 
-        text = textBuffer.toString();
-        textBuffer.setLength(0);
+        if (results.isEmpty()) {
+          context.logDebug("No any result from processors for text block at " + filePositionInfo);
+          text = textToProcess;
+        } else {
+          text = String.join("", results);
+        }
       }
       resetablePrinter.print(text);
     }

jcp/src/main/java/com/igormaznitsa/jcp/context/CommentTextProcessor.java

@@ -16,6 +16,7 @@ public interface CommentTextProcessor extends PreprocessorContextListener {
 
   /**
    * Process uncommented text detected in //$ or //$$ sections. If processing not needed then the provided text must be returned.
+   * Returned text should contain EOL in the end because will be printed into result directly.
    *
    * @param recommendedIndent indent to be recommended for the processed text if it will be processed
    * @param uncommentedText   the text which was uncommented and needs processing, must not be null
@@ -29,7 +30,22 @@ public interface CommentTextProcessor extends PreprocessorContextListener {
   String processUncommentedText(
       int recommendedIndent,
       String uncommentedText,
-      FileInfoContainer fileContainer, FilePositionInfo positionInfo,
+      FileInfoContainer fileContainer,
+      FilePositionInfo positionInfo,
       PreprocessorContext context,
       PreprocessingState state);
+
+  /**
+   * Returns flag that the preprocessor is enabled and can be called. It gets full info about current context and file so can make decision on fly.
+   * It will be called before every processor call.
+   *
+   * @return true if the preprocessor allowed, false if not
+   * @since 7.2.1
+   */
+  boolean isEnabled(
+      FileInfoContainer fileContainer,
+      FilePositionInfo positionInfo,
+      PreprocessorContext context,
+      PreprocessingState state
+  );
 }

jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionBINFILE.java

@@ -180,7 +180,6 @@ public ValueType[][] getAllowedArgumentTypes() {
   }
 
   @Override
-
   public ValueType getResultType() {
     return ValueType.STRING;
   }

jcp/src/test/java/com/igormaznitsa/jcp/directives/SpecialDirectivesBlockTest.java

@@ -61,6 +61,12 @@ public void onContextStopped(PreprocessorContext context, Throwable error) {
         }
       }
 
+      @Override
+      public boolean isEnabled(FileInfoContainer fileContainer, FilePositionInfo positionInfo,
+                               PreprocessorContext context, PreprocessingState state) {
+        return true;
+      }
+
       @Override
       public String processUncommentedText(int recommendedIndent, String uncommentedText,
                                            FileInfoContainer fileContainer,

jcp/src/test/java/com/igormaznitsa/jcp/directives/SpecialDirectivesTest.java

@@ -59,6 +59,12 @@ public void onContextStopped(PreprocessorContext context, Throwable error) {
         }
       }
 
+      @Override
+      public boolean isEnabled(FileInfoContainer fileContainer, FilePositionInfo positionInfo,
+                               PreprocessorContext context, PreprocessingState state) {
+        return true;
+      }
+
       @Override
       public String processUncommentedText(int recommendedIndent, String uncommentedText,
                                            FileInfoContainer fileContainer,