Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
TBasicCommandDispatcherStrategySelector,
)
from ..commands_executor import TVimCommandsExecutor
from ..config import EDispatchersTypes, TConfigField, TVimConfig
from ..config import EDispatchersTypes, TBasicConfig, TConfigField
from ..config.getter import (
TVimByFileExtConfigValueGetter,
TVimByFileTypeConfigValueGetter,
Expand Down Expand Up @@ -43,7 +43,7 @@

class TVimCodeRunnerFactory(ICodeRunnerFactory):
def create(self) -> TCodeRunner | None:
config: TVimConfig = self._create_config()
config: TBasicConfig = self._create_config()
message_printer: TVimMessagePrinter = TVimMessagePrinter()

try:
Expand Down Expand Up @@ -73,8 +73,8 @@ def create(self) -> TCodeRunner | None:

return None

def _create_config(self) -> TVimConfig:
return TVimConfig(
def _create_config(self) -> TBasicConfig:
return TBasicConfig(
by_file_ext_field=TConfigField(
name="g:coderunner_by_file_ext",
getter=TVimByFileExtConfigValueGetter(),
Expand Down Expand Up @@ -145,7 +145,7 @@ def _create_config(self) -> TVimConfig:

def _create_command_dispatcher_strategy_selector(
self,
config: TVimConfig,
config: TBasicConfig,
file_info_extractor: TVimFileInfoExtractor,
project_info_extractor: TVimProjectInfoExtractor,
) -> TBasicCommandDispatcherStrategySelector:
Expand All @@ -172,7 +172,7 @@ def _create_command_dispatcher_strategy_selector(

def _create_file_ext_command_builders_dispatcher(
self,
config: TVimConfig,
config: TBasicConfig,
file_info_extractor: TVimFileInfoExtractor,
project_info_extractor: TVimProjectInfoExtractor,
) -> TFileExtCommandBuildersDispatcher:
Expand All @@ -186,7 +186,7 @@ def _create_file_ext_command_builders_dispatcher(

def _create_file_type_command_builders_dispatcher(
self,
config: TVimConfig,
config: TBasicConfig,
file_info_extractor: TVimFileInfoExtractor,
project_info_extractor: TVimProjectInfoExtractor,
) -> TFileTypeCommandBuildersDispatcher:
Expand All @@ -200,7 +200,7 @@ def _create_file_type_command_builders_dispatcher(

def _create_glob_command_builders_dispatcher(
self,
config: TVimConfig,
config: TBasicConfig,
file_info_extractor: TVimFileInfoExtractor,
project_info_extractor: TVimProjectInfoExtractor,
) -> TGlobCommandBuildersDispatcher:
Expand Down
2 changes: 1 addition & 1 deletion python_coderunner/src/commands_executor/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

class ICommandsExecutor(ABC):
"""
Сlass for executing a string command only.
Class for executing a string command only.
"""

@abstractmethod
Expand Down
1 change: 0 additions & 1 deletion python_coderunner/src/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
from .config_field import TConfigField
from .exceptions import ConfigFieldUndefinedValueError, ConfigFieldValidationError
from .interface import EDispatchersTypes, IConfig
from .vim_config import TVimConfig
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
from typing import Any
from typing import Any, ClassVar

from ..interface import EDispatchersTypes
from .exceptions import ValidationError
from .interface import IValidator


class TDispatchersOrderValidator(IValidator[list[EDispatchersTypes]]):
def __init__(self) -> None:
self.allowed_dispatcher_types: set[EDispatchersTypes] = set(EDispatchersTypes)
_ALLOWED_DISPATCHER_TYPES: ClassVar[set[EDispatchersTypes]] = set(EDispatchersTypes)

def __call__(self, value: Any) -> list[EDispatchersTypes]:
if not isinstance(value, list):
raise ValidationError(f"Invalid dispatcher order container type: {type(value)}.")

if invalid_items := [v for v in value if v not in self.allowed_dispatcher_types]:
if invalid_items := [v for v in value if v not in self._ALLOWED_DISPATCHER_TYPES]:
raise ValidationError(f"Invalid dispatcher types values: {', '.join(map(str, invalid_items))}.")

return value
5 changes: 0 additions & 5 deletions python_coderunner/src/config/vim_config.py

This file was deleted.

4 changes: 2 additions & 2 deletions python_coderunner/tests/unit/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
from src.config import (
EDispatchersTypes,
IConfig,
TBasicConfig,
TConfigField,
TVimConfig,
)
from src.config.getter import (
IConfigValueGetter,
Expand Down Expand Up @@ -56,7 +56,7 @@ def fixture_config(request: pytest.FixtureRequest) -> IConfig:

@pytest.fixture
def fixture_vim_config() -> IConfig:
return TVimConfig(
return TBasicConfig(
by_file_ext_field=TConfigField(
name="g:coderunner_by_file_ext",
getter=TVimByFileExtConfigValueGetter(),
Expand Down