Merge pull request DeusData#1854 from DeusData/feat/plsql-language

feat(lang): add Oracle PL/SQL support (distilled from DeusData#1033)

Author: DeusData

THIRD_PARTY.md

@@ -64,6 +64,21 @@ License summary:
   base, MIT, (c) 2014 Max Brunsfeld) with (c) 2026 DeusData ArkTS additions;
   its grammar source lives in `tools/tree-sitter-arkts/`.
 
+### tree-sitter-plsql
+
+- **Project:** [AndreasMaierDe/tree-sitter-plsql](https://github.com/AndreasMaierDe/tree-sitter-plsql)
+- **License:** MIT
+- **Copyright:** (c) 2022 AndreasMaierDe
+- **Vendored at:** `internal/cbm/vendored/grammars/plsql/`
+- **Pinned commit:** `28aebef209be`
+- **Notes:** Community-maintained grammar for Oracle PL/SQL; not in the
+  nvim-treesitter or Helix registries (`community-niche` in the manifest). No
+  external scanner. One local patch: `parser.c`'s
+  `#include <tree_sitter/parser.h>` is changed to the quoted form used by every
+  other vendored grammar, as documented in
+  `internal/cbm/vendored/grammars/MANIFEST.md`. PL/SQL support was originally
+  contributed in PR #1033 by Oğuz (@ouzsrcm).
+
 ### tree-sitter-objectscript (UDL + routine)
 
 - **Project:** [intersystems/tree-sitter-objectscript](https://github.com/intersystems/tree-sitter-objectscript)

internal/cbm/cbm.h

@@ -175,6 +175,7 @@ typedef enum {
     CBM_LANG_OBJECTSCRIPT_ROUTINE, // InterSystems ObjectScript routine (.mac/.int/.rtn/.inc)
     CBM_LANG_OBJECTSCRIPT_EXPORT,  // InterSystems Studio Export XML (<Export generator="Cache">)
     CBM_LANG_ARKTS, // ArkTS (HarmonyOS/OpenHarmony .ets — TypeScript superset + ArkUI)
+    CBM_LANG_PLSQL, // Oracle PL/SQL
     CBM_LANG_COUNT
 } CBMLanguage;
 

internal/cbm/extract_calls.c

@@ -826,6 +826,32 @@ static char *extract_ada_callee(CBMArena *a, TSNode node, const char *source, co
     return NULL;
 }
 
+/* PL/SQL: ref_call → referenced_element. Package-qualified calls use
+ * ref_name_parent.ref_name (e.g. UTIL_PKG.CALC_SALARY); bare calls use
+ * ref_name alone. */
+static char *extract_plsql_callee(CBMArena *a, TSNode node, const char *source, const char *nk) {
+    if (strcmp(nk, "ref_call") != 0) {
+        return NULL;
+    }
+    TSNode ref = cbm_find_child_by_kind(node, "referenced_element");
+    if (ts_node_is_null(ref)) {
+        return NULL;
+    }
+    TSNode parent = ts_node_child_by_field_name(ref, TS_FIELD("ref_name_parent"));
+    TSNode name = ts_node_child_by_field_name(ref, TS_FIELD("ref_name"));
+    if (!ts_node_is_null(parent) && !ts_node_is_null(name)) {
+        char *p = cbm_node_text(a, parent, source);
+        char *n = cbm_node_text(a, name, source);
+        if (p && n && p[0] && n[0]) {
+            return cbm_arena_sprintf(a, "%s.%s", p, n);
+        }
+    }
+    if (!ts_node_is_null(name)) {
+        return cbm_node_text(a, name, source);
+    }
+    return cbm_node_text(a, ref, source);
+}
+
 // Solidity: a call_expression's callee is on the `function` field, wrapped in an
 // `expression` node (call_expression -> function:expression -> identifier). Descend
 // left-most through expression wrappers until we reach the identifier/member.
@@ -1369,6 +1395,9 @@ static char *extract_callee_lang_specific(CBMArena *a, TSNode node, const char *
     if (lang == CBM_LANG_ADA) {
         return extract_ada_callee(a, node, source, nk);
     }
+    if (lang == CBM_LANG_PLSQL) {
+        return extract_plsql_callee(a, node, source, nk);
+    }
     if (lang == CBM_LANG_SOLIDITY) {
         return extract_solidity_callee(a, node, source, nk);
     }

internal/cbm/extract_defs.c

@@ -1051,6 +1051,18 @@ TSNode cbm_resolve_func_name(TSNode node, CBMLanguage lang) {
             }
         }
 
+        /* PL/SQL: create_function / create_procedure / function_* / procedure_*
+         * carry fnc_name / prc_name, not the generic name field. */
+        if (lang == CBM_LANG_PLSQL) {
+            TSNode nm = ts_node_child_by_field_name(node, TS_FIELD("fnc_name"));
+            if (ts_node_is_null(nm)) {
+                nm = ts_node_child_by_field_name(node, TS_FIELD("prc_name"));
+            }
+            if (!ts_node_is_null(nm)) {
+                return nm;
+            }
+        }
+
         /* Smali (no `name` field): method_definition > method_signature >
          * method_identifier holds the method name. */
         if (lang == CBM_LANG_SMALI && strcmp(kind, "method_definition") == 0) {
@@ -4255,6 +4267,16 @@ static void extract_class_def(CBMExtractCtx *ctx, TSNode node, const CBMLangSpec
             name_node = ts_node_child_by_field_name(node, TS_FIELD("type"));
         }
     }
+    // PL/SQL: package / type / trigger names use dedicated fields, not `name`.
+    if (ts_node_is_null(name_node) && ctx->language == CBM_LANG_PLSQL) {
+        name_node = ts_node_child_by_field_name(node, TS_FIELD("package_name"));
+        if (ts_node_is_null(name_node)) {
+            name_node = ts_node_child_by_field_name(node, TS_FIELD("type_name"));
+        }
+        if (ts_node_is_null(name_node)) {
+            name_node = ts_node_child_by_field_name(node, TS_FIELD("trigger_name"));
+        }
+    }
     // Verilog/SystemVerilog (FIELD_COUNT 0): module/class/interface/package use a
     // nested simple_identifier (first descendant); type_declaration must use the
     // DIRECT-child simple_identifier (member/enum idents precede the typedef name).

internal/cbm/extract_usages.c

@@ -197,6 +197,8 @@ static bool is_reference_node(TSNode node, CBMLanguage lang) {
     case CBM_LANG_OBJECTSCRIPT_ROUTINE:
         return strcmp(kind, "objectscript_identifier") == 0 ||
                strcmp(kind, "objectscript_identifier_special") == 0;
+    case CBM_LANG_PLSQL:
+        return strcmp(kind, "identifier") == 0;
     default:
         return false;
     }
@@ -1097,6 +1099,14 @@ static bool is_binding_occurrence(CBMExtractCtx *ctx, TSNode node, const CBMLang
         }
 
         const char *kind = ts_node_type(parent);
+        /* PL/SQL: `parameter` is a ref_call ARGUMENT wrapper (upstream grammar
+         * naming), not a declaration; definition-side bindings use the distinct
+         * parameter_declaration kind. Skip it so call arguments stay ordinary
+         * value usages. */
+        if (ctx->language == CBM_LANG_PLSQL && strcmp(kind, "parameter") == 0) {
+            current = parent;
+            continue;
+        }
         if (kind_in_exact_set(kind, common_whole_binding_nodes) ||
             kind_in_exact_set(kind, occurrence->whole_binding_nodes)) {
             return true;

internal/cbm/grammar_plsql.c

@@ -0,0 +1,3 @@
+// Vendored tree-sitter grammar: plsql (Oracle PL/SQL — AndreasMaierDe/tree-sitter-plsql)
+// Each grammar compiled as separate unit (conflicting static symbols).
+#include "vendored/grammars/plsql/parser.c"

internal/cbm/lang_specs.c

@@ -168,6 +168,7 @@ extern const TSLanguage *tree_sitter_mojo(void);
 extern const TSLanguage *tree_sitter_objectscript_udl(void);
 extern const TSLanguage *tree_sitter_objectscript_routine(void);
 extern const TSLanguage *tree_sitter_arkts(void);
+extern const TSLanguage *tree_sitter_plsql(void);
 
 // -- Empty sentinel --
 static const char *empty_types[] = {NULL};
@@ -1635,6 +1636,29 @@ static const char *mojo_branch_types[] = {"if_statement",
 static const char *mojo_var_types[] = {"assignment", NULL};
 static const char *mojo_assign_types[] = {"assignment", "augmented_assignment", NULL};
 
+// ==================== PL/SQL ====================
+// Node names verified against AndreasMaierDe/tree-sitter-plsql grammar.js.
+static const char *plsql_func_types[] = {"create_function",
+                                         "create_procedure",
+                                         "function_definition",
+                                         "procedure_definition",
+                                         "function_declaration",
+                                         "procedure_declaration",
+                                         NULL};
+static const char *plsql_class_types[] = {"create_package",   "create_package_body", "create_type",
+                                          "create_type_body", "create_trigger",      NULL};
+static const char *plsql_module_types[] = {"source_file", NULL};
+static const char *plsql_call_types[] = {"ref_call", NULL};
+static const char *plsql_branch_types[] = {"if_statement",
+                                           "case_statement",
+                                           "basic_loop_statement",
+                                           "for_loop_statement",
+                                           "while_loop_statement",
+                                           "exception_handler",
+                                           NULL};
+static const char *plsql_assign_types[] = {"assignment_statement", NULL};
+static const char *plsql_throw_types[] = {"raise_statement", NULL};
+
 // InterSystems ObjectScript. Node names verified against
 // intersystems/tree-sitter-objectscript grammar.
 static const char *objectscript_udl_func_types[] = {"method", "classmethod", "query", NULL};
@@ -2666,6 +2690,11 @@ static const CBMLangSpec lang_specs[CBM_LANG_COUNT] = {
                                          NULL},
                         js_throw_types, NULL, ts_decorator_types, NULL,
                         ts_env_members, tree_sitter_arkts, NULL},
+    // CBM_LANG_PLSQL — Oracle PL/SQL. AndreasMaierDe/tree-sitter-plsql (MIT).
+    [CBM_LANG_PLSQL] = {CBM_LANG_PLSQL, plsql_func_types, plsql_class_types, empty_types,
+                        plsql_module_types, plsql_call_types, empty_types, empty_types,
+                        plsql_branch_types, empty_types, plsql_assign_types, plsql_throw_types,
+                        NULL, empty_types, NULL, NULL, tree_sitter_plsql, NULL},
 
 };
 

internal/cbm/vendored/grammars/MANIFEST.md

@@ -9,13 +9,14 @@ The grammars were originally vendored as bare `parser.c`+`scanner.c` with **no r
 
 ## Summary
 
-- Grammars: **160** — vendored-from-upstream: **142**, first-party/self-maintained: **13**, registry-disagreement: **5** (nim removed 2026-06-12; objectscript_udl + objectscript_routine added 2026-06-24; mojo added 2026-07-01; arkts added 2026-08-26 — see notes below)
-- ABI distribution: **7×** ABI-13 **85×** ABI-14 **65×** ABI-15 (runtime ceiling is ABI 15; never vendor ABI 16 without a runtime upgrade)
+- Grammars: **161** — vendored-from-upstream: **143**, first-party/self-maintained: **13**, registry-disagreement: **5** (nim removed 2026-06-12; objectscript_udl + objectscript_routine added 2026-06-24; mojo added 2026-07-01; arkts added 2026-08-26; plsql added 2026-08-27 — see notes below)
+- ABI distribution: **7×** ABI-13 **86×** ABI-14 **65×** ABI-15 (runtime ceiling is ABI 15; never vendor ABI 16 without a runtime upgrade)
 - Vendored copies missing LICENSE: **0** — all upstream LICENSE files restored 2026-06-11 (first-party grammars carry the project MIT license; `move` uses the Helix-listed upstream tzakian/tree-sitter-move MIT text, `zsh` uses georgeharker/tree-sitter-zsh MIT)
-- `verdict`: VERIFIED-BOTH = our source matches *both* registries; VERIFIED-NVIM/HELIX = matches one; registry-disagreement = registries name a different repo (listed separately); `vendor-maintained` = the language vendor's own grammar, not in nvim/Helix.
+- `verdict`: VERIFIED-BOTH = our source matches *both* registries; VERIFIED-NVIM/HELIX = matches one; registry-disagreement = registries name a different repo (listed separately); `vendor-maintained` = the language vendor's own grammar, not in nvim/Helix; `community-niche` = an individual/community-maintained grammar for a niche language, not in nvim/Helix — provenance hand-verified against the upstream repository instead of a registry.
 - **objectscript_udl / objectscript_routine** (added 2026-06-24): vendored from [intersystems/tree-sitter-objectscript](https://github.com/intersystems/tree-sitter-objectscript) @ `a7ffcdf` — MIT, the InterSystems-official grammars (a niche vendor language, hence `vendor-maintained`, not in nvim-treesitter/Helix). **Re-vendor note:** each `scanner.c`'s upstream `#include "../../common/scanner.h"` is repointed to a per-directory `objectscript_common.h` (a verbatim copy of upstream `common/scanner.h`), because this repo's shared `vendored/common/scanner.h` belongs to the cfml/fsharp grammars and differs. The generated `parser.c`/`scanner.c` are otherwise byte-for-byte upstream — on re-vendor, re-apply only that single include rename. **Local modification (2026-07-16):** in `objectscript_common.h`, two loop counters `uint8_t i` were widened to `int i` (the `reverse_marker` scan and the `html_marker_buffer` reversal) to clear CodeQL `cpp/comparison-with-wider-type` — a false positive in practice (both lengths are hard-bounded by `MARKER_BUFFER_MAX_LEN = 30`, so `uint8_t` could never wrap), fixed for cleanliness. On re-vendor, re-apply this widening too (or upstream it at intersystems/tree-sitter-objectscript).
 - **mojo** (added 2026-07-01): vendored from [lsh/tree-sitter-mojo](https://github.com/lsh/tree-sitter-mojo) @ `33193a99afe6` — MIT, ABI 15. Helix tracks `lsh/tree-sitter-mojo` as its Mojo grammar source, but the Helix-pinned commit (`3d7c53b8038f`) no longer resolves in the upstream repository after a force-push, so this vendor uses current upstream `main` rather than the stale registry SHA. Security review covered only the vendored C surface (`parser.c`, `scanner.c`, `tree_sitter/*.h`) plus upstream license/provenance metadata; no package manager hooks, workflow files, prompt/agent instruction files, or generated lockfiles were vendored.
 - **arkts** (added 2026-08-26): **first-party derivative** — a fork of [tree-sitter/tree-sitter-typescript](https://github.com/tree-sitter/tree-sitter-typescript)'s `typescript` dialect pinned @ `75b3874edb2d` (v0.23.2, the same commit our vendored typescript/tsx come from), on the tree-sitter-javascript base @ `3a837b6f3658` (v0.23.1, the version upstream's own package-lock pins), extended with ArkTS/ArkUI syntax (`@Component struct` declarations, UI-DSL trailing-closure calls with post-block attribute chains, decorated function declarations, `import lazy`, `@Extend`/`@Styles` leading-dot attribute chains, anonymous `stateStyles` style blocks). Grammar source + corpus tests live in `tools/tree-sitter-arkts/`; regenerate with `npx tree-sitter-cli@0.25.10 generate` (ABI 15). **External scanner:** `scanner.c` is a symbol-rename trampoline; `_common_scanner.h` is byte-identical (same SHA-256) to the reviewed `typescript/_common_scanner.h` already shipped. **LICENSE:** tree-sitter-typescript's MIT text **verbatim and byte-identical** (© 2017 Max Brunsfeld) — which is what MIT requires of a derivative work, and what lets the provenance audit byte-verify it against upstream rather than take a note on trust. The fork is registered in the audit's `FORKS` map. Our own copyright for the ArkTS additions, and the tree-sitter-javascript attribution (© 2014 Max Brunsfeld), live with the SOURCE in `tools/tree-sitter-arkts/grammar.js` and in `THIRD_PARTY.md`, which is what ships in the release archives.
+- **plsql** (added 2026-08-27): vendored from [AndreasMaierDe/tree-sitter-plsql](https://github.com/AndreasMaierDe/tree-sitter-plsql) @ `28aebef209be` (full: `28aebef209be57169600e1aa41ca1431cc6c916f`, upstream tip; repo dormant since 2023-02) — MIT, ABI 14, **no external scanner** (`EXTERNAL_TOKEN_COUNT 0`). Not listed in nvim-treesitter/Helix (`community-niche`, an individual-maintained grammar); provenance verified directly against upstream (pin = `git ls-remote` HEAD; vendored `parser.c` byte-identical to the pinned clone apart from the include-quote local patch below; 0 non-ASCII bytes; 0 dangerous calls). Security review covered only the vendored C surface (`parser.c`, `tree_sitter/parser.h`) plus upstream license/provenance metadata; no package manager hooks, workflow files, prompt/agent instruction files, or generated lockfiles were vendored. Known upstream limitation: `CREATE TYPE ... AS OBJECT` currently yields ERROR nodes (pinned by `plsql_create_type_as_object_limitation` in `tests/test_extraction.c` + `tests/fixtures/plsql/create_type_as_object_limitation.tps`). Originally contributed as PR #1033 by Oğuz (@ouzsrcm); re-vendored from upstream per vendoring policy with the PR's language wiring distilled on top.
 
 > ⚠️ **Pinned commit = the revision nvim-treesitter/Helix vendor** (battle-tested, canonical source), not bleeding-edge HEAD. When re-vendoring, update the pinned commit here.
 
@@ -46,6 +47,7 @@ Guarded by the `contract_all_grammars_in_graph` graph-breadth test in
 | ispc     | added to the C-family declarator-name gate (extends tree-sitter-c) |
 | odin     | `resolve_func_name`: `procedure_declaration` → `identifier` child |
 | pascal   | `resolve_func_name`: `defProc` → `header` (`declProc`) child's `name` field |
+| plsql    | `resolve_func_name`: `fnc_name`/`prc_name` fields; `extract_class_def`: `package_name`/`type_name`/`trigger_name` fields; `extract_plsql_callee` (extract_calls.c): `ref_call` → `referenced_element`, package-qualified `ref_name_parent.ref_name`; usage vocabulary (extract_usages.c): `identifier`, with the upstream `parameter` kind (a ref_call ARGUMENT wrapper) carved out of the whole-binding rule |
 | racket   | `extract_lisp_def`: `(define …)` head-symbol forms in `list` |
 | rescript | `resolve_func_name`: `function` (arrow) → enclosing `let_binding`'s `pattern` field |
 | scheme   | `extract_lisp_def`: `(define …)` head-symbol forms in `list` |
@@ -54,7 +56,7 @@ Guarded by the `contract_all_grammars_in_graph` graph-breadth test in
 
 ## Local source patches (applied atop pinned upstream)
 
-The grammars below carry a small local patch to their vendored `scanner.c`, on
+The grammars below carry a small local patch to their vendored sources, on
 top of the pinned upstream commit recorded in the vendoring table below.
 Re-vendoring from upstream must re-apply these.
 
@@ -63,6 +65,7 @@ Re-vendoring from upstream must re-apply these.
 | crystal    | `crystal/scanner.c`, serialize    | guard `memcpy(&buffer[offset], state->literals.contents, literal_content_size)` with `if (literal_content_size > 0)` | UBSan: zero-length `memcpy` with a NULL/0-size source on the empty-state serialize round-trip (formal UB, harmless) |
 | rescript   | `rescript/scanner.c`, deserialize | guard `memcpy(state, buffer, n_bytes)` with `if (n_bytes > 0)` | UBSan: zero-length `memcpy` with a NULL `buffer` / `n_bytes == 0` on empty-state deserialize (formal UB, harmless). The sibling serialize copies a fixed `sizeof(ScannerState)` (always > 0, non-NULL src) and needs no guard. |
 | purescript | `purescript/scanner.c`, serialize | guard `memcpy(buffer, indents->data, to_copy)` with `if (to_copy > 0)` | UBSan: zero-length `memcpy` with a NULL/0-size source when the indent vector is empty (formal UB, harmless) |
+| plsql      | `plsql/parser.c`, include         | `#include <tree_sitter/parser.h>` → `#include "tree_sitter/parser.h"` | The older ABI-14 generator emits angle brackets; every other vendored grammar uses the quoted form, which resolves the per-grammar `tree_sitter/` header from the including file's directory |
 
 ## Vendored from verified upstream
 
@@ -158,6 +161,7 @@ Re-vendoring from upstream must re-apply these.
 | perl | 14 | tree-sitter-perl/tree-sitter-perl | `ea9667dc65a8` | VERIFIED-BOTH | ✅ |
 | php | 15 | tree-sitter/tree-sitter-php | `3f2465c217d0` | VERIFIED-BOTH | ✅ |
 | pkl | 15 | apple/tree-sitter-pkl | `f5beed1da8e5` | VERIFIED-BOTH | ✅ |
+| plsql | 14 | AndreasMaierDe/tree-sitter-plsql | `28aebef209be` | community-niche | ✅ |
 | po | 14 | tree-sitter-grammars/tree-sitter-po | `bd860a0f57f6` | VERIFIED-NVIM | ✅ |
 | pony | 14 | tree-sitter-grammars/tree-sitter-pony | `73ff874ae4c9` | VERIFIED-NVIM | ✅ |
 | powershell | 15 | airbus-cert/tree-sitter-powershell | `73800ecc8bdd` | VERIFIED-BOTH | ✅ |