setIndented(false) also removes new lines from text in views

[shimikano]

Similarly to #46, I tried to disable indentation in conjunction with a <textarea> element to avoid unwanted whitespace.

However, I noticed that setIndented(false) for views also removes new lines in text() blocks. This is problematic, e.g., for <script> tags. The following test fails, with the rendered view containing no new lines at all:

  @Test
  public void viewWithNoIndent() {
    var view = HtmlFlow.view(page -> {
      page
        .div()
          .textarea()
            .text("Sample text\nfoo\nbar")
          .__()
          .script()
            .text("""
              // some comment
              console.log('Hello world');""")
          .__()
        .__();
    }).setIndented(false);

    var actual = view.render();

    var expected = """
      <div><textarea>Sample text
      foo
      bar</textarea><script>// some comment
      console.log('Hello world');</script></div>""";

    assertEquals(expected, actual);
  }

For docs, this seems not to be the case (the test passes):

  @Test
  public void docWithNoIndent() {
    var stringBuilder = new StringBuilder();
    HtmlFlow.doc(stringBuilder).setIndented(false)
      .div()
        .textarea()
          .text("Sample text\nfoo\nbar")
        .__()
        .script()
          .text("""
            // some comment
            console.log('Hello world');""")
          .__()
      .__();

    var actual = stringBuilder.toString();

    var expected = """
      <div><textarea>Sample text
      foo
      bar</textarea><script>// some comment
      console.log('Hello world');</script></div>""";

    assertEquals(expected, actual);
  }

Is the view behavior a bug or is there another way to preserve the new lines in text() blocks?

Thank you very much.

[fmcarvalho]

Well, it seems the way we are providing the setIndentation for HtmView is not correct. The way HtmlDoc and HtmView work are completely different. Indentation in HtmlDoc is made though the oldest newlineAndIndent():

HtmlFlow/src/main/java/htmlflow/visitor/HtmlVisitor.java

Line 122 in 4aac871

public final void newlineAndIndent(){

Whereas HtmView is always built with indentation set to true, and later on render we decide wether we want to remove it. The bug is on the following lines from HtmlContinuationSyncStatic class:

String block = v.isIndented
    ? staticHtmlBlock
    : stream(staticHtmlBlock.split(lineSeparator())).map(String::trim).collect(joining());

We are wrongly removing all line separators. To fix that we have to remove this code. Also we have to change the way we were building an HtmlView. Basically, whenever we call setIndent(...)we have to run the preprocessing(...) from the scratch with the correct indentation flag. And to do it we need to keep the HtmTemplate function associated with the HtmlView.

Is not very complicated and I think it has no impact on performance because all that will be made to run on preprocessing. Moreover I never liked that if/else (i.e ternary) on HtmlContinuationSyncStatic.

However this refactoring includes a couple of steps and I need to review all this again. I hope to dedicate some time to it at the end of this week.

Thank you,
Miguel

[shimikano]

Thank you, Miguel, for your efforts 🙏

[fmcarvalho]

Solved on new release 4.2