Adding a test to validate line numbers and fix for multiline strings #217
Conversation
### What's done: - simple test
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| else -> | ||
| throw InternalDecodingException( | ||
| "Node of type [${node::class}] should not be processed in TomlDecoder.decodeValue(): <${node.content}>." | ||
| "Node of type [${node::class}] should not be processed in TomlDecoder.decodeValue(): <${node}>." |
Check failure
Code scanning / ktlint
[STRING_TEMPLATE_CURLY_BRACES] string template has redundant curly braces: ${node}
| @@ -328,6 +292,10 @@ | |||
| .writeNode(this) | |||
| .replace(" = ", "=") | |||
|
|
|||
| internal fun print(emitLine: Boolean = false): String = | |||
| "${this::class.simpleName} ($this)${if (emitLine) "[line:${this.lineNo}]" else ""}\n" | |||
Check failure
Code scanning / ktlint
[TOO_MANY_BLANK_LINES] too many consecutive blank lines: do not use more than two consecutive blank lines
| node.children.forEach { child -> | ||
| prettyPrint(child, result, level + 1) | ||
| prettyPrint(child, result, emitLine, level + 1, ) |
Check failure
Code scanning / ktlint
[WRONG_WHITESPACE] incorrect usage of whitespaces for code separation: ) should have 0 space(s) before, but has 1 space(s) before
| else -> | ||
| throw InternalDecodingException( | ||
| "Node of type [${node::class}] should not be processed in TomlDecoder.decodeValue(): <${node.content}>." | ||
| "Node of type [${node::class}] should not be processed in TomlDecoder.decodeValue(): <${node}>." |
Check failure
Code scanning / ktlint
[STRING_TEMPLATE_CURLY_BRACES] string template has redundant curly braces: ${node}
| @@ -328,6 +292,10 @@ | |||
| .writeNode(this) | |||
| .replace(" = ", "=") | |||
|
|
|||
| internal fun print(emitLine: Boolean = false): String = | |||
| "${this::class.simpleName} ($this)${if (emitLine) "[line:${this.lineNo}]" else ""}\n" | |||
Check failure
Code scanning / ktlint
[TOO_MANY_BLANK_LINES] too many consecutive blank lines: do not use more than two consecutive blank lines
| node.children.forEach { child -> | ||
| prettyPrint(child, result, level + 1) | ||
| prettyPrint(child, result, emitLine, level + 1, ) |
Check failure
Code scanning / ktlint
[WRONG_WHITESPACE] incorrect usage of whitespaces for code separation: ) should have 0 space(s) before, but has 1 space(s) before
### What's done: - On multiline strings we forgot to update isMultiline flag while decoding and parsing - Adding extra info to prettyPrint - Adding a test for validation of line numbers - Removing deprecated 'content' from the TomlNode
orchestr7
force-pushed
the
bugfix/lineno_literal
branch
from
5ef7f11
to
c92b3e0
Compare
| | - TomlArrayOfTables ([[a.b]])[line:10] | ||
| | - TomlArrayOfTablesElement (technical_node)[line:10] | ||
| | - TomlKeyValuePrimitive (test=1)[line:11] | ||
| | - TomlKeyValuePrimitive (mls=''' 1 |
There was a problem hiding this comment.
that's a little bit weird, cause it looks like we forget to put a newline after multiline string delimiters
There was a problem hiding this comment.
@NightEule5 while we encode the string, I think it is necessary for the user to have a proper formatting of multiline strings. Now we have the following:
a = """1
2
3"""
I think (even the TOML spec is confusing here) that we should add a newline there (it will be more convenient):
a = """
1
2
3
"""
There was a problem hiding this comment.
And of course I have forgotten to trim spaces before the quotes ''' while decoding 😢
#221
ktoml-core/src/commonTest/kotlin/com/akuleshov7/ktoml/parsers/SetLineNoTest.kt
Show resolved
Hide resolved
### What's done: - Added newline alignment for multiline strings
orchestr7
force-pushed
the
bugfix/lineno_literal
branch
from
41ab7a0
to
ef6e3d9
Compare
| @@ -180,7 +180,9 @@ public abstract class TomlEmitter(config: TomlOutputConfig) { | |||
| val quotes = if (isLiteral) "'''" else "\"\"\"" | |||
|
|
|||
| emit(quotes) | |||
| .emitNewLine() | |||
There was a problem hiding this comment.
@NightEule5 can you please review it, and remind me please if I have forgotten something?
What's done: