lizard 1.17.31__py2.py3-none-any.whl → 1.19.0__py2.py3-none-any.whl

{lizard-1.17.31.dist-info → lizard-1.19.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lizard
-Version: 1.17.31
+Version: 1.19.0
 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/
@@ -50,29 +50,32 @@ code analysis.
 
 A list of supported languages:
 
+-  C# (C Sharp)
 -  C/C++ (works with C++14)
+-  Erlang
+-  Fortran
+-  GDScript
+-  Golang
 -  Java
--  C# (C Sharp)
 -  JavaScript (With ES6 and JSX)
--  TypeScript (With TSX)
--  VueJS
+-  Kotlin
+-  Lua
 -  Objective-C
--  Swift
+-  Perl
+-  PHP
+-  PL/SQL
 -  Python
+-  R
 -  Ruby
--  TTCN-3
--  PHP
--  Scala
--  GDScript
--  Golang
--  Lua
 -  Rust
--  Fortran
--  Kotlin
+-  Scala
 -  Solidity
--  Erlang
+-  Structured Text (St)
+-  Swift
+-  TTCN-3
+-  TypeScript (With TSX)
+-  VueJS
 -  Zig
--  Perl
 
 By default lizard will search for any source code that it knows and mix
 all the results together. This might not be what you want. You can use
@@ -160,7 +163,7 @@ Options
                         search for all languages it knows. `lizard -l cpp -l java`searches for
                         C++ and Java code. The available languages are: cpp, java, csharp,
                         javascript, python, objectivec, ttcn, ruby, php, swift, scala, GDScript,
-                        go, lua, rust, typescript
+                        go, lua, rust, typescript, plsql
   -V, --verbose         Output in verbose mode (long function name)
   -C CCN, --CCN CCN     Threshold for cyclomatic complexity number warning. The default value is
                         15. Functions with CCN bigger than it will generate warning
@@ -195,7 +198,7 @@ Options
   -X, --xml             Generate XML in cppncss style instead of the tabular output. Useful to
                         generate report in Jenkins server
   --csv                 Generate CSV output as a transform of the default output
-  -H, --html            Output HTML report
+  -H, --html            Output HTML report with interactive DataTables (sortable, searchable, filterable)
   --checkstyle          Generate Checkstyle XML output for integration with Jenkins and other tools
   -m, --modified        Calculate modified cyclomatic complexity number , which count a
                         switch/case with multiple cases as one CCN.
@@ -413,3 +416,14 @@ Lizard is also used as a plugin for fastlane to help check code complexity and s
 - `European research project FASTEN (Fine-grained Analysis of SofTware Ecosystems as Networks, <http://fasten-project.eu/)>`_
   - `for a quality analyzer <https://github.com/fasten-project/quality-analyzer>`_
 
+How To Contribute
+-----------------
+
+Contributions are welcome. Please refer to the rules and development workflow in:
+
+- https://github.com/terryyin/lizard/tree/master/.cursor/rules
+
+These guidelines are usable by both AI assistants and human contributors — what works for AI works for "I" as well — to keep changes cohesive, simple, and well-tested.
+
+
+

{lizard-1.17.31.dist-info → lizard-1.19.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-lizard.py,sha256=H0EgGsU0ou4IlRY9AxIyY_O4_WO8trZda4GGM7a4kNQ,41403
+lizard.py,sha256=B0g5lEp5me31bQpjfMKVayF0iUfH0PalVecOKeUX3-A,41365
 lizard_ext/__init__.py,sha256=AkZYVqCgd7XX1hMwLMyh_ABm9geIHmobEch-thYXZz8,932
 lizard_ext/auto_open.py,sha256=byD_RbeVhvSUhR2bJMRitvA3zcKEapFwv0-XaDJ6GFo,1096
-lizard_ext/checkstyleoutput.py,sha256=puuTq5IfM48NkDdds2FjF1BFq1QDGfsf5GahLTVfN6Y,1213
+lizard_ext/checkstyleoutput.py,sha256=UzDHg837ErEZepXkR8I8YCoz2r1lkmzGctMA7dpyB-M,1245
 lizard_ext/csvoutput.py,sha256=43fhmo8kB85qcdujCwySGNuTC4FkKUPLqIApPeljPnA,2663
 lizard_ext/default_ordered_dict.py,sha256=YbVz6nPlQ6DjWc_EOFBz6AJN2XLo9dpnUdeyejQvUDE,831
 lizard_ext/extension_base.py,sha256=rnjUL2mqSGToUVYydju7fa8ZwynLPY8S1F17gIJP55I,346
-lizard_ext/htmloutput.py,sha256=oavhEzCIJtoJrFveiWIp0pMAOwg4pukJ6l07IpmPiag,4426
+lizard_ext/htmloutput.py,sha256=G7MdLD7AwuR0LLCAkEpyHx4N_ssCcFQdXd7Xg5jZWX0,6537
 lizard_ext/keywords.py,sha256=VxsxoATtKV-8egMKd7I8sd2qbZMtEFEpsszk__6rmjQ,893
 lizard_ext/lizardboolcount.py,sha256=abmMA9X3VFRO5mziicUxWKmHldHNC0jBEe7NKAKA5fs,1062
 lizard_ext/lizardcomplextags.py,sha256=flrwYg24P5DoDsBO3gdcK9SxkugX_brhfjuu8zgPnOc,681
@@ -20,17 +20,17 @@ lizard_ext/lizardignoreassert.py,sha256=sqLwcnJQ06SYqIk901ib4NQ8ECwjIe_qL4T6z1wL
 lizard_ext/lizardio.py,sha256=xQN-AgLGLKJarJkgfaqX_TKyupbb7GTcwPxrL2B1J1w,3357
 lizard_ext/lizardmccabe.py,sha256=RiO8ASmQUah4udOH8SbE2OOMxwShIPByW93TlFxXlQU,1274
 lizard_ext/lizardmodified.py,sha256=4Ld7yy1D2m2biMtx-g0DtjXwLa-9mG2togS2IRDAF3k,705
-lizard_ext/lizardnd.py,sha256=2_uZkRlaM1mDLLW8yXtO7MtjMGklU8_Cy-6ocaILEuo,4391
+lizard_ext/lizardnd.py,sha256=h4MaSsFAY5rK8kOSr61LkWntwJWV1KnhaEOWZgp3-c0,7496
 lizard_ext/lizardnonstrict.py,sha256=pPG22up2uh9rEkdRFtTWdiuOaiBNe0ZUjaZQpSTX5LE,394
 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=N4oSGH5svpjDluQQOHRznK3TrM-OyaJq6FN_Yuc5pvw,182
+lizard_ext/version.py,sha256=gScBFBQFiyhdj77Gb-x1hY6wABdKwZlb_aaNdiiADQ0,181
 lizard_ext/xmloutput.py,sha256=-cbh0he4O_X-wX56gkv9AnSPNN0qvR7FACqlBeezUS4,5609
-lizard_languages/__init__.py,sha256=ArNmUrVSU6HFxhDka1-vWMZpVIM39P-gqv6BoOLNMV8,1522
-lizard_languages/clike.py,sha256=INd5tkvwEVZm7dx2yHG2OIFHZn7JzQGmnT9WQNFZ2XU,11110
-lizard_languages/code_reader.py,sha256=IfEHg9lzKnyCipX9xscgyGEOovll5qr9dCe5cSX2sJM,6852
+lizard_languages/__init__.py,sha256=DniggHM3SOFlwkP8Tm4csEcisbf7_i1EvfoAkG9Atg0,1611
+lizard_languages/clike.py,sha256=_oDUbA1hEIPujKw3wyAtC1uFPvjmg4TBgKbHLa-S1wg,13597
+lizard_languages/code_reader.py,sha256=O0nZkI4xEHIWGgFBDwczj8-ay7aKllPnzRsblQtL3Gc,6874
 lizard_languages/csharp.py,sha256=EfFAIOIcJXUUhXTlZApXGSlzG34NZvHM9OSe6m7hpv0,2141
 lizard_languages/erlang.py,sha256=7YJS2cMyXDKEV_kpH8DzBARxFCFcjKuTOPSQ3K52auU,3860
 lizard_languages/fortran.py,sha256=KATDsnfjob5W3579A_VxbwrbTkK7Rx3p0eXdBgjx25I,8973
@@ -39,31 +39,32 @@ lizard_languages/go.py,sha256=sntz0jOEuj4klPipoTFd16UDK1fAUQfwK7YX_cLMZAc,1346
 lizard_languages/golike.py,sha256=vRIfjTVvc0VmJf27lTOLht55ZF1AQ9wn0Fvu-9WabWk,2858
 lizard_languages/java.py,sha256=HQBTZjUKbUJwgmtLYIzJrWtPpFP3ZdBP_NJK7YOXZC0,6424
 lizard_languages/javascript.py,sha256=vniCNMW-ea9Jpv6c8qCcjLVDYjT8VztjXigp5XRWt0E,317
-lizard_languages/js_style_language_states.py,sha256=6mLrHfvDC4oHttKsSRGkE-ayG8uKSEm4E4rlhaUN5lA,6396
 lizard_languages/js_style_regex_expression.py,sha256=Xgyogch4xElYtCG4EnBKvalHTl3tjRPcIIcIQRRd61I,1970
-lizard_languages/jsx.py,sha256=TLH93qrZO2r_tiiv1XBIbw2_mbUMjwCZAuBz5vG5oBw,11696
 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/perl.py,sha256=136w620eECe_t-kmlRUGrsZSxQNo2JQ_PZTSQfCSmHY,11987
 lizard_languages/php.py,sha256=UV40p8WzNC64NQ5qElPKzcFTjVt5kenLMz-eKYlcnMY,9940
-lizard_languages/python.py,sha256=4AK0JAPBSM7eKrqDdSaHfewCGAYMzdhUhi5kZK4u23k,3847
+lizard_languages/plsql.py,sha256=17zf0AkDLFW7mA3ngUNrU7z6U6DkmA96CKOcEhYNC5Q,17137
+lizard_languages/python.py,sha256=AsL0SmQ73zhNS1iGi4Z8VtuUE0VjqBzo9W8W0mjqL0E,5790
+lizard_languages/r.py,sha256=IoyMhmFtUmTji6rm6-fqss_j_kvIHu3JjABRh6RNys0,12583
 lizard_languages/ruby.py,sha256=HL1ZckeuUUJU3QSVAOPsG_Zsl0C6X2PX5_VaWqclzkM,2277
 lizard_languages/rubylike.py,sha256=dAGZ2wqW8nqaESMU8HkeR9gwQ-q9fmZqE6AANvVZD1Q,3426
-lizard_languages/rust.py,sha256=vfBBktNwIZL8AiaAJ5EW8o4rL7_TwjDo3QhpfxxecfE,596
+lizard_languages/rust.py,sha256=WarDHnFZv99Yu3_C5DpZfLS8dVWz6AcOzo2dzLW94rA,817
 lizard_languages/scala.py,sha256=6Jr_TG945VYqB3o5weD7jN7S4beHt4aVj3r-fmKeMAM,1316
 lizard_languages/script_language.py,sha256=SKe45AbO6Z-axbN8KW_g7jf9g7YTXZ6dWzJj4ubDsM8,1172
 lizard_languages/solidity.py,sha256=Z0GD7U5bI5eUikdy7m_iKWeFD5yXRYq4r3zycscOhJQ,553
+lizard_languages/st.py,sha256=7fpOfNAoUjNY8RCHSYLufnOzZTUkKwjVvcyRyM1xP2Y,4160
 lizard_languages/swift.py,sha256=p8S2OAkQOx9YQ02yhoVXFkr7pMqUH1Nb3RVXPHRU_9M,2450
 lizard_languages/tnsdl.py,sha256=pGcalA_lHY362v2wwPS86seYBOOBBjvmU6vd4Yy3A9g,2803
-lizard_languages/tsx.py,sha256=AgpULWV9VEF4wJGtNZeeOl6NuTiQOstM8P3jObz-_xY,1249
+lizard_languages/tsx.py,sha256=1oOVCcz5yHkmYLYGhSarCMSXfGVasweklAqqapkuNR4,17160
 lizard_languages/ttcn.py,sha256=ygjw_raBmPF-4mgoM8m6CAdyEMpTI-n1kZJK1RL4Vxo,2131
-lizard_languages/typescript.py,sha256=fiEiGs0VO8uofsLcOD7t8UzKp0Un9SSbfQTU87mhNVo,5626
+lizard_languages/typescript.py,sha256=unCDj040dY9fTOw9iIykqjt2j5tZWJ2Bm9fHYjOWY5I,14706
 lizard_languages/vue.py,sha256=KXUBUo2R1zNF8Pffrz_KsQEN44m5XFRMoGXylxKUeT0,1038
 lizard_languages/zig.py,sha256=NX1iyBstBuJFeAGBOAIaRfrmeBREne2HX6Pt4fXZZTQ,586
-lizard-1.17.31.dist-info/LICENSE.txt,sha256=05ZjgQ8Cl1dD9p0BhW-Txzkc5rhCogGJVEuf1GT2Y_M,1303
-lizard-1.17.31.dist-info/METADATA,sha256=8P82zQ9bK0enmWJ9bOSezN6Ly1oO5WvgfWO6i0jSEx4,16230
-lizard-1.17.31.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-lizard-1.17.31.dist-info/entry_points.txt,sha256=ZBqPhu-J3NoGGW5vn2Gfyoo0vdVlgBgM-wlNm0SGYUQ,39
-lizard-1.17.31.dist-info/top_level.txt,sha256=5NTrTaOLhHuTzXaGcZPKfuaOgUv7WafNGe0Zl5aycpg,35
-lizard-1.17.31.dist-info/RECORD,,
+lizard-1.19.0.dist-info/LICENSE.txt,sha256=05ZjgQ8Cl1dD9p0BhW-Txzkc5rhCogGJVEuf1GT2Y_M,1303
+lizard-1.19.0.dist-info/METADATA,sha256=DNAVbhrtdVrI5tn2rWZoSBwCfZ5ArhMQ0XNmHvOqbh4,16697
+lizard-1.19.0.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+lizard-1.19.0.dist-info/entry_points.txt,sha256=pPMMwoHAltzGHqR2WeJQItLeeyR7pbX5R2S_POC-xoo,40
+lizard-1.19.0.dist-info/top_level.txt,sha256=5NTrTaOLhHuTzXaGcZPKfuaOgUv7WafNGe0Zl5aycpg,35
+lizard-1.19.0.dist-info/RECORD,,

{lizard-1.17.31.dist-info → lizard-1.19.0.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 lizard = lizard:main
+

lizard.py

@@ -623,7 +623,7 @@ def whitelist_filter(warnings, script=None, whitelist=None):
 
     def get_whitelist(whitelist):
         if os.path.isfile(whitelist):
-            return open(whitelist, mode='r').read()
+            return auto_read(whitelist)
         if whitelist != DEFAULT_WHITELIST:
             print("WARNING: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
             print("WARNING: the whitelist \""+whitelist+"\" doesn't exist.")
@@ -923,12 +923,12 @@ def get_all_source_files(paths, exclude_patterns, lans):
             for path in paths:
                 gitignore_path = os.path.join(path, '.gitignore')
                 if os.path.exists(gitignore_path):
-                    with open(gitignore_path, 'r') as gitignore_file:
-                        # Read lines and strip whitespace and empty lines
-                        patterns = [line.strip() for line in gitignore_file.readlines()]
-                        patterns = [p for p in patterns if p and not p.startswith('#')]
-                        gitignore_spec = pathspec.PathSpec.from_lines('gitwildmatch', patterns)
-                        base_path = path
+                    gitignore_file = auto_read(gitignore_path)
+                    # Read lines and strip whitespace and empty lines
+                    patterns = [line.strip() for line in gitignore_file.splitlines()]
+                    patterns = [p for p in patterns if p and not p.startswith('#')]
+                    gitignore_spec = pathspec.PathSpec.from_lines('gitwildmatch', patterns)
+                    base_path = path
                     break
         except ImportError:
             pass

lizard_ext/checkstyleoutput.py

@@ -2,6 +2,7 @@
 Checkstyle XML output for Lizard
 '''
 
+
 def checkstyle_output(all_result, verbose):
     result = all_result.result
     import xml.etree.ElementTree as ET
@@ -20,7 +21,8 @@ def checkstyle_output(all_result, verbose):
                     line=str(func.start_line),
                     column="0",
                     severity="info",
-                    message=f"{func.name} has {func.nloc} NLOC, {func.cyclomatic_complexity} CCN, {func.token_count} token, {len(func.parameters)} PARAM, {func.length} length",
+                    message=f"{func.name} has {func.nloc} NLOC, {func.cyclomatic_complexity} CCN, "
+                           f"{func.token_count} token, {len(func.parameters)} PARAM, {func.length} length",
                     source="lizard"
                 )
 
@@ -28,4 +30,4 @@ def checkstyle_output(all_result, verbose):
     import xml.dom.minidom
     rough_string = ET.tostring(checkstyle, 'utf-8')
     reparsed = xml.dom.minidom.parseString(rough_string)
-    return reparsed.toprettyxml(indent="  ") 
+    return reparsed.toprettyxml(indent="  ")

lizard_ext/htmloutput.py

@@ -48,6 +48,12 @@ TEMPLATE = '''<!DOCTYPE HTML PUBLIC
  <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title>Code complexity report</title>
+  <!-- DataTables CSS -->
+  <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css">
+  <!-- jQuery -->
+  <script src="https://code.jquery.com/jquery-3.7.0.min.js"></script>
+  <!-- DataTables JS -->
+  <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
   <style>
     h2
     {
@@ -88,6 +94,42 @@ TEMPLATE = '''<!DOCTYPE HTML PUBLIC
           font-family: sans-serif;
           white-space: nowrap;
         }
+    td.file-header
+        {
+          background-color: LightBlue;
+          font-weight: bold;
+        }
+    td.function-name
+        {
+          background-color: LightSteelBlue;
+        }
+    /* DataTables wrapper styling */
+    .dataTables_wrapper {
+          margin: 0 auto;
+          width: 95%;
+        }
+    /* Fallback styling if DataTables CSS doesn't load */
+    table#complexityTable {
+          border-collapse: collapse;
+          width: 95%;
+          margin: 0 auto;
+        }
+    table#complexityTable th {
+          background-color: #4CAF50;
+          color: white;
+          padding: 10px;
+          text-align: left;
+          border: 1px solid #ddd;
+        }
+    table#complexityTable td {
+          border: 1px solid #ddd;
+        }
+    table#complexityTable tr:nth-child(even) {
+          background-color: #f2f2f2;
+        }
+    table#complexityTable tr:hover {
+          background-color: #ddd;
+        }
   </style>
  </head>
  <body>
@@ -95,26 +137,29 @@ TEMPLATE = '''<!DOCTYPE HTML PUBLIC
 
 <center>
 
-<table>
+<table id="complexityTable" class="display" style="width:100%">
+  <thead>
+    <tr>
+      <th>File</th>
+      <th>Function name</th>
+      <th>Cyclomatic complexity ({{ thresholds["cyclomatic_complexity"] }})</th>
+      <th>LOC ({{ thresholds["nloc"] }})</th>
+      <th>
+        {% if thresholds["token_count"] %}
+           Token count ({{ thresholds["token_count"] }})
+        {% else %}
+           Token count
+        {% endif %}
+      </th>
+      <th>Parameter count ({{ thresholds["parameter_count"] }})</th>
+    </tr>
+  </thead>
+  <tbody>
 {% for file in files %}
-  <tr><td colspan="7" style="background-color:LightBlue;">
-  Source file: <b>{{ file.filename }}</b></td></tr>
-{% if file.functions|length > 0 %}
-<tr><th>Function name</th><th></th><th>
-Cyclomatic complexity
-({{ thresholds["cyclomatic_complexity"] }})
-</th><th>LOC ({{ thresholds["nloc"] }})</th><th>
-    {% if thresholds["token_count"] %}
-       Token count ({{ thresholds["token_count"] }})
-    {% else %}
-       Token count
-    {% endif %}
-</th><th>Parameter count ({{ thresholds["parameter_count"] }})</th></tr>
-{% endif %}
   {% for func in file.functions %}
   <tr>
-    <td style="background-color:LightSteelBlue">{{ func.name }}</td>
-    <td></td>
+    <td>{{ file.filename }}</td>
+    <td class="function-name">{{ func.name }}</td>
     {% if func.cyclomatic_complexity > thresholds["cyclomatic_complexity"] %}
        <td class="greater-value">{{ func.cyclomatic_complexity }}</td>
     {% else %}
@@ -145,6 +190,7 @@ Cyclomatic complexity
   </tr>
   {% endfor %}
 {% endfor %}
+  </tbody>
 </table>
 <center>
 
@@ -154,6 +200,29 @@ Cyclomatic complexity
     <a href="http://www.lizard.ws/">Lizard</a> on {{ date }}
     </td></tr>
 </table>
+
+<script>
+// Gracefully degrade if CDN is unavailable
+if (typeof jQuery !== 'undefined' && typeof jQuery.fn.dataTable !== 'undefined') {
+    $(document).ready(function() {
+        try {
+            $('#complexityTable').DataTable({
+                "pageLength": 25,
+                "order": [[2, "desc"]],  // Sort by cyclomatic complexity descending by default
+                "columnDefs": [
+                    { "type": "num", "targets": [2, 3, 4, 5] }  // Ensure numeric sorting for metric columns
+                ]
+            });
+        } catch (e) {
+            console.warn('DataTables initialization failed. Displaying static table.', e);
+        }
+    });
+} else {
+    // Fallback: Table will display as static HTML
+    console.info('DataTables not available. Displaying static HTML table.');
+}
+</script>
+
  </body>
 </html>
 

lizard_ext/lizardnd.py

@@ -45,11 +45,43 @@ class LizardExtension(object):  # pylint: disable=R0903
         else:
             indent_indicator = ';'
         for token in tokens:
-            if token in loops:
+            # Handle opening parenthesis - start of condition
+            if token == '(':
+                reader.context.set_in_condition(True)
+                reader.context.increment_condition_depth()
+                reader.context.set_logical_operator_added(False)  # Reset for new condition
+            # Handle closing parenthesis - end of condition
+            elif token == ')':
+                reader.context.decrement_condition_depth()
+                if reader.context.get_condition_depth() == 0:
+                    reader.context.set_in_condition(False)
+                    reader.context.set_logical_operator_added(False)
+            
+            # Handle logical operators && and || within conditions
+            elif token in ('&&', '||'):
+                if reader.context.get_in_condition():
+                    # Only add nesting depth for the first logical operator in a condition
+                    # Subsequent && or || operators in the same condition don't add depth
+                    if not reader.context.get_logical_operator_added():
+                        l_depth = reader.context.add_nd_condition()
+                        if not reader.context.get_loop_status():
+                            reader.context.add_hidden_bracket_condition()
+                            reader.context.loop_bracket_status()
+                        reader.context.set_logical_operator_added(True)
+                else:
+                    # Not in a condition, treat as regular nesting
+                    l_depth = reader.context.add_nd_condition()
+                    if not reader.context.get_loop_status():
+                        reader.context.add_hidden_bracket_condition()
+                        reader.context.loop_bracket_status()
+            
+            # Handle other loop keywords (if, for, while, etc.)
+            elif token in loops and token not in ('&&', '||'):
                 l_depth = reader.context.add_nd_condition()
                 if not reader.context.get_loop_status():
                     reader.context.add_hidden_bracket_condition()
                     reader.context.loop_bracket_status()
+            
             if token == loop_indicator:
                 reader.context.loop_bracket_status()
             if token == bracket:
@@ -82,6 +114,7 @@ class NDFileInfoAddition(FileInfoBuilder):
         self.current_function.nesting_depth = 0
         self.current_function.hidden_bracket = 0
         self.current_function.bracket_loop = False
+        self.reset_condition_tracking()
 
     def add_hidden_bracket_condition(self, inc=1):
         self.current_function.hidden_bracket += inc
@@ -96,6 +129,33 @@ class NDFileInfoAddition(FileInfoBuilder):
     def get_loop_status(self):
         return self.current_function.bracket_loop
 
+    def set_in_condition(self, in_condition):
+        self.current_function.in_condition = in_condition
+
+    def get_in_condition(self):
+        return self.current_function.in_condition
+
+    def increment_condition_depth(self):
+        self.current_function.condition_depth += 1
+
+    def decrement_condition_depth(self):
+        if self.current_function.condition_depth > 0:
+            self.current_function.condition_depth -= 1
+
+    def get_condition_depth(self):
+        return self.current_function.condition_depth
+
+    def reset_condition_tracking(self):
+        self.current_function.in_condition = False
+        self.current_function.condition_depth = 0
+        self.current_function.logical_operator_added = False
+
+    def set_logical_operator_added(self, added):
+        self.current_function.logical_operator_added = added
+
+    def get_logical_operator_added(self):
+        return self.current_function.logical_operator_added
+
 
 def get_method(cls, name):
     """ python3 doesn't need the __func__ to get the func of the
@@ -127,6 +187,9 @@ def _init_nesting_depth_data(self, *_):
     self.max_nesting_depth = 0
     self.hidden_bracket = 0
     self.bracket_loop = False
+    self.in_condition = False  # Track if we're inside a condition
+    self.condition_depth = 0   # Track nesting depth within conditions
+    self.logical_operator_added = False  # Track if we've added nesting for logical operators in current condition
 
 
 patch(NDFileInfoAddition, FileInfoBuilder)

lizard_ext/version.py

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

lizard_languages/__init__.py

@@ -21,10 +21,12 @@ from .rust import RustReader
 from .typescript import TypeScriptReader
 from .fortran import FortranReader
 from .solidity import SolidityReader
-from .jsx import JSXReader
 from .tsx import TSXReader
 from .vue import VueReader
 from .perl import PerlReader
+from .st import StReader
+from .r import RReader
+from .plsql import PLSQLReader
 
 
 def languages():
@@ -50,10 +52,12 @@ def languages():
         SolidityReader,
         ErlangReader,
         ZigReader,
-        JSXReader,
         TSXReader,
         VueReader,
         PerlReader,
+        StReader,
+        RReader,
+        PLSQLReader,
     ]
 
 

lizard_languages/clike.py

@@ -19,7 +19,7 @@ class CCppCommentsMixin(object):  # pylint: disable=R0903
 class CLikeReader(CodeReader, CCppCommentsMixin):
     ''' This is the reader for C, C++ and Java. '''
 
-    ext = ["c", "cpp", "cc", "mm", "cxx", "h", "hpp"]
+    ext = ["c", "cpp", "cc", "cxx", "h", "hpp"]
     language_names = ['cpp', 'c']
     macro_pattern = re.compile(r"#\s*(\w+)\s*(.*)", re.M | re.S)
 
@@ -54,7 +54,7 @@ class CLikeReader(CodeReader, CCppCommentsMixin):
                     elif macro.group(1) == 'include':
                         yield "#include"
                         yield macro.group(2) or "\"\""
-                    for _ in macro.group(2).splitlines()[1:]:
+                    for _ in macro.group(2).split('\n')[1:]:
                         yield '\n'
                 else:
                     yield token
@@ -162,6 +162,11 @@ class CLikeStates(CodeStateMachine):
     def _state_global(self, token):
         if token[0].isalpha() or token[0] in '_~':
             self.try_new_function(token)
+        elif token == '[':
+            # Check if this might be a lambda expression (C++ only)
+            # Java doesn't have lambda expressions, so skip lambda detection for Java
+            if not hasattr(self, 'class_name'):  # JavaStates has class_name attribute
+                self._state = self._state_lambda_check
 
     def _state_function(self, token):
         if token == '(':
@@ -310,3 +315,57 @@ class CLikeStates(CodeStateMachine):
     def _state_attribute(self, _):
         "Ignores function attributes with C++11 syntax, i.e., [[ attribute ]]."
         pass
+
+    def _state_lambda_check(self, token):
+        """Check if this is a lambda expression or a function attribute."""
+        if token == ']':
+            # This is a lambda expression [](params) or [capture](params)
+            # Skip the lambda and continue parsing normally
+            self._state = self._state_lambda_params
+        elif token == '[':
+            # This is a function attribute [[attribute]]
+            self._state = self._state_attribute
+        else:
+            # This is a lambda with capture list [capture](params)
+            # Skip until we find the closing bracket
+            self._state = self._state_lambda_capture
+
+    def _state_lambda_params(self, token):
+        """Handle lambda parameters and body."""
+        if token == '(':
+            # Start of parameter list, skip until closing parenthesis
+            self._state = self._state_lambda_param_list
+        else:
+            # No parameters, check for body
+            self._state = self._state_lambda_body
+
+    def _state_lambda_param_list(self, token):
+        """Handle lambda parameter list."""
+        if token == ')':
+            # End of parameter list, check for body
+            self._state = self._state_lambda_body
+        # Otherwise, continue in parameter list
+
+    def _state_lambda_body(self, token):
+        """Handle lambda body."""
+        if token == '{':
+            # Start of lambda body, skip until closing brace
+            self._state = self._state_lambda_body_skip
+        elif token == ';':
+            # Lambda without body, just a semicolon
+            self._state = self._state_global
+        # Otherwise, continue
+
+    def _state_lambda_body_skip(self, token):
+        """Skip lambda body until closing brace."""
+        if token == '}':
+            # End of lambda body, continue parsing normally
+            self._state = self._state_global
+        # Otherwise, continue skipping
+
+    def _state_lambda_capture(self, token):
+        """Handle lambda capture list."""
+        if token == ']':
+            # End of capture list, continue parsing normally
+            self._state = self._state_global
+        # Otherwise, continue in capture list

lizard_languages/code_reader.py

@@ -138,7 +138,7 @@ class CodeReader:
                 r"|\/\/" + _until_end +
                 r"|\#" +
                 r"|:=|::|\*\*" +
-                r"|\<\s*\?(?:\s*extends\s+\w+)?\s*\>" +
+                r"|\<(?=(?:[^<>]*\?)+[^<>]*\>)(?:[\w\s,.?]|(?:extends))+\>" +
                 r"|" + r"|".join(re.escape(s) for s in combined_symbols) +
                 r"|\\\n" +
                 r"|\n" +