[PyParser] ASTHelper __equalPos

Author: Barnabás Domozi

plugins/python/parser/pyparser/asthelper.py

@@ -55,15 +55,18 @@ def __getClasses(self) -> List[ast.ClassDef]:
     def __getImports(self) -> List[ast.Import | ast.ImportFrom]:
         return cast(List[ast.Import | ast.ImportFrom], list(filter(lambda e : isinstance(e, ast.Import) or isinstance(e, ast.ImportFrom), self.astNodes)))
 
+    def __equalPos(self, e: ast.expr | ast.stmt, pos: PosInfo):
+        return (e.lineno == pos.line_start and
+                e.end_lineno == pos.line_end and
+                e.col_offset == pos.column_start and
+                e.end_col_offset == pos.column_end)
+
     def isFunctionCall(self, pos: PosInfo):
         for e in self.calls:
             func = e.func
 
             if (isinstance(func, ast.Name)):
-                if (func.lineno == pos.line_start and
-                    func.end_lineno == pos.line_end and
-                    func.col_offset == pos.column_start and
-                    func.end_col_offset == pos.column_end):
+                if (self.__equalPos(func, pos)):
                     return True
 
             elif (isinstance(func, ast.Attribute)):
@@ -82,10 +85,7 @@ def isFunctionCall(self, pos: PosInfo):
 
     def isImport(self, pos: PosInfo):
         for e in self.imports:
-            if (e.lineno == pos.line_start and
-                e.end_lineno == pos.line_end and
-                e.col_offset == pos.column_start and
-                e.end_col_offset == pos.column_end):
+            if (self.__equalPos(e, pos)):
                 return True
 
         return False
@@ -247,10 +247,7 @@ def getFunctionSignatureByPosition(self, pos: PosInfo) -> str | None:
                 isinstance(func.end_col_offset, int)):
                 continue
 
-            if not (func.lineno == pos.line_start and
-                func.end_lineno == pos.line_end and
-                func.col_offset == pos.column_start and
-                func.end_col_offset == pos.column_end):
+            if not (self.__equalPos(func, pos)):
                 continue
 
             return self.__getFunctionSignature(func)