Skip to content

Commit 47020bc

Browse files
andrei-levitskiiKamil Khamitov
authored andcommitted
Give STYLE_CPP_YT check a unique name
Give STYLE_CPP_YT check a unique name commit_hash:ffd085916103e6312279f308ac65ea16c6c2a07b
1 parent 77993fb commit 47020bc

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

build/plugins/_dart_fields.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -628,11 +628,15 @@ def python_configs(cls, unit, flat_args, spec_args):
628628

629629
# default config
630630
linter_name = spec_args['NAME'][0]
631-
config = spec_args['CONFIGS'][0]
631+
default_configs_path = spec_args['CONFIGS'][0]
632+
assert_file_exists(unit, default_configs_path)
633+
config = get_linter_configs(unit, default_configs_path).get(linter_name)
634+
if not config:
635+
message = f"Default config in {default_configs_path} can't be found for a linter {linter_name}"
636+
ymake.report_configure_error(message)
637+
raise DartValueError()
632638
assert_file_exists(unit, config)
633-
cfg = get_linter_configs(unit, config)[linter_name]
634-
assert_file_exists(unit, cfg)
635-
resolved_configs.append(cfg)
639+
resolved_configs.append(config)
636640
if linter_name in ('flake8', 'py2_flake8'):
637641
resolved_configs.extend(spec_args.get('FLAKE_MIGRATIONS_CONFIG', []))
638642
return {cls.KEY: serialize_list(resolved_configs)}
@@ -652,9 +656,13 @@ def cpp_configs(cls, unit, flat_args, spec_args):
652656

653657
# default config
654658
linter_name = spec_args['NAME'][0]
655-
config = spec_args.get('CONFIGS')[0]
656-
assert_file_exists(unit, config)
657-
config = get_linter_configs(unit, config)[linter_name]
659+
default_configs_path = spec_args.get('CONFIGS')[0]
660+
assert_file_exists(unit, default_configs_path)
661+
config = get_linter_configs(unit, default_configs_path).get(linter_name)
662+
if not config:
663+
message = f"Default config in {default_configs_path} can't be found for a linter {linter_name}"
664+
ymake.report_configure_error(message)
665+
raise DartValueError()
658666
assert_file_exists(unit, config)
659667
return {cls.KEY: serialize_list([config])}
660668

build/plugins/lib/test_const/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ class PythonLinterName(Enum):
448448

449449
class CppLinterName(Enum):
450450
ClangFormat = "clang_format"
451+
ClangFormatYT = "clang_format_yt"
451452

452453

453454
class DefaultLinterConfig(Enum):
@@ -457,6 +458,7 @@ class DefaultLinterConfig(Enum):
457458

458459
LINTER_CONFIG_TYPES = {
459460
CppLinterName.ClangFormat: (".clang-format",),
461+
CppLinterName.ClangFormatYT: (".clang-format",),
460462
PythonLinterName.Black: ("pyproject.toml",),
461463
PythonLinterName.Ruff: ("pyproject.toml", "ruff.toml"),
462464
}

0 commit comments

Comments
 (0)