pylint/mypy: Fix pylint/mypy errors for frontends

Signed-off-by: Arthur Chan <[email protected]>

Author: arthurscchan

src/fuzz_introspector/frontends/datatypes.py

@@ -198,7 +198,9 @@ def get_function_by_source_suffix_line(self, target_source_file,
         for function in self.all_functions:
             source_file = function.parent_source.source_file
             if source_file.endswith(target_source_file):
-                if function.start_line <= target_source_line <= function.end_line:
+                start_line = function.start_line
+                end_line = function.end_line
+                if start_line <= target_source_line <= end_line:
                     return function
 
         return None

src/fuzz_introspector/frontends/frontend_c.py

@@ -66,8 +66,8 @@ def generate_report(self,
 
             for func_def in source_code.func_defs:
                 if harness_source:
-                    if func_def.name(
-                    ) == 'LLVMFuzzerTestOneInput' and source_code.source_file != harness_source:
+                    if (func_def.name() == 'LLVMFuzzerTestOneInput'
+                            and source_code.source_file != harness_source):
                         logger.debug('Skipping harness: %s -- %s -- %s',
                                      func_def.name(), source_code.source_file,
                                      harness_source)
@@ -265,8 +265,8 @@ def name(self):
         name_node = self.root
         while name_node.child_by_field_name('declarator') is not None:
             name_node = name_node.child_by_field_name('declarator')
-            # Assign function name here because we want to make sure that there is a
-            # declarator when defining the name.
+            # Assign function name here because we want to make sure that
+            # there is a declarator when defining the name.
             function_name = name_node.text.decode()
         return function_name
 
@@ -431,8 +431,8 @@ def detailed_callsites(self):
                 for call_child in call_expr.children:
                     if call_child.type == 'identifier':
                         src_line = call_child.start_point.row
-                        src_loc = self.parent_source.source_file + ':%d,1' % (
-                            src_line)
+                        src_loc = (f'{self.parent_source.source_file}:'
+                                   f'{src_line},1')
                         callsites.append({
                             'Src': src_loc,
                             'Dst': call_child.text.decode()
@@ -617,7 +617,7 @@ def get_linenumber(self, bytepos):
 
         lineno = 1
         for start, end in self.line_range_pairs:
-            if bytepos >= start and bytepos <= end:
+            if start <= bytepos <= end:
                 return lineno
             lineno += 1
 
@@ -626,7 +626,8 @@ def get_linenumber(self, bytepos):
 
 def load_treesitter_trees(source_files: list[str],
                           is_log: bool = True) -> CProject:
-    """Creates treesitter trees for all files in a given list of source files."""
+    """Creates treesitter trees for all files in a given list of
+    source files."""
     results = []
 
     for code_file in source_files:

src/fuzz_introspector/frontends/frontend_go.py

@@ -740,7 +740,7 @@ def extract_local_variable_type(self,
                             continue
 
                         decl_type = self.var_map.get(right.text.decode(), '')
-                        if '[' in decl_type and ']' in decl_type:
+                        if decl_type and '[' in decl_type and ']' in decl_type:
                             decl_type = decl_type.split(']', 1)[-1]
                         elif decl_type == 'string':
                             decl_type = 'uint8'

src/fuzz_introspector/frontends/frontend_jvm.py

@@ -635,6 +635,7 @@ def _process_invoke(
         is_constructor_call: bool = False
     ) -> tuple[str, list[tuple[str, int, int]]]:
         """Internal helper for processing the method invocation statement."""
+        return_type = ''
         callsites = []
 
         # JVM method_invocation separated into three main items

src/fuzz_introspector/frontends/oss_fuzz.py

@@ -13,13 +13,14 @@
 # limitations under the License.
 #
 ################################################################################
+"""Entrypoint for tree-sitter frontends."""
 
 import os
 import yaml
 import pathlib
 import logging
 
-from typing import Tuple, Any
+from typing import Any, Optional
 
 from fuzz_introspector.frontends import frontend_c
 from fuzz_introspector.frontends import frontend_cpp
@@ -108,7 +109,7 @@ def process_c_project(target_dir: str,
             logger.info('Extracting calltree for %s', harness.source_file)
             calltree = project.extract_calltree(source_code=harness,
                                                 function=entrypoint)
-            with open(os.path.join(out, 'fuzzerLogFile-%d.data' % (idx)),
+            with open(os.path.join(out, f'fuzzerLogFile-{idx}.data'),
                       'w',
                       encoding='utf-8') as f:
                 f.write("Call tree\n")
@@ -118,15 +119,19 @@ def process_c_project(target_dir: str,
     return project
 
 
-def analyse_folder(language: str = '',
-                   directory: str = '',
-                   entrypoint: str = '',
-                   out='',
-                   module_only=False,
-                   dump_output=True,
-                   files_to_include: list[str] = []) -> Tuple[Project, Any]:
+def analyse_folder(
+        language: str = '',
+        directory: str = '',
+        entrypoint: str = '',
+        out='',
+        module_only=False,
+        dump_output=True,
+        files_to_include: Optional[list[str]] = None) -> tuple[Project, Any]:
     """Runs a full frontend analysis on a given directory"""
 
+    if not files_to_include:
+        files_to_include = []
+
     # Extract source files for target language
     source_files = capture_source_files_in_tree(directory, language)
     source_files.extend(files_to_include)
@@ -206,7 +211,7 @@ def analyse_folder(language: str = '',
             harness_name = harness.source_file.split('/')[-1].split('.')[0]
 
             # Functions/Methods data
-            logger.info(f'Dump methods for {harness_name}')
+            logger.info('Dump methods for %s', harness_name)
             target = os.path.join(out,
                                   f'fuzzerLogFile-{harness_name}.data.yaml')
             project.dump_module_logic(target,
@@ -216,7 +221,7 @@ def analyse_folder(language: str = '',
                                       dump_output=dump_output)
 
             # Calltree
-            logger.info(f'Extracting calltree for {harness_name}')
+            logger.info('Extracting calltree for %s', harness_name)
             calltree = project.extract_calltree(harness.source_file, harness,
                                                 entry_function)
             if dump_output: