lizard 1.17.24__tar.gz → 1.17.27__tar.gz

{lizard-1.17.24 → lizard-1.17.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lizard
-Version: 1.17.24
+Version: 1.17.27
 Summary: A code analyzer without caring the C/C++ header files. It works with Java, C/C++, JavaScript, Python, Ruby, Swift, Objective C. Metrics includes cyclomatic complexity number etc.
 Home-page: http://www.lizard.ws
 Download-URL: https://pypi.python.org/lizard/

{lizard-1.17.24 → lizard-1.17.27}/lizard.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lizard
-Version: 1.17.24
+Version: 1.17.27
 Summary: A code analyzer without caring the C/C++ header files. It works with Java, C/C++, JavaScript, Python, Ruby, Swift, Objective C. Metrics includes cyclomatic complexity number etc.
 Home-page: http://www.lizard.ws
 Download-URL: https://pypi.python.org/lizard/

{lizard-1.17.24 → lizard-1.17.27}/lizard_ext/version.py

@@ -3,4 +3,4 @@
 #
 # pylint: disable=missing-docstring,invalid-name
 
-version = "1.17.24"
+version = "1.17.27"

{lizard-1.17.24 → lizard-1.17.27}/lizard_languages/java.py

@@ -25,13 +25,18 @@ class JavaStates(CLikeStates):  # pylint: disable=R0903
         self.class_name = None
         self.is_record = False
         self.in_record_constructor = False
+        self.in_method_body = False
 
     def _state_old_c_params(self, token):
         if token == '{':
             self._state_dec_to_imp(token)
 
     def _state_imp(self, token):
+        # When entering a function implementation, set the flag
+        self.in_method_body = True
         def callback():
+            # When exiting the function implementation, clear the flag
+            self.in_method_body = False
             self.next(self._state_global)
         self.sub_state(JavaFunctionBodyStates(self.context), callback, token)
 
@@ -103,15 +108,37 @@ class JavaStates(CLikeStates):  # pylint: disable=R0903
 class JavaFunctionBodyStates(JavaStates):
     def __init__(self, context):
         super(JavaFunctionBodyStates, self).__init__(context)
+        self.in_method_body = True
+        self.ignore_tokens = False  # Additional flag to ignore tokens that could confuse the parser
+        self.handling_dot_class = False  # Flag to handle .class token specifically
 
     @CodeStateMachine.read_inside_brackets_then("{}", "_state_dummy")
     @CodeStateMachine.read_inside_brackets_then("()", "_state_dummy")
     def _state_global(self, token):
+        # Special handling for .class token
+        if token == "." and not self.handling_dot_class:
+            self.handling_dot_class = True
+            return
+        if self.handling_dot_class:
+            self.handling_dot_class = False
+            if token == "class":
+                return  # Skip the 'class' token after a dot
+        
+        # Special handling for tokens that could confuse the parser
+        if self.ignore_tokens:
+            self.ignore_tokens = False
+            return
+            
         if token == "new":
             self.next(self._state_new)
-        self._try_start_a_class(token)
-        if self.br_count == 0:
-            self.statemachine_return()
+        else:
+            # Always try to parse class declarations, even in method bodies
+            # This ensures that local classes are properly detected
+            if self._try_start_a_class(token):
+                return
+            
+            if self.br_count == 0:
+                self.statemachine_return()
 
     def _state_dummy(self, _):
         pass

lizard-1.17.27/lizard_languages/script_language.py

@@ -0,0 +1,31 @@
+'''
+Common behaviours of script languages
+'''
+from .code_reader import CodeReader
+
+
+class ScriptLanguageMixIn:
+    # pylint: disable=R0903
+
+    @staticmethod
+    def get_comment_from_token(token):
+        if token.startswith("#"):
+            # For forgiveness comments, return the entire comment with directive intact
+            stripped = token.lstrip('#').strip()
+            
+            # Handle forgiveness directives with proper formatting
+            if stripped.startswith('lizard forgive global') or stripped.startswith('#lizard forgive global'):
+                return '#lizard forgive global'  # Preserve global directive
+            elif stripped.startswith('lizard forgive') or stripped.startswith('#lizard forgive'):
+                return '#lizard forgive'  # Return standardized forgiveness comment
+                
+            return stripped  # Return the stripped comment for other cases
+        return None
+
+    @staticmethod
+    def generate_common_tokens(source_code, addition, match_holder=None):
+        _until_end = r"(?:\\\n|[^\n])*"
+        return CodeReader.generate_tokens(
+            source_code,
+            r"|\#" + _until_end + addition,
+            match_holder)

lizard-1.17.24/lizard_languages/script_language.py

@@ -1,21 +0,0 @@
-'''
-Common behaviours of script languages
-'''
-from .code_reader import CodeReader
-
-
-class ScriptLanguageMixIn:
-    # pylint: disable=R0903
-
-    @staticmethod
-    def get_comment_from_token(token):
-        if token.startswith("#"):
-            return token[1:]
-
-    @staticmethod
-    def generate_common_tokens(source_code, addition, match_holder=None):
-        _until_end = r"(?:\\\n|[^\n])*"
-        return CodeReader.generate_tokens(
-            source_code,
-            r"|\#" + _until_end + addition,
-            match_holder)