Skip to content

Commit 6b5fc3a

Browse files
author
Denis
authored
fix: properly remove block comments from templates (#10701)
* fix: properly remove block comments from templates fixes #10673
1 parent 34de0b1 commit 6b5fc3a

3 files changed

Lines changed: 31 additions & 3 deletions

File tree

‎flow-lit-template/src/test/java/com/vaadin/flow/component/littemplate/BundleLitParserTest.java‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,26 @@ public void parseTemplate() throws IOException {
3636
Assert.assertEquals("", "vaadin-split-layout",
3737
element.getElementsByTag("template").get(0).child(0).tagName());
3838
}
39-
}
39+
40+
@Test
41+
public void parseTemplateWithComments_commentsProperlyIgnored()
42+
throws IOException {
43+
final Element element = BundleLitParser.parseLitTemplateElement("in.ts",
44+
// @formatter:off
45+
"import { html, LitElement } from 'lit-element';\n"
46+
+ "\n"
47+
+ "export class HelloLit extends LitElement {\n"
48+
+ " /* comment **/\n"
49+
+ "\n"
50+
+ " render() {\n"
51+
+ " return html` <div>Some content</div>`;\n"
52+
+ " }\n"
53+
+ "}\n"
54+
+ "\n"
55+
+ "customElements.define('hello-lit', HelloLit);");
56+
// @formatter:on
57+
58+
Assert.assertEquals(2, element.getAllElements().size());
59+
Assert.assertEquals(1, element.getElementsByTag("div").size());
60+
}
61+
}

‎flow-server/src/main/java/com/vaadin/flow/internal/StringUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public final static String removeComments(String code) {
8181
}
8282
break;
8383
case IN_BLOCK_COMMENT:
84-
if (character.equals("*") && scanner.hasNext()
85-
&& scanner.next().equals("/")) {
84+
if (character.equals("*") && scanner.hasNext("/")) {
85+
scanner.next();
8686
state = State.NORMAL;
8787
break;
8888
}

‎flow-server/src/test/java/com/vaadin/flow/internal/StringUtilTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,10 @@ public void commentRemoval_emojiInString_removalDoesnotThrowResultIsTheSame() {
6363
Assert.assertEquals(initialTemplate, template);
6464
}
6565

66+
@Test
67+
public void removeComments_commentsWithAsterisksInside_commentIsRemoved() {
68+
String result = StringUtil.removeComments("/* comment **/ ;");
69+
Assert.assertEquals(result, " ;");
70+
}
71+
6672
}

0 commit comments

Comments
 (0)