refactor(langserver): make package import relativ

Author: d-biehl

packages/language_server/src/robotcode/language_server/robotframework/diagnostics/analyzer.py

@@ -19,8 +19,8 @@
     Range,
 )
 from robotcode.core.uri import Uri
-from robotcode.language_server.robotframework.parts.model_helper import ModelHelperMixin
-from robotcode.language_server.robotframework.utils.ast_utils import (
+
+from ..utils.ast_utils import (
     HasTokens,
     Statement,
     Token,
@@ -32,9 +32,8 @@
     strip_variable_token,
     tokenize_variables,
 )
-from robotcode.language_server.robotframework.utils.async_ast import AsyncVisitor
-from robotcode.language_server.robotframework.utils.version import get_robot_version
-
+from ..utils.async_ast import AsyncVisitor
+from ..utils.version import get_robot_version
 from .entities import (
     ArgumentDefinition,
     CommandLineVariableDefinition,
@@ -48,6 +47,7 @@
 )
 from .errors import DIAGNOSTICS_SOURCE_NAME, Error
 from .library_doc import KeywordDoc, KeywordMatcher, is_embedded_keyword
+from .model_helper import ModelHelperMixin
 from .namespace import (
     KeywordFinder,
     Namespace,
@@ -401,6 +401,8 @@ async def _analyze_keyword_call(
             lib_range = None
             kw_namespace = None
 
+            result = self.finder.find_keyword(keyword, raise_keyword_error=False)
+
             if keyword is not None:
                 for lib, name in iter_over_keyword_names_and_owners(keyword):
                     if (
@@ -420,7 +422,8 @@ async def _analyze_keyword_call(
                         kw_range.start.character = r.end.character + 1
                         lib_range.end.character = kw_range.start.character - 1
 
-            result = self.finder.find_keyword(keyword, raise_keyword_error=False)
+                        if result is not None and result.parent == lib_entry.library_doc:
+                            break
 
             if (
                 result is not None

packages/language_server/src/robotcode/language_server/robotframework/parts/model_helper.py renamed to packages/language_server/src/robotcode/language_server/robotframework/diagnostics/model_helper.py

@@ -191,7 +191,8 @@ def visit_KeywordName(self, node: ast.AST) -> None:  # noqa: N802
         from robot.parsing.lexer.tokens import Token as RobotToken
         from robot.parsing.model.statements import KeywordName
         from robot.variables.search import search_variable
-        from robotcode.language_server.robotframework.parts.model_helper import ModelHelperMixin
+
+        from .model_helper import ModelHelperMixin
 
         n = cast(KeywordName, node)
         name_token = cast(Token, n.get_token(RobotToken.KEYWORD_NAME))

packages/language_server/src/robotcode/language_server/robotframework/diagnostics/namespace.py

@@ -30,31 +30,31 @@
 from robotcode.core.uri import Uri
 from robotcode.core.utils.net import find_free_port
 from robotcode.jsonrpc2.protocol import rpc_method
-from robotcode.language_server.common.decorators import code_action_kinds, language_id
-from robotcode.language_server.common.text_document import TextDocument
-from robotcode.language_server.robotframework.configuration import (
+
+from ...common.decorators import code_action_kinds, language_id
+from ...common.text_document import TextDocument
+from ..configuration import (
     DocumentationServerConfig,
 )
-from robotcode.language_server.robotframework.diagnostics.entities import LibraryEntry
-from robotcode.language_server.robotframework.diagnostics.library_doc import (
+from ..diagnostics.entities import LibraryEntry
+from ..diagnostics.library_doc import (
     get_library_doc,
     get_robot_library_html_doc_str,
     resolve_robot_variables,
 )
-from robotcode.language_server.robotframework.diagnostics.namespace import (
+from ..diagnostics.model_helper import ModelHelperMixin
+from ..diagnostics.namespace import (
     Namespace,
 )
-from robotcode.language_server.robotframework.utils.ast_utils import (
+from ..utils.ast_utils import (
     Token,
     get_node_at_position,
     range_from_token,
 )
-
-from .model_helper import ModelHelperMixin
 from .protocol_part import RobotLanguageServerProtocolPart
 
 if TYPE_CHECKING:
-    from robotcode.language_server.robotframework.protocol import (
+    from ..protocol import (
         RobotLanguageServerProtocol,
     )
 

packages/language_server/src/robotcode/language_server/robotframework/parts/code_action_documentation.py

@@ -23,10 +23,12 @@
     WorkspaceEdit,
 )
 from robotcode.core.utils.inspect import iter_methods
-from robotcode.language_server.common.decorators import code_action_kinds, language_id
-from robotcode.language_server.common.text_document import TextDocument
-from robotcode.language_server.robotframework.diagnostics.errors import DIAGNOSTICS_SOURCE_NAME, Error
-from robotcode.language_server.robotframework.utils.ast_utils import (
+
+from ...common.decorators import code_action_kinds, language_id
+from ...common.text_document import TextDocument
+from ..diagnostics.errors import DIAGNOSTICS_SOURCE_NAME, Error
+from ..diagnostics.model_helper import ModelHelperMixin
+from ..utils.ast_utils import (
     FirstAndLastRealStatementFinder,
     Token,
     get_node_at_position,
@@ -35,18 +37,16 @@
     range_from_node,
     range_from_token,
 )
-
 from .code_action_helper_mixin import (
     SHOW_DOCUMENT_SELECT_AND_RENAME_COMMAND,
     CodeActionDataBase,
     CodeActionHelperMixin,
     FindSectionsVisitor,
 )
-from .model_helper import ModelHelperMixin
 from .protocol_part import RobotLanguageServerProtocolPart
 
 if TYPE_CHECKING:
-    from robotcode.language_server.robotframework.protocol import RobotLanguageServerProtocol  # pragma: no cover
+    from ..protocol import RobotLanguageServerProtocol  # pragma: no cover
 
 
 @dataclass

packages/language_server/src/robotcode/language_server/robotframework/parts/code_action_quick_fixes.py

@@ -26,24 +26,24 @@
     WorkspaceEdit,
 )
 from robotcode.core.utils.inspect import iter_methods
-from robotcode.language_server.common.decorators import code_action_kinds, language_id
-from robotcode.language_server.common.text_document import TextDocument
-from robotcode.language_server.robotframework.utils import ast_utils
-from robotcode.language_server.robotframework.utils.ast_utils import (
+from robotcode.robot.utils import get_robot_version
+
+from ...common.decorators import code_action_kinds, language_id
+from ...common.text_document import TextDocument
+from ..diagnostics.model_helper import ModelHelperMixin
+from ..utils import ast_utils
+from ..utils.ast_utils import (
     BodyBlock,
     get_node_at_position,
     get_nodes_at_position,
     range_from_node,
     range_from_token,
 )
-from robotcode.robot.utils import get_robot_version
-
 from .code_action_helper_mixin import SHOW_DOCUMENT_SELECT_AND_RENAME_COMMAND, CodeActionDataBase, CodeActionHelperMixin
-from .model_helper import ModelHelperMixin
 from .protocol_part import RobotLanguageServerProtocolPart
 
 if TYPE_CHECKING:
-    from robotcode.language_server.robotframework.protocol import RobotLanguageServerProtocol  # pragma: no cover
+    from ..protocol import RobotLanguageServerProtocol  # pragma: no cover
 
 
 class SurroundType(Enum):

packages/language_server/src/robotcode/language_server/robotframework/parts/code_action_refactor.py

@@ -6,18 +6,18 @@
 from robotcode.core.async_tools import create_sub_task
 from robotcode.core.logging import LoggingDescriptor
 from robotcode.core.lsp.types import CodeLens, Command
-from robotcode.language_server.common.decorators import language_id
-from robotcode.language_server.common.text_document import TextDocument
-from robotcode.language_server.robotframework.configuration import AnalysisConfig
-from robotcode.language_server.robotframework.diagnostics.library_doc import KeywordDoc
-from robotcode.language_server.robotframework.utils.ast_utils import range_from_token
-from robotcode.language_server.robotframework.utils.async_ast import AsyncVisitor
-
-from .model_helper import ModelHelperMixin
+
+from ...common.decorators import language_id
+from ...common.text_document import TextDocument
+from ..configuration import AnalysisConfig
+from ..diagnostics.library_doc import KeywordDoc
+from ..diagnostics.model_helper import ModelHelperMixin
+from ..utils.ast_utils import range_from_token
+from ..utils.async_ast import AsyncVisitor
 from .protocol_part import RobotLanguageServerProtocolPart
 
 if TYPE_CHECKING:
-    from robotcode.language_server.robotframework.protocol import (
+    from ..protocol import (
         RobotLanguageServerProtocol,
     )
 

packages/language_server/src/robotcode/language_server/robotframework/parts/codelens.py

@@ -39,18 +39,15 @@
     Range,
     TextEdit,
 )
-from robotcode.language_server.common.decorators import language_id, trigger_characters
-from robotcode.language_server.common.text_document import TextDocument
-from robotcode.language_server.robotframework.configuration import CompletionConfig
-from robotcode.language_server.robotframework.diagnostics.entities import VariableDefinitionType
-from robotcode.language_server.robotframework.diagnostics.library_doc import (
-    CompleteResultKind,
-    KeywordArgumentKind,
-    KeywordDoc,
-    KeywordMatcher,
-)
-from robotcode.language_server.robotframework.diagnostics.namespace import DocumentType, Namespace
-from robotcode.language_server.robotframework.utils.ast_utils import (
+
+from ...common.decorators import language_id, trigger_characters
+from ...common.text_document import TextDocument
+from ..configuration import CompletionConfig
+from ..diagnostics.entities import VariableDefinitionType
+from ..diagnostics.library_doc import CompleteResultKind, KeywordArgumentKind, KeywordDoc, KeywordMatcher
+from ..diagnostics.model_helper import ModelHelperMixin
+from ..diagnostics.namespace import DocumentType, Namespace
+from ..utils.ast_utils import (
     HasTokens,
     Token,
     get_nodes_at_position,
@@ -60,13 +57,11 @@
     whitespace_at_begin_of_token,
     whitespace_from_begin_of_token,
 )
-from robotcode.language_server.robotframework.utils.version import get_robot_version
-
-from .model_helper import ModelHelperMixin
+from ..utils.version import get_robot_version
 from .protocol_part import RobotLanguageServerProtocolPart
 
 if TYPE_CHECKING:
-    from robotcode.language_server.robotframework.protocol import RobotLanguageServerProtocol
+    from ..protocol import RobotLanguageServerProtocol
 
 
 DEFAULT_HEADER_STYLE = "*** {name}s ***"

packages/language_server/src/robotcode/language_server/robotframework/parts/completion.py

@@ -9,18 +9,18 @@
 from robotcode.core.logging import LoggingDescriptor
 from robotcode.core.lsp.types import Position, Range, TextDocumentIdentifier
 from robotcode.jsonrpc2.protocol import rpc_method
-from robotcode.language_server.robotframework.utils.ast_utils import (
+
+from ..diagnostics.model_helper import ModelHelperMixin
+from ..utils.ast_utils import (
     HasTokens,
     get_nodes_at_position,
     get_tokens_at_position,
     range_from_token,
 )
-
-from .model_helper import ModelHelperMixin
 from .protocol_part import RobotLanguageServerProtocolPart
 
 if TYPE_CHECKING:
-    from robotcode.language_server.robotframework.protocol import RobotLanguageServerProtocol
+    from ..protocol import RobotLanguageServerProtocol
 
 
 @dataclass(repr=False)

packages/language_server/src/robotcode/language_server/robotframework/parts/debugging_utils.py

@@ -8,21 +8,22 @@
 from robotcode.core.logging import LoggingDescriptor
 from robotcode.core.lsp.types import Diagnostic, DiagnosticSeverity, DiagnosticTag, Position, Range
 from robotcode.core.uri import Uri
-from robotcode.language_server.common.decorators import language_id
-from robotcode.language_server.common.parts.diagnostics import DiagnosticsResult
-from robotcode.language_server.common.text_document import TextDocument
-from robotcode.language_server.robotframework.configuration import AnalysisConfig
-from robotcode.language_server.robotframework.diagnostics.entities import ArgumentDefinition
-from robotcode.language_server.robotframework.diagnostics.namespace import Namespace
-from robotcode.language_server.robotframework.utils.ast_utils import (
+
+from ...common.decorators import language_id
+from ...common.parts.diagnostics import DiagnosticsResult
+from ...common.text_document import TextDocument
+from ..configuration import AnalysisConfig
+from ..diagnostics.entities import ArgumentDefinition
+from ..diagnostics.namespace import Namespace
+from ..utils.ast_utils import (
     HeaderAndBodyBlock,
     Token,
     range_from_node,
     range_from_token,
 )
 
 if TYPE_CHECKING:
-    from robotcode.language_server.robotframework.protocol import RobotLanguageServerProtocol
+    from ..protocol import RobotLanguageServerProtocol
 
 from .protocol_part import RobotLanguageServerProtocolPart