Update parse examples

tree-sitter · Mar 17, 2024 · f944c56 · f944c56
1 parent e704049
commit f944c56
Show file tree

Hide file tree

Showing 28 changed files with 121 additions and 83 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,6 +19,27 @@ jobs:
         uses: tree-sitter/[email protected]
       - name: Run tests
         uses: tree-sitter/[email protected]
+        with:
+          test-library: ${{runner.os == 'Linux'}}
+
+  parse-examples:
+    name: Parse examples
+    runs-on: ${{matrix.os}}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - name: Set up tree-sitter
+        uses: tree-sitter/[email protected]
+        with:
+          fetch-depth: 1
+          submodules: true
+      - name: Parse examples
+        uses: tree-sitter/parse-action@3a4b1262a5fe2aa8e644e3f9c42059f2f382f2ed
+        with:
+          files-list: test/files.txt
+          invalid-files-list: test/invalid-files.txt
 
   test-swift:
     name: Test Swift binding

diff --git a/.gitignore b/.gitignore
@@ -30,9 +30,6 @@ dist/
 *.dll
 *.pc
 
-# Example dirs
-/examples/*/
-
 # Grammar volatiles
 *.wasm
 *.obj

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,57 @@
+[submodule "examples/0install"]
+	path = examples/0install
+	url = https://github.com/0install/0install
+[submodule "examples/bap"]
+	path = examples/bap
+	url = https://github.com/BinaryAnalysisPlatform/bap
+[submodule "examples/cmdliner"]
+	path = examples/cmdliner
+	url = https://github.com/dbuenzli/cmdliner
+[submodule "examples/pyre-check"]
+	path = examples/pyre-check
+	url = https://github.com/facebook/pyre-check
+[submodule "examples/lablgtk"]
+	path = examples/lablgtk
+	url = https://github.com/garrigue/lablgtk
+[submodule "examples/base"]
+	path = examples/base
+	url = https://github.com/janestreet/base
+[submodule "examples/melange"]
+	path = examples/melange
+	url = https://github.com/melange-re/melange
+[submodule "examples/ocaml-cohttp"]
+	path = examples/ocaml-cohttp
+	url = https://github.com/mirage/ocaml-cohttp
+[submodule "examples/dune"]
+	path = examples/dune
+	url = https://github.com/ocaml/dune
+[submodule "examples/merlin"]
+	path = examples/merlin
+	url = https://github.com/ocaml/merlin
+[submodule "examples/ocaml"]
+	path = examples/ocaml
+	url = https://github.com/ocaml/ocaml
+[submodule "examples/ocaml-lsp"]
+	path = examples/ocaml-lsp
+	url = https://github.com/ocaml/ocaml-lsp
+[submodule "examples/opam"]
+	path = examples/opam
+	url = https://github.com/ocaml/opam
+[submodule "examples/eio"]
+	path = examples/eio
+	url = https://github.com/ocaml-multicore/eio
+[submodule "examples/ocamlformat"]
+	path = examples/ocamlformat
+	url = https://github.com/ocaml-ppx/ocamlformat
+[submodule "examples/ppxlib"]
+	path = examples/ppxlib
+	url = https://github.com/ocaml-ppx/ppxlib
+[submodule "examples/js_of_ocaml"]
+	path = examples/js_of_ocaml
+	url = https://github.com/ocsigen/js_of_ocaml
+[submodule "examples/lwt"]
+	path = examples/lwt
+	url = https://github.com/ocsigen/lwt
+[submodule "examples/owl"]
+	path = examples/owl
+	url = https://github.com/owlbarn/owl
diff --git a/examples/.gitkeep b/examples/.gitkeep
diff --git a/examples/0install b/examples/0install
diff --git a/examples/bap b/examples/bap
diff --git a/examples/base b/examples/base
diff --git a/examples/cmdliner b/examples/cmdliner
diff --git a/examples/dune b/examples/dune
diff --git a/examples/eio b/examples/eio
diff --git a/examples/js_of_ocaml b/examples/js_of_ocaml
diff --git a/examples/lablgtk b/examples/lablgtk
diff --git a/examples/lwt b/examples/lwt
diff --git a/examples/melange b/examples/melange
diff --git a/examples/merlin b/examples/merlin
diff --git a/examples/ocaml b/examples/ocaml
diff --git a/examples/ocaml-cohttp b/examples/ocaml-cohttp
diff --git a/examples/ocaml-lsp b/examples/ocaml-lsp
diff --git a/examples/ocamlformat b/examples/ocamlformat
diff --git a/examples/opam b/examples/opam
diff --git a/examples/owl b/examples/owl
diff --git a/examples/ppxlib b/examples/ppxlib
diff --git a/examples/pyre-check b/examples/pyre-check
diff --git a/package.json b/package.json
@@ -50,7 +50,8 @@
     "test-ocaml": "cd grammars/ocaml && tree-sitter test",
     "test-interface": "cd grammars/interface && tree-sitter test",
     "test-highlight": "tree-sitter test",
-    "parse": "tree-sitter parse"
+    "parse": "tree-sitter parse",
+    "parse-examples": "test/parse-examples.sh"
   },
   "tree-sitter": [
     {

diff --git a/script/parse-examples b/script/parse-examples
diff --git a/test/files.txt b/test/files.txt
@@ -0,0 +1,6 @@
+examples/**/*.ml
+examples/**/*.mli
+!examples/**/*.cppo.*
+!examples/ocamlformat/test/failing/**/*
+!examples/ocamlformat/test/passing/**/*
+!examples/ocaml/testsuite/tests/parse-errors/**/*
diff --git a/script/known_failures.txt → test/invalid-files.txt b/script/known_failures.txt → test/invalid-files.txt
@@ -2,47 +2,34 @@ examples/lablgtk/applications/osiris/osiris.ml
 examples/lablgtk/examples/csview.ml
 examples/lablgtk/tools/introspection/stubs/stubs_Atk.ml
 examples/lablgtk/tools/introspection/stubs/stubs_Pango.ml
-examples/lwt/src/react/lwt_react.cppo.ml
-examples/lwt/src/unix/lwt_unix.cppo.ml
-examples/lwt/src/unix/lwt_unix.cppo.mli
-examples/lwt/test/unix/test_lwt_unix.cppo.ml
+examples/melange/bin/melc.ml
 examples/merlin/tests/test-dirs/completion/infix.t/infix.ml
 examples/merlin/tests/test-dirs/completion/parenthesize.t/parenthesize.ml
 examples/merlin/tests/test-dirs/construct/c-modules.t/functor_app.ml
 examples/merlin/tests/test-dirs/construct/c-modules.t/module.ml
 examples/merlin/tests/test-dirs/errors/typing-after-parsing.t/test.ml
-examples/merlin/tests/test-dirs/locate/context-detection/cd-label.t/label.ml
+examples/merlin/tests/test-dirs/type-enclosing/issueLSP695.t/main.ml
 examples/ocaml/stdlib/templates/float.template.mli
 examples/ocaml/stdlib/templates/moreLabels.template.mli
 examples/ocaml/testsuite/tests/generated-parse-errors/errors.ml
 examples/ocaml/testsuite/tests/lexing/escape.ml
 examples/ocaml/testsuite/tests/lexing/uchar_esc.ml
-examples/ocaml/testsuite/tests/parse-errors/*
-examples/ocaml/testsuite/tests/parsing/anonymous_class_parameter.ml
 examples/ocaml/testsuite/tests/parsing/arrow_ambiguity.ml
 examples/ocaml/testsuite/tests/parsing/constructor_declarations.ml
 examples/ocaml/testsuite/tests/parsing/docstrings.ml
-examples/ocaml/testsuite/tests/parsing/pr6604_2.ml
 examples/ocaml/testsuite/tests/parsing/pr6604.ml
+examples/ocaml/testsuite/tests/parsing/pr6604_2.ml
+examples/ocaml/testsuite/tests/tool-toplevel/error_highlighting.ml
 examples/ocaml/testsuite/tests/tool-toplevel/error_highlighting_use2.ml
 examples/ocaml/testsuite/tests/tool-toplevel/error_highlighting_use3.ml
-examples/ocaml/testsuite/tests/tool-toplevel/error_highlighting.ml
 examples/ocaml/testsuite/tests/typing-misc/typecore_errors.ml
 examples/ocaml/testsuite/tests/typing-sigsubst/sig_local_aliases_syntax_errors.ml
-examples/ocaml/testsuite/tests/typing-sigsubst/sig_local_aliases.ml
 examples/ocaml/testsuite/tests/typing-warnings/pr7261.ml
-examples/ocamlformat/test/failing/*/*
-examples/ocamlformat/test/passing/*/*
 examples/ocamlformat/test/rpc/big_margin/foo.ml
-examples/ocamlformat/vendor/parser-recovery/test/expect/signature/*.mli
-examples/ocamlformat/vendor/parser-recovery/test/expect/structure/*.ml
 examples/ppxlib/astlib/astlib.ml
 examples/ppxlib/astlib/location.ml
 examples/ppxlib/astlib/longident.ml
-examples/ppxlib/test/code_path/test.ml
 examples/ppxlib/test/driver/non-compressible-suffix/test.ml
+examples/ppxlib/test/expansion_helpers/mangle/test.ml
 examples/ppxlib/test/ppx_import_support/test.ml
 examples/ppxlib/test/quoter/test.ml
-examples/opam/src/core/opamCompat.ml
-examples/opam/src/core/opamCompat.mli
-examples/ppxlib/test/expansion_helpers/mangle/test.ml
diff --git a/test/parse-examples.sh b/test/parse-examples.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -ef
+
+cd "$(dirname "$0")/.."
+
+git submodule update --init --depth 1
+
+tree-sitter parse -q -s \
+  $(cat test/files.txt) \
+  $(for file in $(cat test/invalid-files.txt); do echo "!${file}"; done)
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,9 +30,6 @@ dist/ @@
     *.dll
     *.pc
-    # Example dirs
-    /examples/*/
     # Grammar volatiles
     *.wasm
     *.obj
@@ Expand Down @@