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
8 changes: 3 additions & 5 deletions autoload/coderunner.vim
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,10 @@ 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
coderunner: TCodeRunner = TVimCodeRunnerBuilder().build()
import python_coderunner
coderunner: python_coderunner.coderunner.TCodeRunner = python_coderunner.coderunner_builder.TVimCodeRunnerBuilder().build()
except Exception as error:
vim.command("redraw | echohl ErrorMsg")
for line in traceback.format_exc().splitlines():
Expand Down
1 change: 1 addition & 0 deletions python_coderunner/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .src import coderunner, coderunner_builder
Empty file.
2 changes: 1 addition & 1 deletion python_coderunner/src/coderunner/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from src.coderunner.coderunner import TCodeRunner
from .coderunner import TCodeRunner
12 changes: 6 additions & 6 deletions python_coderunner/src/coderunner/coderunner.py
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions python_coderunner/src/coderunner_builder/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from src.coderunner_builder.interface import ICodeRunnerBuilder
from src.coderunner_builder.vim_coderunner_builder import TVimCodeRunnerBuilder
from .interface import ICodeRunnerBuilder
from .vim_coderunner_builder import TVimCodeRunnerBuilder
2 changes: 1 addition & 1 deletion python_coderunner/src/coderunner_builder/interface.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
24 changes: 12 additions & 12 deletions python_coderunner/src/coderunner_builder/vim_coderunner_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
6 changes: 3 additions & 3 deletions python_coderunner/src/command_builder/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from src.command_builder.concatenator_command_builder import TConcatenatorCommandBuilder
from src.command_builder.interface import ICommandBuilder
from src.command_builder.interpolator_command_builder import TInterpolatorCommandBuilder
from .concatenator_command_builder import TConcatenatorCommandBuilder
from .interface import ICommandBuilder
from .interpolator_command_builder import TInterpolatorCommandBuilder
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from src.command_builder.interface import ICommandBuilder
from .interface import ICommandBuilder


class TConcatenatorCommandBuilder(ICommandBuilder):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import re
from typing import ClassVar

from src.command_builder.interface import ICommandBuilder
from src.file_info_extractor import IFileInfoExtractor
from src.project_info_extractor import IProjectInfoExtractor
from ..file_info_extractor import IFileInfoExtractor
from ..project_info_extractor import IProjectInfoExtractor
from .interface import ICommandBuilder


class TInterpolatorCommandBuilder(ICommandBuilder):
Expand Down
10 changes: 5 additions & 5 deletions python_coderunner/src/command_builders_dispatcher/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from src.command_builders_dispatcher.file_ext_command_builders_dispatcher import (
from .file_ext_command_builders_dispatcher import (
TFileExtCommandBuildersDispatcher,
)
from src.command_builders_dispatcher.file_type_command_builders_dispatcher import (
from .file_type_command_builders_dispatcher import (
TFileTypeCommandBuildersDispatcher,
)
from src.command_builders_dispatcher.glob_command_builders_dispatcher import (
from .glob_command_builders_dispatcher import (
TGlobCommandBuildersDispatcher,
)
from src.command_builders_dispatcher.interface import ICommandBuildersDispatcher
from src.command_builders_dispatcher.shebang_command_builders_dispatcher import (
from .interface import ICommandBuildersDispatcher
from .shebang_command_builders_dispatcher import (
TShebangCommandBuildersDispatcher,
)
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Dict, Final, Optional

from src.command_builder import ICommandBuilder
from src.command_builders_dispatcher.interface import ICommandBuildersDispatcher
from src.file_info_extractor import IFileInfoExtractor
from ..command_builder import ICommandBuilder
from ..file_info_extractor import IFileInfoExtractor
from .interface import ICommandBuildersDispatcher


class TFileExtCommandBuildersDispatcher(ICommandBuildersDispatcher):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Dict, Final, Optional

from src.command_builder import ICommandBuilder
from src.command_builders_dispatcher.interface import ICommandBuildersDispatcher
from src.file_info_extractor import IFileInfoExtractor
from ..command_builder import ICommandBuilder
from ..file_info_extractor import IFileInfoExtractor
from .interface import ICommandBuildersDispatcher


class TFileTypeCommandBuildersDispatcher(ICommandBuildersDispatcher):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import re
from typing import Final, Optional, Tuple

from src.command_builder import ICommandBuilder
from src.command_builders_dispatcher.interface import ICommandBuildersDispatcher
from ..command_builder import ICommandBuilder
from .interface import ICommandBuildersDispatcher


class TGlobCommandBuildersDispatcher(ICommandBuildersDispatcher):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from abc import ABC, abstractmethod
from typing import Optional

from src.command_builder import ICommandBuilder
from ..command_builder import ICommandBuilder


class ICommandBuildersDispatcher(ABC):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Optional

from src.command_builder import ICommandBuilder, TConcatenatorCommandBuilder
from src.command_builders_dispatcher.interface import ICommandBuildersDispatcher
from src.file_info_extractor import IFileInfoExtractor
from ..command_builder import ICommandBuilder, TConcatenatorCommandBuilder
from ..file_info_extractor import IFileInfoExtractor
from .interface import ICommandBuildersDispatcher


class TShebangCommandBuildersDispatcher(ICommandBuildersDispatcher):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from src.command_dispatcher_strategy_selector.basic import (
from .basic import (
TBasicCommandDispatcherStrategySelector,
)
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from typing import Optional

from src.command_builder import ICommandBuilder
from src.command_builders_dispatcher import (
from ..command_builder import ICommandBuilder
from ..command_builders_dispatcher import (
TFileExtCommandBuildersDispatcher,
TFileTypeCommandBuildersDispatcher,
TGlobCommandBuildersDispatcher,
TShebangCommandBuildersDispatcher,
)
from src.config_manager import EDispatchersTypes, TBasicConfigManager
from ..config_manager import EDispatchersTypes, TBasicConfigManager


class TBasicCommandDispatcherStrategySelector:
Expand Down
4 changes: 2 additions & 2 deletions python_coderunner/src/commands_executor/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from src.commands_executor.inteface import ICommandsExecutor
from src.commands_executor.vim_commands_executor import TVimCommandsExecutor
from .inteface import ICommandsExecutor
from .vim_commands_executor import TVimCommandsExecutor
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import vim

from src.commands_executor.inteface import ICommandsExecutor
from src.config_manager import TBasicConfigManager
from ..config_manager import TBasicConfigManager
from .inteface import ICommandsExecutor


class TVimCommandsExecutor(ICommandsExecutor):
Expand Down
4 changes: 2 additions & 2 deletions python_coderunner/src/config_manager/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from src.config_manager.basic import (
from .basic import (
EDispatchersTypes,
IConfigGetter,
TBasicConfigManager,
TBasicConfigValidator,
UndefinedValueError,
ValidationError,
)
from src.config_manager.vim_config_manager import TVimConfigGetter, TVimConfigManager
from .vim_config_manager import TVimConfigGetter, TVimConfigManager
2 changes: 1 addition & 1 deletion python_coderunner/src/config_manager/vim_config_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import vim

from src.config_manager.basic import (
from .basic import (
IConfigGetter,
TBasicConfigManager,
UndefinedValueError,
Expand Down
4 changes: 2 additions & 2 deletions python_coderunner/src/editor/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from src.editor.interface import IEditor
from src.editor.vim_editor import TVimEditor
from .interface import IEditor
from .vim_editor import TVimEditor
2 changes: 1 addition & 1 deletion python_coderunner/src/editor/vim_editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import vim

from src.editor.interface import IEditor
from .interface import IEditor


class TVimEditor(IEditor):
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from src.editor_service_for_coderunner.basic import TBasicEditorServiceForCodeRunner
from .basic import TBasicEditorServiceForCodeRunner
6 changes: 3 additions & 3 deletions python_coderunner/src/editor_service_for_coderunner/basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
from tempfile import NamedTemporaryFile
from typing import Generator, List

from src.config_manager import TBasicConfigManager
from src.editor import IEditor
from src.file_info_extractor import IFileInfoExtractor
from ..config_manager import TBasicConfigManager
from ..editor import IEditor
from ..file_info_extractor import IFileInfoExtractor


class TBasicEditorServiceForCodeRunner:
Expand Down
4 changes: 2 additions & 2 deletions python_coderunner/src/file_info_extractor/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from src.file_info_extractor.interface import IFileInfoExtractor
from src.file_info_extractor.vim_file_info_extractor import TVimFileInfoExtractor
from .interface import IFileInfoExtractor
from .vim_file_info_extractor import TVimFileInfoExtractor
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import vim

from src.file_info_extractor.interface import IFileInfoExtractor
from .interface import IFileInfoExtractor


class TVimFileInfoExtractor(IFileInfoExtractor):
Expand Down
4 changes: 2 additions & 2 deletions python_coderunner/src/message_printer/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from src.message_printer.interface import IMessagePrinter
from src.message_printer.vim_message_printer import TVimMessagePrinter
from .interface import IMessagePrinter
from .vim_message_printer import TVimMessagePrinter
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import vim

from src.message_printer.interface import IMessagePrinter
from .interface import IMessagePrinter


class TVimMessagePrinter(IMessagePrinter):
Expand Down
4 changes: 2 additions & 2 deletions python_coderunner/src/project_info_extractor/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from src.project_info_extractor.interface import IProjectInfoExtractor
from src.project_info_extractor.vim_project_info_extractor import (
from .interface import IProjectInfoExtractor
from .vim_project_info_extractor import (
TVimProjectInfoExtractor,
)
2 changes: 1 addition & 1 deletion python_coderunner/src/project_info_extractor/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from abc import ABC, abstractmethod
from typing import Iterable, Set

from src.file_info_extractor import IFileInfoExtractor
from ..file_info_extractor import IFileInfoExtractor


class IProjectInfoExtractor(ABC):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import vim

from src.project_info_extractor.interface import IProjectInfoExtractor
from .interface import IProjectInfoExtractor


class TVimProjectInfoExtractor(IProjectInfoExtractor):
Expand Down