[refactor] fixed imports (#14)

Author: ZaharChernenko

.pre-commit-config.yaml

@@ -3,31 +3,31 @@ repos:
     hooks:
       - id: ruff
         name: ruff
-        entry: bash -c "cd python_coderunner && ruff check src/ tests/"
+        entry: bash -c "cd python_coderunner && ruff check ."
         language: system
         types: [python]
 
       - id: ruff_format
         name: ruff_format
         # not in args, because entry is bash
-        entry: bash -c "cd python_coderunner && ruff format --quiet"
+        entry: bash -c "cd python_coderunner && ruff format --quiet ."
         language: system
         types: [python]
 
       - id: isort
         name: isort
-        entry: bash -c "cd python_coderunner && isort src/ tests/"
+        entry: bash -c "cd python_coderunner && isort ."
         language: system
         types: [python]
 
       - id: mypy
         name: mypy
-        entry: bash -c "cd python_coderunner && mypy src/ tests/"
+        entry: bash -c "cd python_coderunner && mypy ."
         language: system
         types: [python]
 
       - id: pylint
         name: pylint
-        entry: bash -c "cd python_coderunner && pylint src/ tests/"
+        entry: bash -c "cd python_coderunner && pylint ."
         language: system
         types: [python]

autoload/coderunner.vim

@@ -61,11 +61,12 @@ def coderunner_on_exit():
     coderunner.on_exit()
 
 
-root_folder_path: str = os.path.dirname(vim.eval("s:script_folder_path"))
-sys.path[0:0] = [os.path.join(root_folder_path, "python_coderunner")]
+sys.path.insert(0, os.path.dirname(vim.eval("s:script_folder_path")))
 try:
-    from src.coderunner import TCodeRunner
-    from src.coderunner_builder import TVimCodeRunnerBuilder
+    from python_coderunner.coderunner import TCodeRunner
+    from python_coderunner.coderunner_builder import TVimCodeRunnerBuilder
+
+
     coderunner: TCodeRunner = TVimCodeRunnerBuilder().build()
 except Exception as error:
     vim.command("redraw | echohl ErrorMsg")

python_coderunner/__init__.py

@@ -0,0 +1 @@
+from .coderunner import TCodeRunner

python_coderunner/coderunner/__init__.py

@@ -1,13 +1,13 @@
 from typing import Callable, Optional
 
-from src.command_builder import ICommandBuilder
-from src.command_dispatcher_strategy_selector import (
+from ..command_builder import ICommandBuilder
+from ..command_dispatcher_strategy_selector import (
     TBasicCommandDispatcherStrategySelector,
 )
-from src.commands_executor import ICommandsExecutor
-from src.config_manager import TBasicConfigManager
-from src.editor_service_for_coderunner import TBasicEditorServiceForCodeRunner
-from src.message_printer import IMessagePrinter
+from ..commands_executor import ICommandsExecutor
+from ..config_manager import TBasicConfigManager
+from ..editor_service_for_coderunner import TBasicEditorServiceForCodeRunner
+from ..message_printer import IMessagePrinter
 
 
 class TCodeRunner:

…_coderunner/src/coderunner/coderunner.py …thon_coderunner/coderunner/coderunner.pypython_coderunner/src/coderunner/coderunner.py renamed to python_coderunner/coderunner/coderunner.py python_coderunner/src/coderunner/coderunner.py renamed to python_coderunner/coderunner/coderunner.py

@@ -0,0 +1,2 @@
+from .interface import ICodeRunnerBuilder
+from .vim_coderunner_builder import TVimCodeRunnerBuilder

python_coderunner/coderunner_builder/__init__.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Optional
 
-from src.coderunner import TCodeRunner
+from ..coderunner import TCodeRunner
 
 
 class ICodeRunnerBuilder(ABC):

…nner/src/coderunner_builder/interface.py …derunner/coderunner_builder/interface.pypython_coderunner/src/coderunner_builder/interface.py renamed to python_coderunner/coderunner_builder/interface.py python_coderunner/src/coderunner_builder/interface.py renamed to python_coderunner/coderunner_builder/interface.py

@@ -2,29 +2,29 @@
 import re
 from typing import Dict, Optional
 
-from src.coderunner import TCodeRunner
-from src.coderunner_builder.interface import ICodeRunnerBuilder
-from src.command_builder import TInterpolatorCommandBuilder
-from src.command_builders_dispatcher import (
+from ..coderunner import TCodeRunner
+from ..command_builder import TInterpolatorCommandBuilder
+from ..command_builders_dispatcher import (
     TFileExtCommandBuildersDispatcher,
     TFileTypeCommandBuildersDispatcher,
     TGlobCommandBuildersDispatcher,
     TShebangCommandBuildersDispatcher,
 )
-from src.command_dispatcher_strategy_selector import (
+from ..command_dispatcher_strategy_selector import (
     TBasicCommandDispatcherStrategySelector,
 )
-from src.commands_executor import TVimCommandsExecutor
-from src.config_manager import (
+from ..commands_executor import TVimCommandsExecutor
+from ..config_manager import (
     TBasicConfigValidator,
     TVimConfigGetter,
     TVimConfigManager,
 )
-from src.editor import TVimEditor
-from src.editor_service_for_coderunner import TBasicEditorServiceForCodeRunner
-from src.file_info_extractor import TVimFileInfoExtractor
-from src.message_printer import TVimMessagePrinter
-from src.project_info_extractor import TVimProjectInfoExtractor
+from ..editor import TVimEditor
+from ..editor_service_for_coderunner import TBasicEditorServiceForCodeRunner
+from ..file_info_extractor import TVimFileInfoExtractor
+from ..message_printer import TVimMessagePrinter
+from ..project_info_extractor import TVimProjectInfoExtractor
+from .interface import ICodeRunnerBuilder
 
 
 class TVimCodeRunnerBuilder(ICodeRunnerBuilder):

…runner_builder/vim_coderunner_builder.py …runner_builder/vim_coderunner_builder.pypython_coderunner/src/coderunner_builder/vim_coderunner_builder.py renamed to python_coderunner/coderunner_builder/vim_coderunner_builder.py python_coderunner/src/coderunner_builder/vim_coderunner_builder.py renamed to python_coderunner/coderunner_builder/vim_coderunner_builder.py

@@ -0,0 +1,3 @@
+from .concatenator_command_builder import TConcatenatorCommandBuilder
+from .interface import ICommandBuilder
+from .interpolator_command_builder import TInterpolatorCommandBuilder

python_coderunner/command_builder/__init__.py

@@ -1,4 +1,4 @@
-from src.command_builder.interface import ICommandBuilder
+from .interface import ICommandBuilder
 
 
 class TConcatenatorCommandBuilder(ICommandBuilder):