diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py index dc94d6462..5d529bf27 100644 --- a/src/rougail/annotator.py +++ b/src/rougail/annotator.py @@ -1064,7 +1064,8 @@ class ConstraintAnnotator: fill = fills[idx] # test if it's redefined calculation if fill.target in targets and not fill.redefine: - raise DictConsistencyError(_(f"A fill already exists for the target: {fill.target}")) + xmlfiles = self.objectspace.display_xmlfiles(fill.xmlfiles) + raise DictConsistencyError(_(f'A fill already exists for the target of "{fill.target}" created in {xmlfiles}')) targets.append(fill.target) # if fill.name not in self.functions: diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py index ea83a7cc2..eccf50e47 100644 --- a/src/rougail/objspace.py +++ b/src/rougail/objspace.py @@ -323,8 +323,7 @@ class CreoleObjSpace: ) -> str: if len(xmlfiles) == 1: return '"' + xmlfiles[0] + '"' - else: - return '"' + '", "'.join(xmlfiles[:-1]) + '"' + ' and ' + '"' + xmlfiles[-1] + '"' + return '"' + '", "'.join(xmlfiles[:-1]) + '"' + ' and ' + '"' + xmlfiles[-1] + '"' def create_tree_structure(self, space, diff --git a/tests/dictionaries/80redefine_double_error/00-base.xml b/tests/dictionaries/80redefine_double_error/00-base.xml new file mode 100644 index 000000000..c973121f3 --- /dev/null +++ b/tests/dictionaries/80redefine_double_error/00-base.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + diff --git a/tests/dictionaries/80redefine_double_error/01-base.xml b/tests/dictionaries/80redefine_double_error/01-base.xml new file mode 100644 index 000000000..8a75dbe3d --- /dev/null +++ b/tests/dictionaries/80redefine_double_error/01-base.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/tests/dictionaries/80redefine_double_error/02-base.xml b/tests/dictionaries/80redefine_double_error/02-base.xml new file mode 100644 index 000000000..fb649e931 --- /dev/null +++ b/tests/dictionaries/80redefine_double_error/02-base.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/tests/dictionaries/80redefine_double_error/__init__.py b/tests/dictionaries/80redefine_double_error/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index 2b7251211..15b6be2bb 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -29,7 +29,8 @@ excludes = set([]) test_ok -= excludes test_raise -= excludes #test_ok = ['40condition_base_add'] -#test_raise = [] +#test_ok = [] +#test_raise = ['80redefine_double_error'] ORI_DIR = getcwd()