Commit e342d7d2 authored by Madhura Bhave's avatar Madhura Bhave

Fix processing of line immediately after # in properties file

Fixes gh-24158
parent c86ce271
......@@ -168,8 +168,10 @@ class OriginTrackedPropertiesLoader {
result = result && readAndExpect(reader, reader::isHyphenCharacter);
result = result && readAndExpect(reader, reader::isHyphenCharacter);
result = result && readAndExpect(reader, reader::isHyphenCharacter);
reader.read();
reader.skipWhitespace();
if (!reader.isEndOfLine()) {
reader.read();
reader.skipWhitespace();
}
return result && reader.isEndOfLine();
}
......
......@@ -293,6 +293,12 @@ class OriginTrackedPropertiesLoaderTests {
assertThat(this.documents.size()).isEqualTo(1);
}
@Test
void getPropertyAfterPoundCharacter() {
OriginTrackedValue value = getFromFirst("test-line-after-empty-pound");
assertThat(getValue(value)).isEqualTo("abc");
}
private OriginTrackedValue getFromFirst(String key) {
return this.documents.get(0).asMap().get(key);
}
......
......@@ -43,3 +43,6 @@ test-iso8859-1-chars=
test-with-trailing-space= trailing
test-with-escaped-trailing-space= trailing\
#
test-line-after-empty-pound=abc
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment