fix: no multi empty line when a variable finish by a multi line description
This commit is contained in:
parent
919775ba27
commit
d52401b5a7
3 changed files with 48 additions and 10 deletions
|
|
@ -256,9 +256,9 @@ class RougailOutputFormatter:
|
||||||
path_len -= 1
|
path_len -= 1
|
||||||
column = path_len * 2 + len(name) + add_column
|
column = path_len * 2 + len(name) + add_column
|
||||||
if self.remaining:
|
if self.remaining:
|
||||||
description = family["description"] + "\n\n"
|
description = family["description"].strip() + "\n\n"
|
||||||
else:
|
else:
|
||||||
description = family["description"]
|
description = family["description"].strip()
|
||||||
ret.yaml_add_eol_comment(description, name, column=column)
|
ret.yaml_add_eol_comment(description, name, column=column)
|
||||||
else:
|
else:
|
||||||
self.add_space(family)
|
self.add_space(family)
|
||||||
|
|
@ -354,7 +354,7 @@ class RougailOutputFormatter:
|
||||||
ret[name] = default
|
ret[name] = default
|
||||||
add_column += len(str(default)) + 1
|
add_column += len(str(default)) + 1
|
||||||
if "description" in variable:
|
if "description" in variable:
|
||||||
description = variable["description"]
|
description = variable["description"].strip()
|
||||||
if self.remaining and (not multi or not default):
|
if self.remaining and (not multi or not default):
|
||||||
description += "\n\n"
|
description += "\n\n"
|
||||||
path_len = path.count(".")
|
path_len = path.count(".")
|
||||||
|
|
@ -383,11 +383,11 @@ class RougailOutputFormatter:
|
||||||
return typ, parent, param
|
return typ, parent, param
|
||||||
|
|
||||||
param = list(obj)[-1]
|
param = list(obj)[-1]
|
||||||
if isinstance(obj[param], ScalarString):
|
typ, parent, param = _get_last_obj(obj[param], obj, param, "map")
|
||||||
|
if isinstance(parent[param], ScalarString):
|
||||||
enter = "\n"
|
enter = "\n"
|
||||||
else:
|
else:
|
||||||
enter = "\n\n"
|
enter = "\n\n"
|
||||||
typ, parent, param = _get_last_obj(obj[param], obj, param, "map")
|
|
||||||
if typ == "seq":
|
if typ == "seq":
|
||||||
func = parent.yaml_key_comment_extend
|
func = parent.yaml_key_comment_extend
|
||||||
else:
|
else:
|
||||||
|
|
@ -430,9 +430,9 @@ class RougailOutputFormatter:
|
||||||
jinja["return_type"] = value.return_type
|
jinja["return_type"] = value.return_type
|
||||||
if value.description:
|
if value.description:
|
||||||
if "\n" in value.description:
|
if "\n" in value.description:
|
||||||
jinja["description"] = LiteralScalarString(value.description)
|
jinja["description"] = LiteralScalarString(value.description.strip())
|
||||||
else:
|
else:
|
||||||
jinja["description"] = value.description
|
jinja["description"] = value.description.strip()
|
||||||
if value.params:
|
if value.params:
|
||||||
jinja["params"] = self.object_to_yaml(
|
jinja["params"] = self.object_to_yaml(
|
||||||
"params", type_, value.params, multi, object_path
|
"params", type_, value.params, multi, object_path
|
||||||
|
|
@ -471,9 +471,9 @@ class RougailOutputFormatter:
|
||||||
del variable["type"]
|
del variable["type"]
|
||||||
if value.description:
|
if value.description:
|
||||||
if "\n" in value.description:
|
if "\n" in value.description:
|
||||||
variable["description"] = LiteralScalarString(value.description)
|
variable["description"] = LiteralScalarString(value.description.strip())
|
||||||
else:
|
else:
|
||||||
variable["description"] = value.description
|
variable["description"] = value.description.strip()
|
||||||
return variable
|
return variable
|
||||||
elif isinstance(value, Param):
|
elif isinstance(value, Param):
|
||||||
param_attributes = self.get_attributes(
|
param_attributes = self.get_attributes(
|
||||||
|
|
@ -503,7 +503,7 @@ class RougailOutputFormatter:
|
||||||
elif type_ == "port" and isinstance(value, str) and value.isnumeric():
|
elif type_ == "port" and isinstance(value, str) and value.isnumeric():
|
||||||
return int(value)
|
return int(value)
|
||||||
elif key == "help" and "\n" in value:
|
elif key == "help" and "\n" in value:
|
||||||
return LiteralScalarString(value)
|
return LiteralScalarString(value.strip())
|
||||||
return value
|
return value
|
||||||
|
|
||||||
def calc_variable_path(self, object_path, variable_path):
|
def calc_variable_path(self, object_path, variable_path):
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
%YAML 1.2
|
||||||
|
---
|
||||||
|
version: 1.1
|
||||||
|
|
||||||
|
var1: # a first variable
|
||||||
|
|
||||||
|
var2:
|
||||||
|
description: a second variable
|
||||||
|
default:
|
||||||
|
variable: _.var1
|
||||||
|
description: |-
|
||||||
|
value
|
||||||
|
of
|
||||||
|
a
|
||||||
|
variable!
|
||||||
|
|
||||||
|
var3: # a new variable
|
||||||
|
...
|
||||||
20
tests/results/40_0leadership_reduce/rougail/00-base.yml
Normal file
20
tests/results/40_0leadership_reduce/rougail/00-base.yml
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
%YAML 1.2
|
||||||
|
---
|
||||||
|
version: 1.1
|
||||||
|
|
||||||
|
leadership:
|
||||||
|
description: a leadership
|
||||||
|
type: leadership
|
||||||
|
|
||||||
|
leader:
|
||||||
|
description: a leader
|
||||||
|
test:
|
||||||
|
- val1
|
||||||
|
- val2
|
||||||
|
default:
|
||||||
|
- value_1
|
||||||
|
- value_2
|
||||||
|
- value_3
|
||||||
|
|
||||||
|
follower: # a follower
|
||||||
|
...
|
||||||
Loading…
Reference in a new issue