Merge remote-tracking branch 'upstream/master' into voyager

Author: vchircu

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "makefile.configureOnOpen": false
+}

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## 1.19.0
+
+### New Features
+- Add PL/SQL language support with comprehensive parsing for procedures, functions, and triggers
+- Add support for schema-qualified names in PL/SQL parser
+
+### Improvements
+- Enhanced JavaScript and TypeScript parsing with improved static and async method detection
+- Better method call detection to avoid false positives in JavaScript/TypeScript
+- Improved previous token context tracking for accurate function detection
+- Reorganized supported languages list in README alphabetically
+
+### Bug Fixes
+- Fix line count calculation issue when encountering empty lines after macro definition continuation markers
+
+### Documentation
+- Add contribution guidelines to README
+
 ## 1.18.0
 
 ### New Features

README.rst

@@ -17,31 +17,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
--  Zig
--  Perl
 -  Structured Text (St)
--  R
+-  Swift
+-  TTCN-3
+-  TypeScript (With TSX)
+-  VueJS
+-  Zig
 
 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
@@ -129,7 +130,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
@@ -382,3 +383,12 @@ 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_ext/__init__.py

@@ -21,7 +21,6 @@ def print_csv(results, options, _, total_factory):
 
 def print_checkstyle(results, options, _, total_factory, file=None):
     import sys
-    print("DEBUG: print_checkstyle called", file=sys.stderr)
     output = checkstyle_output(total_factory(list(results)), options.verbose)
     if file is None:
         file = sys.stdout

lizard_ext/lizardcomplextags.py

@@ -5,10 +5,16 @@
 
 
 class LizardExtension(object):  # pylint: disable=R0903
+    """
+    Complex tags extension: records all complexity-adding keywords and their line numbers.
+    Uses reader.conditions (combined set of all condition types) to track all
+    complexity contributors: control flow, logical operators, case labels, and ternary.
+    """
 
     # pylint: disable=W0221
     def __call__(self, tokens, reader):
         context = reader.context
+        # Use combined conditions set - intentionally includes all types
         conditions = reader.conditions
         for token in tokens:
             yield token

lizard_ext/lizardmccabe.py

@@ -14,9 +14,14 @@
 
 
 class LizardExtension(ExtensionBase):  # pylint: disable=R0903
+    """
+    McCabe extension: only counts the first 'case' in a switch statement.
+    Consecutive cases without code between them don't add to complexity.
+    Works by detecting case tokens (conceptually from reader.case_keywords).
+    """
 
     def _state_global(self, token):
-        if token == "case":
+        if token == "case":  # Detect case keywords
             self._state = self._in_case
 
     def _in_case(self, token):

lizard_ext/lizardmodified.py

@@ -6,14 +6,19 @@
 
 
 class LizardExtension(object):  # pylint: disable=R0903
+    """
+    Modified CCN extension: counts entire switch/case as 1 complexity.
+    Adds +1 for 'switch', subtracts -1 for each 'case'.
+    Works with switch/case keywords (conceptually from reader.case_keywords).
+    """
 
     def __call__(self, tokens, reader):
         for token in tokens:
-            if token == 'switch':
+            if token == 'switch':  # Add complexity for switch statement
                 reader.context.add_condition()
                 if hasattr(reader.context, "add_nd_condition"):
                     reader.context.add_nd_condition()
-            elif token == 'case':
+            elif token == 'case':  # Subtract complexity for each case
                 reader.context.add_condition(-1)
                 if hasattr(reader.context, "add_nd_condition"):
                     reader.context.add_nd_condition(-1)

lizard_ext/lizardnonstrict.py

@@ -9,5 +9,6 @@ class LizardExtension(object):  # pylint: disable=R0903
 
     # pylint: disable=W0221
     def __call__(self, tokens, reader):
-        reader.conditions -= set(['&&', '||', 'and', 'or'])
+        # Remove logical operators from conditions (non-strict mode)
+        reader.conditions -= reader.logical_operators
         return tokens

lizard_ext/version.py

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

lizard_languages/__init__.py

@@ -26,6 +26,7 @@
 from .perl import PerlReader
 from .st import StReader
 from .r import RReader
+from .plsql import PLSQLReader
 
 
 def languages():
@@ -56,6 +57,7 @@ def languages():
         PerlReader,
         StReader,
         RReader,
+        PLSQLReader,
     ]