Merge commit 'f1106bf834703f1f2f795da1a3b5f8f40174ffcc'

2023-03-17 00:08:59 +07:00 · 2023-03-17 00:08:59 +07:00 · aef2a84fa5
parent 8266e0a161 f1106bf834
commit aef2a84fa5
12 changed files with 621330 additions and 599172 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,8 +8,8 @@ Added support for Ada.

 Improved parsing for TOML.

-Updated grammars for Bash, C, C++, C#, Clojure, CMake, Elixir, Go and
-Java.
+Updated grammars for Bash, C, C++, C#, Clojure, CMake, Elixir, Go,
+Java and OCaml.

 Difftastic now prefers treating files as 'mostly UTF-8' or binary rather than
 UTF-16. Many files can be decoded as UTF-16 without decoding errors
--- a/vendored_parsers/tree-sitter-ocaml/.github/workflows/publish.yml
+++ b/vendored_parsers/tree-sitter-ocaml/.github/workflows/publish.yml
@ -0,0 +1,29 @@
+name: publish
+
+on:
+  push:
+    tags:
+      - v*
+
+env:
+  CARGO_TERM_COLOR: always
+  CARGO_INCREMENTAL: 0
+
+jobs:
+  crate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+
+      - name: Publish crate
+        uses: katyo/publish-crates@v1
+        with:
+          registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
--- a/vendored_parsers/tree-sitter-ocaml/Cargo.toml
+++ b/vendored_parsers/tree-sitter-ocaml/Cargo.toml
@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-ocaml"
 description = "OCaml grammar for the tree-sitter parsing library"
-version = "0.20.0"
+version = "0.20.1"
 authors = ["Max Brunsfeld <maxbrunsfeld@gmail.com>"]
 license = "MIT"
 readme = "bindings/rust/README.md"
--- a/vendored_parsers/tree-sitter-ocaml/binding.gyp
+++ b/vendored_parsers/tree-sitter-ocaml/binding.gyp
@ -8,9 +8,9 @@
      ],
      "sources": [
        "ocaml/src/parser.c",
-        "ocaml/src/scanner.c",
+        "ocaml/src/scanner.cc",
        "interface/src/parser.c",
-        "interface/src/scanner.c",
+        "interface/src/scanner.cc",
        "bindings/node/binding.cc"
      ],
      "cflags_c": [
--- a/vendored_parsers/tree-sitter-ocaml/interface/src/grammar.json
+++ b/vendored_parsers/tree-sitter-ocaml/interface/src/grammar.json
@ -10677,7 +10677,7 @@
      "type": "SEQ",
      "members": [
        {
-          "type": "STRING",
+          "type": "PATTERN",
          "value": "#"
        },
        {
@ -10699,7 +10699,7 @@
      "type": "SEQ",
      "members": [
        {
-          "type": "STRING",
+          "type": "PATTERN",
          "value": "'"
        },
        {
@ -10721,7 +10721,7 @@
      "type": "SEQ",
      "members": [
        {
-          "type": "STRING",
+          "type": "PATTERN",
          "value": "`"
        },
        {
@ -10761,8 +10761,8 @@
            "type": "SEQ",
            "members": [
              {
-                "type": "STRING",
-                "value": "."
+                "type": "PATTERN",
+                "value": "\\."
              },
              {
                "type": "CHOICE",
--- a/vendored_parsers/tree-sitter-ocaml/interface/src/node-types.json
+++ b/vendored_parsers/tree-sitter-ocaml/interface/src/node-types.json
@ -5622,10 +5622,6 @@
    "type": "_",
    "named": false
  },
-  {
-    "type": "`",
-    "named": false
-  },
  {
    "type": "and",
    "named": false
--- a/vendored_parsers/tree-sitter-ocaml/interface/src/parser.c
+++ b/vendored_parsers/tree-sitter-ocaml/interface/src/parser.c
--- a/vendored_parsers/tree-sitter-ocaml/ocaml/grammar.js
+++ b/vendored_parsers/tree-sitter-ocaml/ocaml/grammar.js
@ -2025,10 +2025,10 @@ module.exports = grammar({
    _capitalized_identifier: $ => /[A-Z][a-zA-Z0-9_']*/,

    _label: $ => seq(choice('~', '?'), $._label_name),
-    directive: $ => seq('#', choice($._identifier, $._capitalized_identifier)),
-    type_variable: $ => seq("'", choice($._identifier, $._capitalized_identifier)),
-    tag: $ => seq('`', choice($._identifier, $._capitalized_identifier)),
-    attribute_id: $ => sep1('.', choice($._identifier, $._capitalized_identifier))
+    directive: $ => seq(/#/, choice($._identifier, $._capitalized_identifier)),
+    type_variable: $ => seq(/'/, choice($._identifier, $._capitalized_identifier)),
+    tag: $ => seq(/`/, choice($._identifier, $._capitalized_identifier)),
+    attribute_id: $ => sep1(/\./, choice($._identifier, $._capitalized_identifier))
  },

  externals: $ => [
--- a/vendored_parsers/tree-sitter-ocaml/ocaml/src/grammar.json
+++ b/vendored_parsers/tree-sitter-ocaml/ocaml/src/grammar.json
@ -10694,7 +10694,7 @@
      "type": "SEQ",
      "members": [
        {
-          "type": "STRING",
+          "type": "PATTERN",
          "value": "#"
        },
        {
@ -10716,7 +10716,7 @@
      "type": "SEQ",
      "members": [
        {
-          "type": "STRING",
+          "type": "PATTERN",
          "value": "'"
        },
        {
@ -10738,7 +10738,7 @@
      "type": "SEQ",
      "members": [
        {
-          "type": "STRING",
+          "type": "PATTERN",
          "value": "`"
        },
        {
@ -10778,8 +10778,8 @@
            "type": "SEQ",
            "members": [
              {
-                "type": "STRING",
-                "value": "."
+                "type": "PATTERN",
+                "value": "\\."
              },
              {
                "type": "CHOICE",
--- a/vendored_parsers/tree-sitter-ocaml/ocaml/src/node-types.json
+++ b/vendored_parsers/tree-sitter-ocaml/ocaml/src/node-types.json
@ -5594,10 +5594,6 @@
    "type": "_",
    "named": false
  },
-  {
-    "type": "`",
-    "named": false
-  },
  {
    "type": "and",
    "named": false
--- a/vendored_parsers/tree-sitter-ocaml/ocaml/src/parser.c
+++ b/vendored_parsers/tree-sitter-ocaml/ocaml/src/parser.c
--- a/vendored_parsers/tree-sitter-ocaml/package.json
+++ b/vendored_parsers/tree-sitter-ocaml/package.json
@ -1,6 +1,6 @@
 {
  "name": "tree-sitter-ocaml",
-  "version": "0.20.0",
+  "version": "0.20.1",
  "description": "OCaml grammar for tree-sitter",
  "keywords": [
    "parser",