Upstream merge PR

.eslintrc.yml

@@ -12,3 +12,5 @@ globals:
   seq: false
   token: false
   word: false
+
+comma-dangle: always

.gitattributes

@@ -1,2 +1,39 @@
-/src/** linguist-vendored
+* text=auto eol=lf
+
+# Generated source files
+src/*.json linguist-generated
+src/parser.c linguist-generated
+src/tree_sitter/* linguist-generated
+
+# C bindings
+bindings/c/* linguist-generated
+CMakeLists.txt linguist-generated
+Makefile linguist-generated
+
+# Rust bindings
+bindings/rust/* linguist-generated
+Cargo.toml linguist-generated
+Cargo.lock linguist-generated
+
+# Node.js bindings
+bindings/node/* linguist-generated
+binding.gyp linguist-generated
+package.json linguist-generated
+package-lock.json linguist-generated
+
+# Python bindings
+bindings/python/** linguist-generated
+setup.py linguist-generated
+pyproject.toml linguist-generated
+
+# Go bindings
+bindings/go/* linguist-generated
+go.mod linguist-generated
+go.sum linguist-generated
+
+# Swift bindings
+bindings/swift/** linguist-generated
+Package.swift linguist-generated
+Package.resolved linguist-generated
+
 /examples/* linguist-vendored

.github/workflows/ci.yml

@@ -33,9 +33,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Set up tree-sitter
-        uses: tree-sitter/setup-action/cli@v1
+        uses: tree-sitter/setup-action@v2
         with:
-          tree-sitter-ref: v0.25.6
+          tree-sitter-ref: v0.26.3
       - name: Run tests
         uses: tree-sitter/parser-test-action@v2
         with:

codee/patches/0001-Add-TypeScript-source-annotation.patch

@@ -8,7 +8,7 @@ Subject: Add TypeScript source annotation
  1 file changed, 6 insertions(+)
 
 diff --git a/grammar.js b/grammar.js
-index 8b9f384..4f84bdb 100644
+index 0d10694..82d6070 100644
 --- a/grammar.js
 +++ b/grammar.js
 @@ -14,6 +14,12 @@

codee/patches/0002-Unalias-keywords-that-are-identifier-s.patch

@@ -10,10 +10,10 @@ so they don't show as unnamed children of `identifier`s nodes.
  2 files changed, 96 insertions(+), 65 deletions(-)
 
 diff --git a/grammar.js b/grammar.js
-index 4f84bdb..bd68a65 100644
+index 82d6070..e85449a 100644
 --- a/grammar.js
 +++ b/grammar.js
-@@ -2292,71 +2292,71 @@ module.exports = grammar({
+@@ -2341,71 +2341,71 @@ module.exports = grammar({
      // add the keywords here -- and possibly in `conflicts` too.
      identifier: $ => choice(
        /[a-zA-Z_$][\w$]*/,

codee/patches/0003-Add-semantic-accessors.patch

@@ -13,11 +13,11 @@ Subject: Add semantic accessors
  6 files changed, 36 insertions(+), 23 deletions(-)
 
 diff --git a/grammar.js b/grammar.js
-index bd68a65..1289710 100644
+index e85449a..9b6029f 100644
 --- a/grammar.js
 +++ b/grammar.js
-@@ -305,7 +305,11 @@ module.exports = grammar({
-       $.end_program_statement
+@@ -311,7 +311,11 @@ module.exports = grammar({
+       $._end_of_statement
      ),
 
 -    program_statement: $ => seq(caseInsensitive('program'), $._name, $._end_of_statement),
@@ -26,11 +26,11 @@ index bd68a65..1289710 100644
 +      field('name', $._name),
 +      $._end_of_statement
 +    ),
-     end_program_statement: $ => blockStructureEnding($, 'program'),
+     end_program_statement: $ => blockStructureEnding1($, 'program', $._name),
 
      module: $ => seq(
-@@ -321,7 +325,11 @@ module.exports = grammar({
-       $.end_module_statement
+@@ -328,7 +332,11 @@ module.exports = grammar({
+       $._end_of_statement
      ),
 
 -    module_statement: $ => seq(caseInsensitive('module'), $._name, $._end_of_statement),
@@ -39,19 +39,19 @@ index bd68a65..1289710 100644
 +      field('name', $._name),
 +      $._end_of_statement
 +    ),
-     end_module_statement: $ => blockStructureEnding($, 'module'),
+     end_module_statement: $ => blockStructureEnding1($, 'module', $._name),
 
      submodule: $ => seq(
-@@ -345,7 +353,7 @@ module.exports = grammar({
+@@ -353,7 +361,7 @@ module.exports = grammar({
          ':', field('parent', $.module_name)
        )),
        ')',
 -      $._name,
 +      field('name', $._name),
        $._end_of_statement,
      ),
-     end_submodule_statement: $ => blockStructureEnding($, 'submodule'),
-@@ -377,7 +385,7 @@ module.exports = grammar({
+     end_submodule_statement: $ => blockStructureEnding1($, 'submodule', $._name),
+@@ -386,7 +394,7 @@ module.exports = grammar({
      interface_statement: $ => seq(
        optional($.abstract_specifier),
        caseInsensitive('interface'),
@@ -60,7 +60,7 @@ index bd68a65..1289710 100644
        $._end_of_statement,
      ),
 
-@@ -771,8 +779,13 @@ module.exports = grammar({
+@@ -772,8 +780,13 @@ module.exports = grammar({
        optional($.statement_label),
        caseInsensitive('type'),
        choice(
@@ -76,7 +76,7 @@ index bd68a65..1289710 100644
        ),
        optional(alias($.argument_list, $.derived_type_parameter_list)),
        $._end_of_statement,
-@@ -2059,7 +2072,7 @@ module.exports = grammar({
+@@ -2111,7 +2124,7 @@ module.exports = grammar({
      // precedence is used to prevent conflict with assignment expression
      keyword_argument: $ => prec(1, seq(
        field("name",$.identifier),
@@ -86,10 +86,10 @@ index bd68a65..1289710 100644
      )),
 
 diff --git a/test/corpus/constructs.txt b/test/corpus/constructs.txt
-index ab165f0..9b2eccb 100644
+index 6c43d2f..ea76986 100644
 --- a/test/corpus/constructs.txt
 +++ b/test/corpus/constructs.txt
-@@ -988,12 +988,12 @@ end program
+@@ -983,12 +983,12 @@ end program
  (translation_unit
    (program
      (program_statement
@@ -104,7 +104,7 @@ index ab165f0..9b2eccb 100644
        (end_type_statement
          (name)))
      (derived_type_definition
-@@ -1001,7 +1001,7 @@ end program
+@@ -996,7 +996,7 @@ end program
          access: (access_specifier)
          base: (base_type_specifier
            (identifier))
@@ -145,7 +145,7 @@ index 63781fa..cf7f6c4 100644
        left: (identifier)
        right: (call_expression
 diff --git a/test/corpus/preprocessor.txt b/test/corpus/preprocessor.txt
-index d9dd3a3..a42ff39 100644
+index 2b9de62..0d9b717 100644
 --- a/test/corpus/preprocessor.txt
 +++ b/test/corpus/preprocessor.txt
 @@ -453,7 +453,7 @@ end program
@@ -157,7 +157,7 @@ index d9dd3a3..a42ff39 100644
      (use_statement
        (module_name)
        (included_items
-@@ -541,7 +541,7 @@ end module foo
+@@ -540,7 +540,7 @@ end module foo
  (translation_unit
    (module
      (module_statement
@@ -166,7 +166,7 @@ index d9dd3a3..a42ff39 100644
      (internal_procedures
        (contains_statement)
        (subroutine
-@@ -591,7 +591,7 @@ end module foo
+@@ -590,7 +590,7 @@ end module foo
  (translation_unit
    (module
      (module_statement
@@ -175,7 +175,7 @@ index d9dd3a3..a42ff39 100644
      (internal_procedures
        (contains_statement)
        (subroutine
-@@ -651,7 +651,7 @@ end module foo
+@@ -650,7 +650,7 @@ end module foo
  (translation_unit
    (module
      (module_statement
@@ -198,7 +198,7 @@ index fc47bf1..1af946a 100644
        left: (call_expression
          (identifier)
 diff --git a/test/corpus/statements.txt b/test/corpus/statements.txt
-index 2065d4f..96bef40 100644
+index 0df6bfe..613be42 100644
 --- a/test/corpus/statements.txt
 +++ b/test/corpus/statements.txt
 @@ -289,7 +289,7 @@ END PROGRAM
@@ -219,7 +219,7 @@ index 2065d4f..96bef40 100644
      (variable_declaration
        type: (intrinsic_type)
        attribute: (type_qualifier
-@@ -1987,7 +1987,7 @@ END PROGRAM test
+@@ -2112,7 +2112,7 @@ END PROGRAM test
  (translation_unit
    (program
      (program_statement
@@ -228,7 +228,7 @@ index 2065d4f..96bef40 100644
      (enum
        (enum_statement
          (language_binding
-@@ -2748,7 +2748,7 @@ end program test
+@@ -2893,7 +2893,7 @@ end program test
  (translation_unit
    (program
      (program_statement
@@ -237,7 +237,7 @@ index 2065d4f..96bef40 100644
      (allocate_statement
        allocation: (sized_allocation
          (identifier)
-@@ -3536,7 +3536,7 @@ end program
+@@ -3681,7 +3681,7 @@ end program
  (translation_unit
    (program
      (program_statement