lizard 1.17.16__py2.py3-none-any.whl → 1.17.17__py2.py3-none-any.whl

{lizard-1.17.16.dist-info → lizard-1.17.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lizard
-Version: 1.17.16
+Version: 1.17.17
 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.16.dist-info → lizard-1.17.17.dist-info}/RECORD

@@ -25,7 +25,7 @@ lizard_ext/lizardns.py,sha256=8pztUoRS_UWN24MawwxeHEJgYh49id5PWODUBb6O72U,4184
 lizard_ext/lizardoutside.py,sha256=FGm2tbBZ17-2OCgmQlD-vobUCfQKb0FAygf86eM3xuM,336
 lizard_ext/lizardstatementcount.py,sha256=xYk6ixSIItSE1BWQXzrWmduFgGhA3VR817SNKLffyVQ,1182
 lizard_ext/lizardwordcount.py,sha256=2QYXD7-AtkkgAbi9VSidunMbSsGQ7MKYb6IT-bS-cok,7575
-lizard_ext/version.py,sha256=s8Ej-6FrgTUH06Kp-lskbDvVReimxGKBZNzim7QUtbI,182
+lizard_ext/version.py,sha256=cbYsAY5IfG5fvQB3OIb0eEsfLnAzIrG_UpN--BDcwLk,182
 lizard_ext/xmloutput.py,sha256=-cbh0he4O_X-wX56gkv9AnSPNN0qvR7FACqlBeezUS4,5609
 lizard_languages/__init__.py,sha256=2mvrPWMJVCq981kMjoAPEi2O07C8vo-vUWOG_wp7vKQ,1473
 lizard_languages/clike.py,sha256=Lnwkma-jEu8FNVEPqTAKPkz1Hi0T_dP7H9Jyq0Bd0kQ,10725
@@ -36,17 +36,17 @@ lizard_languages/fortran.py,sha256=KATDsnfjob5W3579A_VxbwrbTkK7Rx3p0eXdBgjx25I,8
 lizard_languages/gdscript.py,sha256=KwlGoODilQnFgXvODpq_XlA6fV3hGbN9fd7bsiEUn78,637
 lizard_languages/go.py,sha256=dSbWxtWve7KSRW5i9w4DxhODtJ72EcBNrgp-7Xhn0Sg,465
 lizard_languages/golike.py,sha256=vRIfjTVvc0VmJf27lTOLht55ZF1AQ9wn0Fvu-9WabWk,2858
-lizard_languages/java.py,sha256=N9V1nbK_kGN4T2A1xpU1f9wZxGL6UEwVuOCA7D_tjPQ,3036
-lizard_languages/javascript.py,sha256=sGZeTqFqCjcl87ncR-Rmj-HTp-4s4ptoTMxeDgc8Jvw,522
+lizard_languages/java.py,sha256=O-RAQIFCFJ2VnlpF2sE5xave8n56bnuZl32AZZ42oDs,4929
+lizard_languages/javascript.py,sha256=qqxocZbZ6ivchhswRBBSjEJKiTClnm9ScOy4nlX4JKA,318
 lizard_languages/js_style_language_states.py,sha256=Ie0eA15rd0gfahdNzUlSkQa-o_j5idTIB82JU32c378,4165
 lizard_languages/js_style_regex_expression.py,sha256=Xgyogch4xElYtCG4EnBKvalHTl3tjRPcIIcIQRRd61I,1970
-lizard_languages/jsx.py,sha256=tNoGFQ9hap2yS5NjRPgxMRlYZY-k5Gn07yI0o815Ghk,3566
+lizard_languages/jsx.py,sha256=KA9tDZ8kRSey8RefeC6DJg36yLBi6AEbm5JmVB-TQMU,3951
 lizard_languages/kotlin.py,sha256=v_o2orEzA5gB9vM_0h-E4QXjrc5Yum-0K6W6_laOThc,2844
 lizard_languages/lua.py,sha256=3nqBcunBzJrhv4Iqaf8xvbyqxZy3aSxJ-IiHimHFlac,1573
 lizard_languages/objc.py,sha256=2a1teLdaXZBtCeFiIZer1j_sVx9LZ1CbF2XfnqlvLmk,2319
 lizard_languages/php.py,sha256=8OufyR2TIWyf3bXuTmp37Vwf_tEPF4YV5M3i5_jnguA,1377
 lizard_languages/python.py,sha256=5MwhyuzUqbUkhNyzeo_YsTRp4onMUVC19t61lLnDyjc,3761
-lizard_languages/ruby.py,sha256=gUrFsaS6ZJbjb9CixBHP9n0BxGOb8HsDEg7jJ2bz_80,2187
+lizard_languages/ruby.py,sha256=HL1ZckeuUUJU3QSVAOPsG_Zsl0C6X2PX5_VaWqclzkM,2277
 lizard_languages/rubylike.py,sha256=dAGZ2wqW8nqaESMU8HkeR9gwQ-q9fmZqE6AANvVZD1Q,3426
 lizard_languages/rust.py,sha256=DG2RkR9JWwcD6gIw-BPzg-Yo_lxQtSvfgHioFWIQm9o,610
 lizard_languages/scala.py,sha256=6Jr_TG945VYqB3o5weD7jN7S4beHt4aVj3r-fmKeMAM,1316
@@ -54,14 +54,14 @@ lizard_languages/script_language.py,sha256=UUO3Wjkoa-ZqwwvcwvhOr5tg1rVavcrEYx3dN
 lizard_languages/solidity.py,sha256=Z0GD7U5bI5eUikdy7m_iKWeFD5yXRYq4r3zycscOhJQ,553
 lizard_languages/swift.py,sha256=p8S2OAkQOx9YQ02yhoVXFkr7pMqUH1Nb3RVXPHRU_9M,2450
 lizard_languages/tnsdl.py,sha256=pGcalA_lHY362v2wwPS86seYBOOBBjvmU6vd4Yy3A9g,2803
-lizard_languages/tsx.py,sha256=aTxmM_-u-R-pRVXRVyITJxrrFZfCeMe9kxMgaoL-qfk,706
+lizard_languages/tsx.py,sha256=pzScdziLmFkD1c0LfwUNyC64C0HFmqt16QtsANu0UJ8,639
 lizard_languages/ttcn.py,sha256=ygjw_raBmPF-4mgoM8m6CAdyEMpTI-n1kZJK1RL4Vxo,2131
-lizard_languages/typescript.py,sha256=c_Kez4pOGMXhdo6q3HT-clEJDP7LuRIbBkkJSipComU,3568
+lizard_languages/typescript.py,sha256=jXN3q01g46tWVb9jXjsmwypcAXx0t-vpK3UFQ-SHw9U,3645
 lizard_languages/vue.py,sha256=KXUBUo2R1zNF8Pffrz_KsQEN44m5XFRMoGXylxKUeT0,1038
 lizard_languages/zig.py,sha256=NX1iyBstBuJFeAGBOAIaRfrmeBREne2HX6Pt4fXZZTQ,586
-lizard-1.17.16.dist-info/LICENSE.txt,sha256=05ZjgQ8Cl1dD9p0BhW-Txzkc5rhCogGJVEuf1GT2Y_M,1303
-lizard-1.17.16.dist-info/METADATA,sha256=m4ndIad8zK__BY3lidM_6WBys_A7GQY0TNDWFq8XIk8,15745
-lizard-1.17.16.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-lizard-1.17.16.dist-info/entry_points.txt,sha256=ZBqPhu-J3NoGGW5vn2Gfyoo0vdVlgBgM-wlNm0SGYUQ,39
-lizard-1.17.16.dist-info/top_level.txt,sha256=5NTrTaOLhHuTzXaGcZPKfuaOgUv7WafNGe0Zl5aycpg,35
-lizard-1.17.16.dist-info/RECORD,,
+lizard-1.17.17.dist-info/LICENSE.txt,sha256=05ZjgQ8Cl1dD9p0BhW-Txzkc5rhCogGJVEuf1GT2Y_M,1303
+lizard-1.17.17.dist-info/METADATA,sha256=nPb0Zzq86TmFrDJhfPKOSD4dK3KkKUrVA3yuq3T0JC0,15745
+lizard-1.17.17.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+lizard-1.17.17.dist-info/entry_points.txt,sha256=ZBqPhu-J3NoGGW5vn2Gfyoo0vdVlgBgM-wlNm0SGYUQ,39
+lizard-1.17.17.dist-info/top_level.txt,sha256=5NTrTaOLhHuTzXaGcZPKfuaOgUv7WafNGe0Zl5aycpg,35
+lizard-1.17.17.dist-info/RECORD,,

lizard_ext/version.py

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

lizard_languages/java.py

@@ -2,6 +2,7 @@
 Language parser for Java
 '''
 
+from lizard_languages.code_reader import CodeStateMachine
 from .clike import CLikeReader, CLikeStates, CLikeNestingStackStates
 
 
@@ -29,6 +30,11 @@ class JavaStates(CLikeStates):  # pylint: disable=R0903
         if token == '{':
             self._state_dec_to_imp(token)
 
+    def _state_imp(self, token):
+        def callback():
+            self.next(self._state_global)
+        self.sub_state(JavaFunctionBodyStates(self.context), callback, token)
+
     def try_new_function(self, name):
         # Don't create a function for record compact constructor
         if self.is_record and name == self.class_name:
@@ -40,15 +46,19 @@ class JavaStates(CLikeStates):  # pylint: disable=R0903
         if self.class_name and self.context.current_function:
             self.context.current_function.name = f"{self.class_name}::{name}"
 
-    def _state_global(self, token):
-        if token == '@':
-            self._state = self._state_decorator
-            return
+    def _try_start_a_class(self, token):
         if token in ("class", "record", "enum"):
             self.class_name = None
             self.is_record = token == "record"
             self.in_record_constructor = False
             self._state = self._state_class_declaration
+            return True
+
+    def _state_global(self, token):
+        if token == '@':
+            self._state = self._state_decorator
+            return
+        if self._try_start_a_class(token):
             return
         if not self.in_record_constructor:  # Only process as potential function if not in record constructor
             super(JavaStates, self)._state_global(token)
@@ -65,7 +75,9 @@ class JavaStates(CLikeStates):  # pylint: disable=R0903
 
     def _state_class_declaration(self, token):
         if token == '{':
-            self._state = self._state_global
+            def callback():
+                self._state = self._state_global
+            self.sub_state(JavaClassBodyStates(self.class_name, self.is_record, self.context), callback, token)
         elif token == '(':  # Record parameters
             self._state = self._state_record_parameters
         elif token[0].isalpha():
@@ -87,3 +99,44 @@ class JavaStates(CLikeStates):  # pylint: disable=R0903
         if token == '}':
             self.in_record_constructor = False
             self._state = self._state_global
+
+class JavaFunctionBodyStates(JavaStates):
+    def __init__(self, context):
+        super(JavaFunctionBodyStates, self).__init__(context)
+
+    @CodeStateMachine.read_inside_brackets_then("{}", "_state_dummy")
+    @CodeStateMachine.read_inside_brackets_then("()", "_state_dummy")
+    def _state_global(self, token):
+        if token == "new":
+            self.next(self._state_new)
+        self._try_start_a_class(token)
+        if self.br_count == 0:
+            self.statemachine_return()
+
+    def _state_dummy(self, _):
+        pass
+
+    def _state_new(self, token):
+        self.next(self._state_new_parameters)
+
+    def _state_new_parameters(self, token):
+        if token == "(":
+            self.sub_state(JavaFunctionBodyStates(self.context), None, token)
+            return
+        if token == "{":
+            def callback():
+                self.next(self._state_global)
+            self.sub_state(JavaClassBodyStates("(anonymous)", False, self.context), callback, token)
+            return
+        self.next(self._state_global)
+
+class JavaClassBodyStates(JavaStates):
+    def __init__(self, class_name, is_record, context):
+        super(JavaClassBodyStates, self).__init__(context)
+        self.class_name = class_name
+        self.is_record = is_record
+
+    def _state_global(self, token):
+        super()._state_global(token)
+        if token == '}':
+            self.statemachine_return()

lizard_languages/javascript.py

@@ -2,17 +2,13 @@
 Language parser for JavaScript
 '''
 
-from .code_reader import CodeReader
-from .clike import CCppCommentsMixin
-from .js_style_regex_expression import js_style_regex_expression
-from .js_style_language_states import JavaScriptStyleLanguageStates
-from .typescript import TypeScriptReader, JSTokenizer
+from .typescript import TypeScriptReader 
 
 
 class JavaScriptReader(TypeScriptReader):
     # pylint: disable=R0903
 
-    ext = ['js']
+    ext = ['js', 'cjs', 'mjs']
     language_names = ['javascript', 'js']
 
     def __init__(self, context):

lizard_languages/jsx.py

@@ -8,6 +8,20 @@ from .code_reader import CodeReader
 from .js_style_regex_expression import js_style_regex_expression
 
 
+class TSXTokenizer(JSTokenizer):
+    def __init__(self):
+        super().__init__()
+
+    def process_token(self, token):
+        if token == "<":
+            from .jsx import XMLTagWithAttrTokenizer  # Import only when needed
+            self.sub_tokenizer = XMLTagWithAttrTokenizer()
+            return
+    
+        for tok in super().process_token(token):
+            yield tok
+
+
 class JSXMixin:
     '''Base mixin class for JSX/TSX shared functionality'''
     @staticmethod
@@ -17,7 +31,7 @@ class JSXMixin:
             r"|(?:\$\w+)" + \
             r"|(?:\<\/\w+\>)" + \
             r"|`.*?`"
-        js_tokenizer = JSTokenizer()
+        js_tokenizer = TSXTokenizer()
         for token in CodeReader.generate_tokens(
                 source_code, addition, token_class):
             for tok in js_tokenizer(token):
@@ -102,7 +116,7 @@ class XMLTagWithAttrTokenizer(Tokenizer):
             self.state = self._after_tag
         elif token == "{":
             self.cache.append("}")
-            self.sub_tokenizer = JSTokenizer()
+            self.sub_tokenizer = TSXTokenizer()
             self.state = self._after_tag
 
     def _body(self, token):
@@ -116,7 +130,7 @@ class XMLTagWithAttrTokenizer(Tokenizer):
             return self.flush()
 
         if token == '{':
-            self.sub_tokenizer = JSTokenizer()
+            self.sub_tokenizer = TSXTokenizer()
             return self.flush()
 
 

lizard_languages/ruby.py

@@ -9,11 +9,12 @@ from .script_language import ScriptLanguageMixIn
 
 class MyToken(str):
     def __new__(cls, value, *_):
-        return super(MyToken, cls).__new__(cls, value.group(0))
+        val = value.group(0) if hasattr(value, 'group') else value
+        return super(MyToken, cls).__new__(cls, val)
 
     def __init__(self, value):
         super(MyToken, self).__init__()
-        self.begin = value.start()
+        self.begin = value.start() if hasattr(value, 'start') else 0
 
 
 class RubyReader(RubylikeReader):

lizard_languages/tsx.py

@@ -2,9 +2,8 @@
 Language parser for TSX
 '''
 
-from .typescript import TypeScriptReader, TypeScriptStates, JSTokenizer
+from .typescript import TypeScriptReader
 from .jsx import JSXMixin
-from .code_reader import CodeReader
 from .js_style_regex_expression import js_style_regex_expression
 
 

lizard_languages/typescript.py

@@ -37,10 +37,6 @@ class JSTokenizer(Tokenizer):
         self.depth = 1
 
     def process_token(self, token):
-        if token == "<":
-            from .jsx import XMLTagWithAttrTokenizer  # Import only when needed
-            self.sub_tokenizer = XMLTagWithAttrTokenizer()
-            return
         if token == "{":
             self.depth += 1
         elif token == "}":
@@ -115,10 +111,18 @@ class TypeScriptTypeAnnotationStates(CodeStateMachine):
             self.next(self._state_simple_type, token)
 
     def _state_simple_type(self, token):
-        if token in '{=;':
+        print(token)
+        if token == '<':
+            print(token)
+            self.next(self._state_generic_type, token)
+        elif token in '{=;':
             self.saved_token = token
             self.statemachine_return()
 
     @CodeStateMachine.read_inside_brackets_then("{}")
     def _inline_type_annotation(self, _):
         self.statemachine_return()
+
+    @CodeStateMachine.read_inside_brackets_then("<>")
+    def _state_generic_type(self, token):
+        self.statemachine_return()