From e89ac46453a9b80d27e1408535f58dbf19626aea Mon Sep 17 00:00:00 2001 From: "d.kovalenko" Date: Fri, 13 Nov 2026 22:17:15 +0300 Subject: [PATCH] model_utils: File__FindSimpleOption is updated When enterIntoIncludes is false, findCtx is not required. --- src/core/model_utils.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/model_utils.py b/src/core/model_utils.py index bdf936e..f7cc1d2 100644 --- a/src/core/model_utils.py +++ b/src/core/model_utils.py @@ -392,19 +392,23 @@ def reg_file( # -------------------------------------------------------------------- @staticmethod def File__FindSimpleOption( - findCtx: tagFindCtx, + findCtx: typing.Optional[tagFindCtx], fileData: PgCfgModel__FileData, optionName: str, enterIntoIncludes: bool, ) -> typing.Optional[PgCfgModel__OptionData]: - assert type(findCtx) is __class__.tagFindCtx + assert not enterIntoIncludes or type(findCtx) is __class__.tagFindCtx assert type(fileData) is PgCfgModel__FileData assert type(fileData.m_Lines) is list assert type(optionName) is str assert type(enterIntoIncludes) is bool - if not findCtx.reg_file(fileData.m_Path): - return None + if not enterIntoIncludes: + pass + else: + assert findCtx is not None + if not findCtx.reg_file(fileData.m_Path): + return None stack: typing.List[ typing.Tuple[ @@ -461,6 +465,7 @@ def File__FindSimpleOption( # might be overridden by that included file. return None # <--------- FAIL + assert findCtx is not None if not findCtx.reg_file(firstItem.m_Element.m_File.m_Path): continue