Skip to content

Commit 070dec2

Browse files
rchlrchl
committed
refactor: add ruff rules for sorting imports
1 parent 1ce2ce1 commit 070dec2

19 files changed

Lines changed: 135 additions & 110 deletions

‎plugin/__init__.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
from __future__ import annotations
22

3-
from .client import LspBasedpyrightPlugin, ViewEventListener
4-
from .commands import LspBasedpyrightCreateConfigurationCommand, LspBasedpyrightUpdateViewStatusTextCommand
3+
from .client import LspBasedpyrightPlugin
4+
from .client import ViewEventListener
5+
from .commands import LspBasedpyrightCreateConfigurationCommand
6+
from .commands import LspBasedpyrightUpdateViewStatusTextCommand
57

68
__all__ = (
79
# ST: core

‎plugin/client.py‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,35 @@
11
from __future__ import annotations
22

3-
import json
4-
import os
5-
import re
3+
from .constants import PACKAGE_NAME
4+
from .constants import SERVER_SETTING_DEV_ENVIRONMENT
5+
from .dev_environment.helpers import get_dev_environment_handler
6+
from .log import log_error
7+
from .log import log_warning
8+
from .utils_lsp import find_workspace_folder
9+
from .utils_lsp import uri_to_file_path
10+
from .utils_lsp import WorkspaceFolderAttr
11+
from .virtual_env.helpers import find_venv_by_finder_names
612
from collections import defaultdict
13+
from LSP.plugin import ClientConfig
14+
from LSP.plugin import DottedDict
15+
from LSP.plugin import MarkdownLangMap
16+
from LSP.plugin import Response
17+
from LSP.protocol import CompletionItem
18+
from LSP.protocol import Hover
19+
from LSP.protocol import SignatureHelp
20+
from lsp_utils import NpmClientHandler
721
from pathlib import Path
8-
from typing import Any, cast, final
9-
22+
from sublime_lib import ResourcePath
23+
from typing import Any
24+
from typing import cast
25+
from typing import final
26+
from typing_extensions import override
1027
import jmespath
28+
import json
29+
import os
30+
import re
1131
import sublime
1232
import sublime_plugin
13-
from LSP.plugin import ClientConfig, DottedDict, MarkdownLangMap, Response
14-
from LSP.protocol import CompletionItem, Hover, SignatureHelp
15-
from lsp_utils import NpmClientHandler
16-
from sublime_lib import ResourcePath
17-
from typing_extensions import override
18-
19-
from .constants import PACKAGE_NAME, SERVER_SETTING_DEV_ENVIRONMENT
20-
from .dev_environment.helpers import get_dev_environment_handler
21-
from .log import log_error, log_warning
22-
from .utils_lsp import WorkspaceFolderAttr, find_workspace_folder, uri_to_file_path
23-
from .virtual_env.helpers import find_venv_by_finder_names
2433

2534

2635
class ViewEventListener(sublime_plugin.ViewEventListener):

‎plugin/commands/lsp_basedpyright_create_configuration.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from __future__ import annotations
22

33
from pathlib import Path
4-
54
import sublime
65
import sublime_plugin
76

‎plugin/commands/lsp_basedpyright_update_status_text.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
from __future__ import annotations
22

3-
from typing import Any, final
4-
5-
import sublime
6-
from LSP.plugin import LspTextCommand
7-
from typing_extensions import override
8-
93
from ..client import LspBasedpyrightPlugin
104
from ..constants import PACKAGE_NAME
115
from ..log import log_warning
126
from ..template import load_string_template
137
from ..utils_lsp import find_workspace_folder
8+
from LSP.plugin import LspTextCommand
9+
from typing import Any
10+
from typing import final
11+
from typing_extensions import override
12+
import sublime
1413

1514

1615
@final

‎plugin/dev_environment/helpers.py‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
from __future__ import annotations
22

3-
from pathlib import Path
4-
from typing import Generator, Sequence
5-
6-
from more_itertools import first_true
7-
8-
from .impl import (
9-
VERSIONED_SUBLIME_TEXT_DEV_ENVIRONMENT_HANDLERS,
10-
BlenderDevEnvironmentHandler,
11-
GdbDevEnvironmentHandler,
12-
SublimeTextDevEnvironmentHandler,
13-
)
3+
from .impl import BlenderDevEnvironmentHandler
4+
from .impl import GdbDevEnvironmentHandler
5+
from .impl import SublimeTextDevEnvironmentHandler
6+
from .impl import VERSIONED_SUBLIME_TEXT_DEV_ENVIRONMENT_HANDLERS
147
from .interfaces import BaseDevEnvironmentHandler
8+
from more_itertools import first_true
9+
from pathlib import Path
10+
from typing import Generator
11+
from typing import Sequence
1512

1613

1714
def find_dev_environment_handler_class(dev_environment: str) -> type[BaseDevEnvironmentHandler] | None:

‎plugin/dev_environment/impl/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
from .blender import BlenderDevEnvironmentHandler
44
from .gdb import GdbDevEnvironmentHandler
5-
from .sublime_text import VERSIONED_SUBLIME_TEXT_DEV_ENVIRONMENT_HANDLERS, SublimeTextDevEnvironmentHandler
5+
from .sublime_text import SublimeTextDevEnvironmentHandler
6+
from .sublime_text import VERSIONED_SUBLIME_TEXT_DEV_ENVIRONMENT_HANDLERS
67

78
__all__ = (
89
"BlenderDevEnvironmentHandler",

‎plugin/dev_environment/impl/blender.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
from __future__ import annotations
22

3-
import json
4-
import tempfile
5-
from pathlib import Path
6-
7-
from LSP.plugin.core.collections import DottedDict
8-
93
from ...utils import run_shell_command
104
from ..interfaces import BaseDevEnvironmentHandler
5+
from LSP.plugin.core.collections import DottedDict
6+
from pathlib import Path
7+
import json
8+
import tempfile
119

1210

1311
class BlenderDevEnvironmentHandler(BaseDevEnvironmentHandler):

‎plugin/dev_environment/impl/gdb.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
from __future__ import annotations
22

3-
import json
4-
import tempfile
5-
from pathlib import Path
6-
7-
from LSP.plugin.core.collections import DottedDict
8-
93
from ...utils import run_shell_command
104
from ..interfaces import BaseDevEnvironmentHandler
5+
from LSP.plugin.core.collections import DottedDict
6+
from pathlib import Path
7+
import json
8+
import tempfile
119

1210

1311
class GdbDevEnvironmentHandler(BaseDevEnvironmentHandler):

‎plugin/dev_environment/impl/sublime_text.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
from __future__ import annotations
22

3-
import inspect
4-
import os
5-
import re
6-
import sys
7-
from abc import ABC, abstractmethod
8-
from pathlib import Path
9-
from typing import Generator, Tuple, TypeVar
10-
11-
import sublime
3+
from ..interfaces import BaseDevEnvironmentHandler
4+
from abc import ABC
5+
from abc import abstractmethod
126
from LSP.plugin.core.collections import DottedDict
137
from LSP.plugin.core.constants import ST_VERSION
148
from more_itertools import first_true
9+
from pathlib import Path
10+
from typing import Generator
11+
from typing import Tuple
12+
from typing import TypeVar
1513
from typing_extensions import TypeAlias
16-
17-
from ..interfaces import BaseDevEnvironmentHandler
14+
import inspect
15+
import os
16+
import re
17+
import sublime
18+
import sys
1819

1920
T = TypeVar("T")
2021

‎plugin/dev_environment/interfaces.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
from __future__ import annotations
22

3-
from abc import ABC, abstractmethod
4-
from pathlib import Path
5-
from typing import Any, Iterable, Literal, Sequence, final
6-
3+
from ..constants import SERVER_SETTING_ANALYSIS_EXTRAPATHS
4+
from ..constants import SERVER_SETTING_DEV_ENVIRONMENT
5+
from ..log import log_debug
6+
from abc import ABC
7+
from abc import abstractmethod
78
from LSP.plugin.core.collections import DottedDict
89
from more_itertools import unique_everseen
9-
10-
from ..constants import SERVER_SETTING_ANALYSIS_EXTRAPATHS, SERVER_SETTING_DEV_ENVIRONMENT
11-
from ..log import log_debug
10+
from pathlib import Path
11+
from typing import Any
12+
from typing import final
13+
from typing import Iterable
14+
from typing import Literal
15+
from typing import Sequence
1216

1317

1418
class BaseDevEnvironmentHandler(ABC):

0 commit comments

Comments
 (0)