From fcebc24cbd38feb2510c067cad6f300571a5ae66 Mon Sep 17 00:00:00 2001 From: CrossR Date: Fri, 10 Apr 2020 21:58:39 +0100 Subject: [PATCH 1/6] Bring in updated library. --- bench.esy.lock/index.json | 95 +++++++++---------- bench.esy.lock/opam/ocplib-endian.1.0/opam | 33 ------- bench.esy.lock/opam/ocplib-endian.1.1/opam | 38 ++++++++ .../opam/zed.2.0.7}/opam | 4 +- .../package.json | 2 +- .../files/esy-fix.patch | 13 --- .../files/ocplib-endian-0.8.patch | 41 -------- .../package.json | 34 ------- esy.lock/index.json | 95 +++++++++---------- esy.lock/opam/ocplib-endian.1.0/opam | 33 ------- esy.lock/opam/ocplib-endian.1.1/opam | 38 ++++++++ .../opam/zed.2.0.7}/opam | 4 +- .../package.json | 2 +- .../files/esy-fix.patch | 13 --- .../files/ocplib-endian-0.8.patch | 41 -------- .../package.json | 34 ------- integrationtest.esy.lock/index.json | 95 +++++++++---------- .../opam/ocplib-endian.1.0/opam | 33 ------- .../opam/ocplib-endian.1.1/opam | 38 ++++++++ .../opam/zed.2.0.7}/opam | 4 +- .../package.json | 2 +- .../files/esy-fix.patch | 13 --- .../files/ocplib-endian-0.8.patch | 41 -------- .../package.json | 34 ------- package.json | 3 +- test.esy.lock/index.json | 95 +++++++++---------- test.esy.lock/opam/ocplib-endian.1.0/opam | 33 ------- test.esy.lock/opam/ocplib-endian.1.1/opam | 38 ++++++++ .../opam/zed.2.0.7}/opam | 4 +- .../package.json | 2 +- .../files/esy-fix.patch | 13 --- .../files/ocplib-endian-0.8.patch | 41 -------- .../package.json | 34 ------- 33 files changed, 338 insertions(+), 705 deletions(-) delete mode 100644 bench.esy.lock/opam/ocplib-endian.1.0/opam create mode 100644 bench.esy.lock/opam/ocplib-endian.1.1/opam rename {integrationtest.esy.lock/opam/zed.2.0.6 => bench.esy.lock/opam/zed.2.0.7}/opam (94%) delete mode 100644 bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch delete mode 100644 bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch delete mode 100644 bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json delete mode 100644 esy.lock/opam/ocplib-endian.1.0/opam create mode 100644 esy.lock/opam/ocplib-endian.1.1/opam rename {bench.esy.lock/opam/zed.2.0.6 => esy.lock/opam/zed.2.0.7}/opam (94%) delete mode 100644 esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch delete mode 100644 esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch delete mode 100644 esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json delete mode 100644 integrationtest.esy.lock/opam/ocplib-endian.1.0/opam create mode 100644 integrationtest.esy.lock/opam/ocplib-endian.1.1/opam rename {test.esy.lock/opam/zed.2.0.6 => integrationtest.esy.lock/opam/zed.2.0.7}/opam (94%) delete mode 100644 integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch delete mode 100644 integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch delete mode 100644 integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json delete mode 100644 test.esy.lock/opam/ocplib-endian.1.0/opam create mode 100644 test.esy.lock/opam/ocplib-endian.1.1/opam rename {esy.lock/opam/zed.2.0.6 => test.esy.lock/opam/zed.2.0.7}/opam (94%) delete mode 100644 test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch delete mode 100644 test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch delete mode 100644 test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json index 9c7f334e60..a2d1b95ec5 100644 --- a/bench.esy.lock/index.json +++ b/bench.esy.lock/index.json @@ -1,17 +1,17 @@ { - "checksum": "cd369b0b1e138fa52818bed765badbd0", + "checksum": "3c5a89bf3734c34cd52aec0d364c6da1", "root": "Oni2@link-dev:./package.json", "node": { - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9": { + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { "id": - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9", + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9", "name": "yarn-pkg-config", "version": - "github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0", + "github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79", "source": { "type": "install", "source": [ - "github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0" + "github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79" ] }, "overrides": [], @@ -287,26 +287,26 @@ ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, - "reason-tree-sitter@1.0.1001@d41d8cd9": { - "id": "reason-tree-sitter@1.0.1001@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9": { + "id": + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", "name": "reason-tree-sitter", - "version": "1.0.1001", + "version": "github:CrossR/reason-tree-sitter#5baa4ae", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/reason-tree-sitter/-/reason-tree-sitter-1.0.1001.tgz#sha1:bd642ac513d19dc1151ab78d983cab779677cb31" - ] + "source": [ "github:CrossR/reason-tree-sitter#5baa4ae" ] }, "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", - "ocaml@4.8.1000@d41d8cd9", "esy-tree-sitter@1.4.1@d41d8cd9", + "ocaml@4.8.1000@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", "editor-core-types@github:onivim/editor-core-types#6a8afaf@d41d8cd9", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", "@esy-ocaml/reason@github:facebook/reason#8f71db0@d41d8cd9" ], - "devDependencies": [] + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, "reason-textmate@3.0.0@d41d8cd9": { "id": "reason-textmate@3.0.0@d41d8cd9", @@ -842,15 +842,13 @@ ], "devDependencies": [] }, - "esy-tree-sitter@1.4.1@d41d8cd9": { - "id": "esy-tree-sitter@1.4.1@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9": { + "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", "name": "esy-tree-sitter", - "version": "1.4.1", + "version": "github:CrossR/esy-tree-sitter#4453dce", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/esy-tree-sitter/-/esy-tree-sitter-1.4.1.tgz#sha1:67731d4e01fb391ebd1988a4781d41e1532ac6b6" - ] + "source": [ "github:CrossR/esy-tree-sitter#4453dce" ] }, "overrides": [], "dependencies": [], @@ -1210,7 +1208,7 @@ "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", - "reason-tree-sitter@1.0.1001@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", "reason-textmate@3.0.0@d41d8cd9", "reason-sdl2@2.10.3021@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9", "reason-libvim@github:onivim/reason-libvim#5a6976d@d41d8cd9", @@ -1335,20 +1333,20 @@ ], "devDependencies": [] }, - "@opam/zed@opam:2.0.6@d92df64a": { - "id": "@opam/zed@opam:2.0.6@d92df64a", + "@opam/zed@opam:2.0.7@5978011f": { + "id": "@opam/zed@opam:2.0.7@5978011f", "name": "@opam/zed", - "version": "opam:2.0.6", + "version": "opam:2.0.7", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/49/49de58f753bb4dd43ef6c2bc864ea8ff#md5:49de58f753bb4dd43ef6c2bc864ea8ff", - "archive:https://github.com/ocaml-community/zed/releases/download/2.0.6/zed-2.0.6.tbz#md5:49de58f753bb4dd43ef6c2bc864ea8ff" + "archive:https://opam.ocaml.org/cache/md5/a8/a84bfb0171181e171643f494f00c0ae2#md5:a84bfb0171181e171643f494f00c0ae2", + "archive:https://github.com/ocaml-community/zed/releases/download/2.0.7/zed-2.0.7.tbz#md5:a84bfb0171181e171643f494f00c0ae2" ], "opam": { "name": "zed", - "version": "2.0.6", - "path": "bench.esy.lock/opam/zed.2.0.6" + "version": "2.0.7", + "path": "bench.esy.lock/opam/zed.2.0.7" } }, "overrides": [], @@ -2077,38 +2075,31 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3" ] }, - "@opam/ocplib-endian@opam:1.0@aa720242": { - "id": "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88": { + "id": "@opam/ocplib-endian@opam:1.1@84c1ca88", "name": "@opam/ocplib-endian", - "version": "opam:1.0", + "version": "opam:1.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/74/74b45ba33e189283170a748c2a3ed477#md5:74b45ba33e189283170a748c2a3ed477", - "archive:https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz#md5:74b45ba33e189283170a748c2a3ed477" + "archive:https://opam.ocaml.org/cache/md5/de/dedf4d69c1b87b3c6c7234f632399285#md5:dedf4d69c1b87b3c6c7234f632399285", + "archive:https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz#md5:dedf4d69c1b87b3c6c7234f632399285" ], "opam": { "name": "ocplib-endian", - "version": "1.0", - "path": "bench.esy.lock/opam/ocplib-endian.1.0" + "version": "1.1", + "path": "bench.esy.lock/opam/ocplib-endian.1.1" } }, - "overrides": [ - { - "opamoverride": - "bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3", "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -2517,7 +2508,7 @@ "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.5@6b753c82", - "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", "@opam/cppo@opam:1.6.6@f4f83858", @@ -2528,7 +2519,7 @@ "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.5@6b753c82", - "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3" @@ -2596,7 +2587,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.6@d92df64a", + "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.7@5978011f", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", @@ -2605,7 +2596,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.6@d92df64a", + "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.7@5978011f", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", @@ -2958,7 +2949,7 @@ "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/integers@opam:0.3.0@d6eefd3a", - "@opam/conf-pkg-config@opam:1.1@b904ac35", + "@opam/conf-pkg-config@opam:1.1@55d8e330", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -3011,8 +3002,8 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/conf-pkg-config@opam:1.1@b904ac35": { - "id": "@opam/conf-pkg-config@opam:1.1@b904ac35", + "@opam/conf-pkg-config@opam:1.1@55d8e330": { + "id": "@opam/conf-pkg-config@opam:1.1@55d8e330", "name": "@opam/conf-pkg-config", "version": "opam:1.1", "source": { @@ -3031,7 +3022,7 @@ } ], "dependencies": [ - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9", + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] diff --git a/bench.esy.lock/opam/ocplib-endian.1.0/opam b/bench.esy.lock/opam/ocplib-endian.1.0/opam deleted file mode 100644 index d468f3e4d1..0000000000 --- a/bench.esy.lock/opam/ocplib-endian.1.0/opam +++ /dev/null @@ -1,33 +0,0 @@ -opam-version: "2.0" -authors: "Pierre Chambart" -maintainer: "pierre.chambart@ocamlpro.com" -homepage: "https://github.com/OCamlPro/ocplib-endian" -build: [ - ["ocaml" "setup.ml" "-configure" "--disable-debug" "--prefix" prefix] - ["ocaml" "setup.ml" "-build"] -] -install: [ - ["ocaml" "setup.ml" "-install"] -] -remove: ["ocamlfind" "remove" "ocplib-endian"] -depends: [ - "ocaml" - "base-bytes" - "ocamlfind" - "cppo" {>= "1.1.0"} - "ocamlbuild" {build} -] -dev-repo: "git+https://github.com/OCamlPro/ocplib-endian.git" -bug-reports: "https://github.com/OCamlPro/ocplib-endian/issues" -synopsis: - "Optimised functions to read and write int16/32/64 from strings and bigarrays, based on new primitives added in version 4.01." -description: """ -The library implements three modules: -* [EndianString](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianString.cppo.mli) works directly on strings, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; -* [EndianBytes](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBytes.cppo.mli) works directly on bytes, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; -* [EndianBigstring](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBigstring.cppo.mli) works on bigstrings (Bigarrays of chars), and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts;""" -flags: light-uninstall -url { - src: "https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz" - checksum: "md5=74b45ba33e189283170a748c2a3ed477" -} diff --git a/bench.esy.lock/opam/ocplib-endian.1.1/opam b/bench.esy.lock/opam/ocplib-endian.1.1/opam new file mode 100644 index 0000000000..c3c2ac6e46 --- /dev/null +++ b/bench.esy.lock/opam/ocplib-endian.1.1/opam @@ -0,0 +1,38 @@ +opam-version: "2.0" +synopsis: + "Optimised functions to read and write int16/32/64 from strings and bigarrays" +description: """ +The library implements three modules: +* [EndianString](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianString.mli) works directly on strings, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; +* [EndianBytes](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBytes.mli) works directly on bytes, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; +* [EndianBigstring](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBigstring.mli) works on bigstrings (Bigarrays of chars), and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts.""" +maintainer: "pierre.chambart@ocamlpro.com" +authors: "Pierre Chambart" +homepage: "https://github.com/OCamlPro/ocplib-endian" +doc: "https://ocamlpro.github.io/ocplib-endian/ocplib-endian/" +bug-reports: "https://github.com/OCamlPro/ocplib-endian/issues" +depends: [ + "base-bytes" + "ocaml" {>= "4.02.3"} + "cppo" {>= "1.1.0" & build} + "dune" {>= "1.0"} +] +build: [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} +] +dev-repo: "git+https://github.com/OCamlPro/ocplib-endian.git" +url { + src: "https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz" + checksum: [ + "md5=dedf4d69c1b87b3c6c7234f632399285" + "sha512=39351c666d1394770696fa89ac62f7c137ad1697d99888bfba2cc8de2c61df05dd8b3aa327c117bf38f3e29e081026d2c575c5ad0022bde92b3d43aba577d3f9" + ] +} \ No newline at end of file diff --git a/integrationtest.esy.lock/opam/zed.2.0.6/opam b/bench.esy.lock/opam/zed.2.0.7/opam similarity index 94% rename from integrationtest.esy.lock/opam/zed.2.0.6/opam rename to bench.esy.lock/opam/zed.2.0.7/opam index f464fabc80..4424ffdfa2 100644 --- a/integrationtest.esy.lock/opam/zed.2.0.6/opam +++ b/bench.esy.lock/opam/zed.2.0.7/opam @@ -27,6 +27,6 @@ Unicode buffers. Zed also features a regular expression search on ropes. To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.""" url { - src: "https://github.com/ocaml-community/zed/releases/download/2.0.6/zed-2.0.6.tbz" - checksum: "md5=49de58f753bb4dd43ef6c2bc864ea8ff" + src: "https://github.com/ocaml-community/zed/releases/download/2.0.7/zed-2.0.7.tbz" + checksum: "md5=a84bfb0171181e171643f494f00c0ae2" } diff --git a/bench.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json b/bench.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json index 6d710b6671..80258c0a7d 100644 --- a/bench.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json +++ b/bench.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json @@ -6,6 +6,6 @@ ] ], "dependencies": { - "yarn-pkg-config": "esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0" + "yarn-pkg-config": "esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79" } } diff --git a/bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch b/bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch deleted file mode 100644 index b9e945a1f3..0000000000 --- a/bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./setup.ml -+++ ./setup.ml -@@ -6331,9 +6331,7 @@ - [ - "-classic-display"; - "-no-log"; -- "-no-links"; -- "-install-lib-dir"; -- (Filename.concat (standard_library ()) "ocamlbuild") -+ "-no-links" - ] - else - []; diff --git a/bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch b/bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch deleted file mode 100644 index 7cafa0dd48..0000000000 --- a/bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./myocamlbuild.ml -+++ ./myocamlbuild.ml -@@ -573,6 +573,24 @@ - Add a dependency after dropping support for 4.01 and earlier. *) - let dispatch_cppo = function - | After_rules -> begin -+ let is_directory s = -+ let slen = String.length s in -+ let s = -+ if Sys.os_type <> "Win32" || slen < 2 then -+ s -+ else -+ match s.[slen-1] with -+ | '\\' | '/' -> -+ if slen <> 3 || s.[1] <> ':' then -+ String.sub s 0 (slen -1) -+ else -+ (match s.[0] with -+ | 'A' .. 'Z' | 'a' .. 'z' -> s -+ | _ -> String.sub s 0 (slen -1)) -+ | _ -> s -+ in -+ Pathname.is_directory s -+ in - let cppo_rules ext = - let dep = "%(name).cppo"-.-ext - and prod1 = "%(name: <*> and not <*.cppo>)"-.-ext -@@ -591,11 +609,11 @@ - pflag ["cppo"] "cppo_D" (fun s -> S [A "-D"; A s]) ; - pflag ["cppo"] "cppo_U" (fun s -> S [A "-U"; A s]) ; - pflag ["cppo"] "cppo_I" (fun s -> -- if Pathname.is_directory s then S [A "-I"; P s] -+ if is_directory s then S [A "-I"; P s] - else S [A "-I"; P (Pathname.dirname s)] - ) ; - pdep ["cppo"] "cppo_I" (fun s -> -- if Pathname.is_directory s then [] else [s]) ; -+ if is_directory s then [] else [s]) ; - flag ["cppo"; "cppo_q"] (A "-q") ; - flag ["cppo"; "cppo_s"] (A "-s") ; - flag ["cppo"; "cppo_n"] (A "-n") ; diff --git a/bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json b/bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json deleted file mode 100644 index 86ea38bce9..0000000000 --- a/bench.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "build": [ - [ - "bash", - "-c", - "#{os == 'windows' ? 'patch -p1 < ocplib-endian-0.8.patch' : 'true'}" - ], - [ - "bash", - "-c", - "#{os == 'windows' ? 'patch -p1 < esy-fix.patch' : 'true'}" - ], - [ - "ocaml", - "setup.ml", - "-configure", - "--disable-debug", - "--prefix", - "#{self.install}" - ], - [ - "ocaml", - "setup.ml", - "-build" - ] - ], - "install": [ - [ - "ocaml", - "setup.ml", - "-install" - ] - ] -} diff --git a/esy.lock/index.json b/esy.lock/index.json index ccefea89fc..382d423c74 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,17 +1,17 @@ { - "checksum": "cd369b0b1e138fa52818bed765badbd0", + "checksum": "3c5a89bf3734c34cd52aec0d364c6da1", "root": "Oni2@link-dev:./package.json", "node": { - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9": { + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { "id": - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9", + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9", "name": "yarn-pkg-config", "version": - "github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0", + "github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79", "source": { "type": "install", "source": [ - "github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0" + "github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79" ] }, "overrides": [], @@ -287,26 +287,26 @@ ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, - "reason-tree-sitter@1.0.1001@d41d8cd9": { - "id": "reason-tree-sitter@1.0.1001@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9": { + "id": + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", "name": "reason-tree-sitter", - "version": "1.0.1001", + "version": "github:CrossR/reason-tree-sitter#5baa4ae", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/reason-tree-sitter/-/reason-tree-sitter-1.0.1001.tgz#sha1:bd642ac513d19dc1151ab78d983cab779677cb31" - ] + "source": [ "github:CrossR/reason-tree-sitter#5baa4ae" ] }, "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", - "ocaml@4.8.1000@d41d8cd9", "esy-tree-sitter@1.4.1@d41d8cd9", + "ocaml@4.8.1000@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", "editor-core-types@github:onivim/editor-core-types#6a8afaf@d41d8cd9", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", "@esy-ocaml/reason@github:facebook/reason#8f71db0@d41d8cd9" ], - "devDependencies": [] + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, "reason-textmate@3.0.0@d41d8cd9": { "id": "reason-textmate@3.0.0@d41d8cd9", @@ -842,15 +842,13 @@ ], "devDependencies": [] }, - "esy-tree-sitter@1.4.1@d41d8cd9": { - "id": "esy-tree-sitter@1.4.1@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9": { + "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", "name": "esy-tree-sitter", - "version": "1.4.1", + "version": "github:CrossR/esy-tree-sitter#4453dce", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/esy-tree-sitter/-/esy-tree-sitter-1.4.1.tgz#sha1:67731d4e01fb391ebd1988a4781d41e1532ac6b6" - ] + "source": [ "github:CrossR/esy-tree-sitter#4453dce" ] }, "overrides": [], "dependencies": [], @@ -1209,7 +1207,7 @@ "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", - "reason-tree-sitter@1.0.1001@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", "reason-textmate@3.0.0@d41d8cd9", "reason-sdl2@2.10.3021@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9", "reason-libvim@github:onivim/reason-libvim#5a6976d@d41d8cd9", @@ -1334,20 +1332,20 @@ ], "devDependencies": [] }, - "@opam/zed@opam:2.0.6@d92df64a": { - "id": "@opam/zed@opam:2.0.6@d92df64a", + "@opam/zed@opam:2.0.7@5978011f": { + "id": "@opam/zed@opam:2.0.7@5978011f", "name": "@opam/zed", - "version": "opam:2.0.6", + "version": "opam:2.0.7", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/49/49de58f753bb4dd43ef6c2bc864ea8ff#md5:49de58f753bb4dd43ef6c2bc864ea8ff", - "archive:https://github.com/ocaml-community/zed/releases/download/2.0.6/zed-2.0.6.tbz#md5:49de58f753bb4dd43ef6c2bc864ea8ff" + "archive:https://opam.ocaml.org/cache/md5/a8/a84bfb0171181e171643f494f00c0ae2#md5:a84bfb0171181e171643f494f00c0ae2", + "archive:https://github.com/ocaml-community/zed/releases/download/2.0.7/zed-2.0.7.tbz#md5:a84bfb0171181e171643f494f00c0ae2" ], "opam": { "name": "zed", - "version": "2.0.6", - "path": "esy.lock/opam/zed.2.0.6" + "version": "2.0.7", + "path": "esy.lock/opam/zed.2.0.7" } }, "overrides": [], @@ -2076,38 +2074,31 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3" ] }, - "@opam/ocplib-endian@opam:1.0@aa720242": { - "id": "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88": { + "id": "@opam/ocplib-endian@opam:1.1@84c1ca88", "name": "@opam/ocplib-endian", - "version": "opam:1.0", + "version": "opam:1.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/74/74b45ba33e189283170a748c2a3ed477#md5:74b45ba33e189283170a748c2a3ed477", - "archive:https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz#md5:74b45ba33e189283170a748c2a3ed477" + "archive:https://opam.ocaml.org/cache/md5/de/dedf4d69c1b87b3c6c7234f632399285#md5:dedf4d69c1b87b3c6c7234f632399285", + "archive:https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz#md5:dedf4d69c1b87b3c6c7234f632399285" ], "opam": { "name": "ocplib-endian", - "version": "1.0", - "path": "esy.lock/opam/ocplib-endian.1.0" + "version": "1.1", + "path": "esy.lock/opam/ocplib-endian.1.1" } }, - "overrides": [ - { - "opamoverride": - "esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3", "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -2516,7 +2507,7 @@ "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.5@6b753c82", - "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", "@opam/cppo@opam:1.6.6@f4f83858", @@ -2527,7 +2518,7 @@ "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.5@6b753c82", - "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3" @@ -2595,7 +2586,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.6@d92df64a", + "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.7@5978011f", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", @@ -2604,7 +2595,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.6@d92df64a", + "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.7@5978011f", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", @@ -2957,7 +2948,7 @@ "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/integers@opam:0.3.0@d6eefd3a", - "@opam/conf-pkg-config@opam:1.1@b904ac35", + "@opam/conf-pkg-config@opam:1.1@55d8e330", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -3010,8 +3001,8 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/conf-pkg-config@opam:1.1@b904ac35": { - "id": "@opam/conf-pkg-config@opam:1.1@b904ac35", + "@opam/conf-pkg-config@opam:1.1@55d8e330": { + "id": "@opam/conf-pkg-config@opam:1.1@55d8e330", "name": "@opam/conf-pkg-config", "version": "opam:1.1", "source": { @@ -3030,7 +3021,7 @@ } ], "dependencies": [ - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9", + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] diff --git a/esy.lock/opam/ocplib-endian.1.0/opam b/esy.lock/opam/ocplib-endian.1.0/opam deleted file mode 100644 index d468f3e4d1..0000000000 --- a/esy.lock/opam/ocplib-endian.1.0/opam +++ /dev/null @@ -1,33 +0,0 @@ -opam-version: "2.0" -authors: "Pierre Chambart" -maintainer: "pierre.chambart@ocamlpro.com" -homepage: "https://github.com/OCamlPro/ocplib-endian" -build: [ - ["ocaml" "setup.ml" "-configure" "--disable-debug" "--prefix" prefix] - ["ocaml" "setup.ml" "-build"] -] -install: [ - ["ocaml" "setup.ml" "-install"] -] -remove: ["ocamlfind" "remove" "ocplib-endian"] -depends: [ - "ocaml" - "base-bytes" - "ocamlfind" - "cppo" {>= "1.1.0"} - "ocamlbuild" {build} -] -dev-repo: "git+https://github.com/OCamlPro/ocplib-endian.git" -bug-reports: "https://github.com/OCamlPro/ocplib-endian/issues" -synopsis: - "Optimised functions to read and write int16/32/64 from strings and bigarrays, based on new primitives added in version 4.01." -description: """ -The library implements three modules: -* [EndianString](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianString.cppo.mli) works directly on strings, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; -* [EndianBytes](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBytes.cppo.mli) works directly on bytes, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; -* [EndianBigstring](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBigstring.cppo.mli) works on bigstrings (Bigarrays of chars), and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts;""" -flags: light-uninstall -url { - src: "https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz" - checksum: "md5=74b45ba33e189283170a748c2a3ed477" -} diff --git a/esy.lock/opam/ocplib-endian.1.1/opam b/esy.lock/opam/ocplib-endian.1.1/opam new file mode 100644 index 0000000000..c3c2ac6e46 --- /dev/null +++ b/esy.lock/opam/ocplib-endian.1.1/opam @@ -0,0 +1,38 @@ +opam-version: "2.0" +synopsis: + "Optimised functions to read and write int16/32/64 from strings and bigarrays" +description: """ +The library implements three modules: +* [EndianString](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianString.mli) works directly on strings, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; +* [EndianBytes](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBytes.mli) works directly on bytes, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; +* [EndianBigstring](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBigstring.mli) works on bigstrings (Bigarrays of chars), and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts.""" +maintainer: "pierre.chambart@ocamlpro.com" +authors: "Pierre Chambart" +homepage: "https://github.com/OCamlPro/ocplib-endian" +doc: "https://ocamlpro.github.io/ocplib-endian/ocplib-endian/" +bug-reports: "https://github.com/OCamlPro/ocplib-endian/issues" +depends: [ + "base-bytes" + "ocaml" {>= "4.02.3"} + "cppo" {>= "1.1.0" & build} + "dune" {>= "1.0"} +] +build: [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} +] +dev-repo: "git+https://github.com/OCamlPro/ocplib-endian.git" +url { + src: "https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz" + checksum: [ + "md5=dedf4d69c1b87b3c6c7234f632399285" + "sha512=39351c666d1394770696fa89ac62f7c137ad1697d99888bfba2cc8de2c61df05dd8b3aa327c117bf38f3e29e081026d2c575c5ad0022bde92b3d43aba577d3f9" + ] +} \ No newline at end of file diff --git a/bench.esy.lock/opam/zed.2.0.6/opam b/esy.lock/opam/zed.2.0.7/opam similarity index 94% rename from bench.esy.lock/opam/zed.2.0.6/opam rename to esy.lock/opam/zed.2.0.7/opam index f464fabc80..4424ffdfa2 100644 --- a/bench.esy.lock/opam/zed.2.0.6/opam +++ b/esy.lock/opam/zed.2.0.7/opam @@ -27,6 +27,6 @@ Unicode buffers. Zed also features a regular expression search on ropes. To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.""" url { - src: "https://github.com/ocaml-community/zed/releases/download/2.0.6/zed-2.0.6.tbz" - checksum: "md5=49de58f753bb4dd43ef6c2bc864ea8ff" + src: "https://github.com/ocaml-community/zed/releases/download/2.0.7/zed-2.0.7.tbz" + checksum: "md5=a84bfb0171181e171643f494f00c0ae2" } diff --git a/esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json b/esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json index 6d710b6671..80258c0a7d 100644 --- a/esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json +++ b/esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json @@ -6,6 +6,6 @@ ] ], "dependencies": { - "yarn-pkg-config": "esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0" + "yarn-pkg-config": "esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79" } } diff --git a/esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch b/esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch deleted file mode 100644 index b9e945a1f3..0000000000 --- a/esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./setup.ml -+++ ./setup.ml -@@ -6331,9 +6331,7 @@ - [ - "-classic-display"; - "-no-log"; -- "-no-links"; -- "-install-lib-dir"; -- (Filename.concat (standard_library ()) "ocamlbuild") -+ "-no-links" - ] - else - []; diff --git a/esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch b/esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch deleted file mode 100644 index 7cafa0dd48..0000000000 --- a/esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./myocamlbuild.ml -+++ ./myocamlbuild.ml -@@ -573,6 +573,24 @@ - Add a dependency after dropping support for 4.01 and earlier. *) - let dispatch_cppo = function - | After_rules -> begin -+ let is_directory s = -+ let slen = String.length s in -+ let s = -+ if Sys.os_type <> "Win32" || slen < 2 then -+ s -+ else -+ match s.[slen-1] with -+ | '\\' | '/' -> -+ if slen <> 3 || s.[1] <> ':' then -+ String.sub s 0 (slen -1) -+ else -+ (match s.[0] with -+ | 'A' .. 'Z' | 'a' .. 'z' -> s -+ | _ -> String.sub s 0 (slen -1)) -+ | _ -> s -+ in -+ Pathname.is_directory s -+ in - let cppo_rules ext = - let dep = "%(name).cppo"-.-ext - and prod1 = "%(name: <*> and not <*.cppo>)"-.-ext -@@ -591,11 +609,11 @@ - pflag ["cppo"] "cppo_D" (fun s -> S [A "-D"; A s]) ; - pflag ["cppo"] "cppo_U" (fun s -> S [A "-U"; A s]) ; - pflag ["cppo"] "cppo_I" (fun s -> -- if Pathname.is_directory s then S [A "-I"; P s] -+ if is_directory s then S [A "-I"; P s] - else S [A "-I"; P (Pathname.dirname s)] - ) ; - pdep ["cppo"] "cppo_I" (fun s -> -- if Pathname.is_directory s then [] else [s]) ; -+ if is_directory s then [] else [s]) ; - flag ["cppo"; "cppo_q"] (A "-q") ; - flag ["cppo"; "cppo_s"] (A "-s") ; - flag ["cppo"; "cppo_n"] (A "-n") ; diff --git a/esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json b/esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json deleted file mode 100644 index 86ea38bce9..0000000000 --- a/esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "build": [ - [ - "bash", - "-c", - "#{os == 'windows' ? 'patch -p1 < ocplib-endian-0.8.patch' : 'true'}" - ], - [ - "bash", - "-c", - "#{os == 'windows' ? 'patch -p1 < esy-fix.patch' : 'true'}" - ], - [ - "ocaml", - "setup.ml", - "-configure", - "--disable-debug", - "--prefix", - "#{self.install}" - ], - [ - "ocaml", - "setup.ml", - "-build" - ] - ], - "install": [ - [ - "ocaml", - "setup.ml", - "-install" - ] - ] -} diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json index 28110e5fcf..9c562a3b4a 100644 --- a/integrationtest.esy.lock/index.json +++ b/integrationtest.esy.lock/index.json @@ -1,17 +1,17 @@ { - "checksum": "cd369b0b1e138fa52818bed765badbd0", + "checksum": "3c5a89bf3734c34cd52aec0d364c6da1", "root": "Oni2@link-dev:./package.json", "node": { - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9": { + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { "id": - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9", + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9", "name": "yarn-pkg-config", "version": - "github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0", + "github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79", "source": { "type": "install", "source": [ - "github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0" + "github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79" ] }, "overrides": [], @@ -287,26 +287,26 @@ ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, - "reason-tree-sitter@1.0.1001@d41d8cd9": { - "id": "reason-tree-sitter@1.0.1001@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9": { + "id": + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", "name": "reason-tree-sitter", - "version": "1.0.1001", + "version": "github:CrossR/reason-tree-sitter#5baa4ae", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/reason-tree-sitter/-/reason-tree-sitter-1.0.1001.tgz#sha1:bd642ac513d19dc1151ab78d983cab779677cb31" - ] + "source": [ "github:CrossR/reason-tree-sitter#5baa4ae" ] }, "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", - "ocaml@4.8.1000@d41d8cd9", "esy-tree-sitter@1.4.1@d41d8cd9", + "ocaml@4.8.1000@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", "editor-core-types@github:onivim/editor-core-types#6a8afaf@d41d8cd9", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", "@esy-ocaml/reason@github:facebook/reason#8f71db0@d41d8cd9" ], - "devDependencies": [] + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, "reason-textmate@3.0.0@d41d8cd9": { "id": "reason-textmate@3.0.0@d41d8cd9", @@ -842,15 +842,13 @@ ], "devDependencies": [] }, - "esy-tree-sitter@1.4.1@d41d8cd9": { - "id": "esy-tree-sitter@1.4.1@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9": { + "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", "name": "esy-tree-sitter", - "version": "1.4.1", + "version": "github:CrossR/esy-tree-sitter#4453dce", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/esy-tree-sitter/-/esy-tree-sitter-1.4.1.tgz#sha1:67731d4e01fb391ebd1988a4781d41e1532ac6b6" - ] + "source": [ "github:CrossR/esy-tree-sitter#4453dce" ] }, "overrides": [], "dependencies": [], @@ -1209,7 +1207,7 @@ "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", - "reason-tree-sitter@1.0.1001@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", "reason-textmate@3.0.0@d41d8cd9", "reason-sdl2@2.10.3021@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9", "reason-libvim@github:onivim/reason-libvim#5a6976d@d41d8cd9", @@ -1334,20 +1332,20 @@ ], "devDependencies": [] }, - "@opam/zed@opam:2.0.6@d92df64a": { - "id": "@opam/zed@opam:2.0.6@d92df64a", + "@opam/zed@opam:2.0.7@5978011f": { + "id": "@opam/zed@opam:2.0.7@5978011f", "name": "@opam/zed", - "version": "opam:2.0.6", + "version": "opam:2.0.7", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/49/49de58f753bb4dd43ef6c2bc864ea8ff#md5:49de58f753bb4dd43ef6c2bc864ea8ff", - "archive:https://github.com/ocaml-community/zed/releases/download/2.0.6/zed-2.0.6.tbz#md5:49de58f753bb4dd43ef6c2bc864ea8ff" + "archive:https://opam.ocaml.org/cache/md5/a8/a84bfb0171181e171643f494f00c0ae2#md5:a84bfb0171181e171643f494f00c0ae2", + "archive:https://github.com/ocaml-community/zed/releases/download/2.0.7/zed-2.0.7.tbz#md5:a84bfb0171181e171643f494f00c0ae2" ], "opam": { "name": "zed", - "version": "2.0.6", - "path": "integrationtest.esy.lock/opam/zed.2.0.6" + "version": "2.0.7", + "path": "integrationtest.esy.lock/opam/zed.2.0.7" } }, "overrides": [], @@ -2076,38 +2074,31 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3" ] }, - "@opam/ocplib-endian@opam:1.0@aa720242": { - "id": "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88": { + "id": "@opam/ocplib-endian@opam:1.1@84c1ca88", "name": "@opam/ocplib-endian", - "version": "opam:1.0", + "version": "opam:1.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/74/74b45ba33e189283170a748c2a3ed477#md5:74b45ba33e189283170a748c2a3ed477", - "archive:https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz#md5:74b45ba33e189283170a748c2a3ed477" + "archive:https://opam.ocaml.org/cache/md5/de/dedf4d69c1b87b3c6c7234f632399285#md5:dedf4d69c1b87b3c6c7234f632399285", + "archive:https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz#md5:dedf4d69c1b87b3c6c7234f632399285" ], "opam": { "name": "ocplib-endian", - "version": "1.0", - "path": "integrationtest.esy.lock/opam/ocplib-endian.1.0" + "version": "1.1", + "path": "integrationtest.esy.lock/opam/ocplib-endian.1.1" } }, - "overrides": [ - { - "opamoverride": - "integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3", "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -2517,7 +2508,7 @@ "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.5@6b753c82", - "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", "@opam/cppo@opam:1.6.6@f4f83858", @@ -2528,7 +2519,7 @@ "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.5@6b753c82", - "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3" @@ -2596,7 +2587,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.6@d92df64a", + "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.7@5978011f", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", @@ -2605,7 +2596,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.6@d92df64a", + "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.7@5978011f", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", @@ -2958,7 +2949,7 @@ "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/integers@opam:0.3.0@d6eefd3a", - "@opam/conf-pkg-config@opam:1.1@b904ac35", + "@opam/conf-pkg-config@opam:1.1@55d8e330", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -3011,8 +3002,8 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/conf-pkg-config@opam:1.1@b904ac35": { - "id": "@opam/conf-pkg-config@opam:1.1@b904ac35", + "@opam/conf-pkg-config@opam:1.1@55d8e330": { + "id": "@opam/conf-pkg-config@opam:1.1@55d8e330", "name": "@opam/conf-pkg-config", "version": "opam:1.1", "source": { @@ -3031,7 +3022,7 @@ } ], "dependencies": [ - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9", + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] diff --git a/integrationtest.esy.lock/opam/ocplib-endian.1.0/opam b/integrationtest.esy.lock/opam/ocplib-endian.1.0/opam deleted file mode 100644 index d468f3e4d1..0000000000 --- a/integrationtest.esy.lock/opam/ocplib-endian.1.0/opam +++ /dev/null @@ -1,33 +0,0 @@ -opam-version: "2.0" -authors: "Pierre Chambart" -maintainer: "pierre.chambart@ocamlpro.com" -homepage: "https://github.com/OCamlPro/ocplib-endian" -build: [ - ["ocaml" "setup.ml" "-configure" "--disable-debug" "--prefix" prefix] - ["ocaml" "setup.ml" "-build"] -] -install: [ - ["ocaml" "setup.ml" "-install"] -] -remove: ["ocamlfind" "remove" "ocplib-endian"] -depends: [ - "ocaml" - "base-bytes" - "ocamlfind" - "cppo" {>= "1.1.0"} - "ocamlbuild" {build} -] -dev-repo: "git+https://github.com/OCamlPro/ocplib-endian.git" -bug-reports: "https://github.com/OCamlPro/ocplib-endian/issues" -synopsis: - "Optimised functions to read and write int16/32/64 from strings and bigarrays, based on new primitives added in version 4.01." -description: """ -The library implements three modules: -* [EndianString](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianString.cppo.mli) works directly on strings, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; -* [EndianBytes](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBytes.cppo.mli) works directly on bytes, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; -* [EndianBigstring](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBigstring.cppo.mli) works on bigstrings (Bigarrays of chars), and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts;""" -flags: light-uninstall -url { - src: "https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz" - checksum: "md5=74b45ba33e189283170a748c2a3ed477" -} diff --git a/integrationtest.esy.lock/opam/ocplib-endian.1.1/opam b/integrationtest.esy.lock/opam/ocplib-endian.1.1/opam new file mode 100644 index 0000000000..c3c2ac6e46 --- /dev/null +++ b/integrationtest.esy.lock/opam/ocplib-endian.1.1/opam @@ -0,0 +1,38 @@ +opam-version: "2.0" +synopsis: + "Optimised functions to read and write int16/32/64 from strings and bigarrays" +description: """ +The library implements three modules: +* [EndianString](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianString.mli) works directly on strings, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; +* [EndianBytes](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBytes.mli) works directly on bytes, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; +* [EndianBigstring](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBigstring.mli) works on bigstrings (Bigarrays of chars), and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts.""" +maintainer: "pierre.chambart@ocamlpro.com" +authors: "Pierre Chambart" +homepage: "https://github.com/OCamlPro/ocplib-endian" +doc: "https://ocamlpro.github.io/ocplib-endian/ocplib-endian/" +bug-reports: "https://github.com/OCamlPro/ocplib-endian/issues" +depends: [ + "base-bytes" + "ocaml" {>= "4.02.3"} + "cppo" {>= "1.1.0" & build} + "dune" {>= "1.0"} +] +build: [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} +] +dev-repo: "git+https://github.com/OCamlPro/ocplib-endian.git" +url { + src: "https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz" + checksum: [ + "md5=dedf4d69c1b87b3c6c7234f632399285" + "sha512=39351c666d1394770696fa89ac62f7c137ad1697d99888bfba2cc8de2c61df05dd8b3aa327c117bf38f3e29e081026d2c575c5ad0022bde92b3d43aba577d3f9" + ] +} \ No newline at end of file diff --git a/test.esy.lock/opam/zed.2.0.6/opam b/integrationtest.esy.lock/opam/zed.2.0.7/opam similarity index 94% rename from test.esy.lock/opam/zed.2.0.6/opam rename to integrationtest.esy.lock/opam/zed.2.0.7/opam index f464fabc80..4424ffdfa2 100644 --- a/test.esy.lock/opam/zed.2.0.6/opam +++ b/integrationtest.esy.lock/opam/zed.2.0.7/opam @@ -27,6 +27,6 @@ Unicode buffers. Zed also features a regular expression search on ropes. To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.""" url { - src: "https://github.com/ocaml-community/zed/releases/download/2.0.6/zed-2.0.6.tbz" - checksum: "md5=49de58f753bb4dd43ef6c2bc864ea8ff" + src: "https://github.com/ocaml-community/zed/releases/download/2.0.7/zed-2.0.7.tbz" + checksum: "md5=a84bfb0171181e171643f494f00c0ae2" } diff --git a/integrationtest.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json b/integrationtest.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json index 6d710b6671..80258c0a7d 100644 --- a/integrationtest.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json +++ b/integrationtest.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json @@ -6,6 +6,6 @@ ] ], "dependencies": { - "yarn-pkg-config": "esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0" + "yarn-pkg-config": "esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79" } } diff --git a/integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch b/integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch deleted file mode 100644 index b9e945a1f3..0000000000 --- a/integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./setup.ml -+++ ./setup.ml -@@ -6331,9 +6331,7 @@ - [ - "-classic-display"; - "-no-log"; -- "-no-links"; -- "-install-lib-dir"; -- (Filename.concat (standard_library ()) "ocamlbuild") -+ "-no-links" - ] - else - []; diff --git a/integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch b/integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch deleted file mode 100644 index 7cafa0dd48..0000000000 --- a/integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./myocamlbuild.ml -+++ ./myocamlbuild.ml -@@ -573,6 +573,24 @@ - Add a dependency after dropping support for 4.01 and earlier. *) - let dispatch_cppo = function - | After_rules -> begin -+ let is_directory s = -+ let slen = String.length s in -+ let s = -+ if Sys.os_type <> "Win32" || slen < 2 then -+ s -+ else -+ match s.[slen-1] with -+ | '\\' | '/' -> -+ if slen <> 3 || s.[1] <> ':' then -+ String.sub s 0 (slen -1) -+ else -+ (match s.[0] with -+ | 'A' .. 'Z' | 'a' .. 'z' -> s -+ | _ -> String.sub s 0 (slen -1)) -+ | _ -> s -+ in -+ Pathname.is_directory s -+ in - let cppo_rules ext = - let dep = "%(name).cppo"-.-ext - and prod1 = "%(name: <*> and not <*.cppo>)"-.-ext -@@ -591,11 +609,11 @@ - pflag ["cppo"] "cppo_D" (fun s -> S [A "-D"; A s]) ; - pflag ["cppo"] "cppo_U" (fun s -> S [A "-U"; A s]) ; - pflag ["cppo"] "cppo_I" (fun s -> -- if Pathname.is_directory s then S [A "-I"; P s] -+ if is_directory s then S [A "-I"; P s] - else S [A "-I"; P (Pathname.dirname s)] - ) ; - pdep ["cppo"] "cppo_I" (fun s -> -- if Pathname.is_directory s then [] else [s]) ; -+ if is_directory s then [] else [s]) ; - flag ["cppo"; "cppo_q"] (A "-q") ; - flag ["cppo"; "cppo_s"] (A "-s") ; - flag ["cppo"; "cppo_n"] (A "-n") ; diff --git a/integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json b/integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json deleted file mode 100644 index 86ea38bce9..0000000000 --- a/integrationtest.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "build": [ - [ - "bash", - "-c", - "#{os == 'windows' ? 'patch -p1 < ocplib-endian-0.8.patch' : 'true'}" - ], - [ - "bash", - "-c", - "#{os == 'windows' ? 'patch -p1 < esy-fix.patch' : 'true'}" - ], - [ - "ocaml", - "setup.ml", - "-configure", - "--disable-debug", - "--prefix", - "#{self.install}" - ], - [ - "ocaml", - "setup.ml", - "-build" - ] - ], - "install": [ - [ - "ocaml", - "setup.ml", - "-install" - ] - ] -} diff --git a/package.json b/package.json index 30118cf3cb..353156fdef 100644 --- a/package.json +++ b/package.json @@ -213,7 +213,7 @@ "rench": "1.7.1", "revery": "0.30.0", "revery-terminal": "*", - "reason-tree-sitter": "^1.0.1001", + "reason-tree-sitter": "*", "reason-textmate": "^3.0.0", "esy-sdl2": "*", "esy-skia": "*", @@ -246,6 +246,7 @@ "rench": "bryphe/rench#a976fe5", "@esy-ocaml/reason": "facebook/reason#8f71db0", "reasonFuzz": "CrossR/reasonFuzz#1ad6f5d", + "reason-tree-sitter": "CrossR/reason-tree-sitter#5baa4ae", "reason-harfbuzz": "revery-ui/reason-harfbuzz#eca58ea", "@esy-ocaml/libffi": "onivim/libffi#590b041", "esy-oniguruma": "onivim/esy-oniguruma#4698ce4", diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json index d6adda7ab4..3f20b93e48 100644 --- a/test.esy.lock/index.json +++ b/test.esy.lock/index.json @@ -1,17 +1,17 @@ { - "checksum": "3165eb5946b881d236112cb2692a3daa", + "checksum": "e0714b1bf7bb24df4a5f0ffdafbbcc38", "root": "Oni2@link-dev:./package.json", "node": { - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9": { + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { "id": - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9", + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9", "name": "yarn-pkg-config", "version": - "github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0", + "github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79", "source": { "type": "install", "source": [ - "github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0" + "github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79" ] }, "overrides": [], @@ -287,26 +287,26 @@ ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, - "reason-tree-sitter@1.0.1001@d41d8cd9": { - "id": "reason-tree-sitter@1.0.1001@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9": { + "id": + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", "name": "reason-tree-sitter", - "version": "1.0.1001", + "version": "github:CrossR/reason-tree-sitter#5baa4ae", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/reason-tree-sitter/-/reason-tree-sitter-1.0.1001.tgz#sha1:bd642ac513d19dc1151ab78d983cab779677cb31" - ] + "source": [ "github:CrossR/reason-tree-sitter#5baa4ae" ] }, "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", - "ocaml@4.8.1000@d41d8cd9", "esy-tree-sitter@1.4.1@d41d8cd9", + "ocaml@4.8.1000@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", "editor-core-types@github:onivim/editor-core-types#6a8afaf@d41d8cd9", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", "@esy-ocaml/reason@github:facebook/reason#8f71db0@d41d8cd9" ], - "devDependencies": [] + "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, "reason-textmate@3.0.0@d41d8cd9": { "id": "reason-textmate@3.0.0@d41d8cd9", @@ -842,15 +842,13 @@ ], "devDependencies": [] }, - "esy-tree-sitter@1.4.1@d41d8cd9": { - "id": "esy-tree-sitter@1.4.1@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9": { + "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", "name": "esy-tree-sitter", - "version": "1.4.1", + "version": "github:CrossR/esy-tree-sitter#4453dce", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/esy-tree-sitter/-/esy-tree-sitter-1.4.1.tgz#sha1:67731d4e01fb391ebd1988a4781d41e1532ac6b6" - ] + "source": [ "github:CrossR/esy-tree-sitter#4453dce" ] }, "overrides": [], "dependencies": [], @@ -1209,7 +1207,7 @@ "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", - "reason-tree-sitter@1.0.1001@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", "reason-textmate@3.0.0@d41d8cd9", "reason-sdl2@2.10.3021@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9", "reason-libvim@github:onivim/reason-libvim#5a6976d@d41d8cd9", @@ -1334,20 +1332,20 @@ ], "devDependencies": [] }, - "@opam/zed@opam:2.0.6@d92df64a": { - "id": "@opam/zed@opam:2.0.6@d92df64a", + "@opam/zed@opam:2.0.7@5978011f": { + "id": "@opam/zed@opam:2.0.7@5978011f", "name": "@opam/zed", - "version": "opam:2.0.6", + "version": "opam:2.0.7", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/49/49de58f753bb4dd43ef6c2bc864ea8ff#md5:49de58f753bb4dd43ef6c2bc864ea8ff", - "archive:https://github.com/ocaml-community/zed/releases/download/2.0.6/zed-2.0.6.tbz#md5:49de58f753bb4dd43ef6c2bc864ea8ff" + "archive:https://opam.ocaml.org/cache/md5/a8/a84bfb0171181e171643f494f00c0ae2#md5:a84bfb0171181e171643f494f00c0ae2", + "archive:https://github.com/ocaml-community/zed/releases/download/2.0.7/zed-2.0.7.tbz#md5:a84bfb0171181e171643f494f00c0ae2" ], "opam": { "name": "zed", - "version": "2.0.6", - "path": "test.esy.lock/opam/zed.2.0.6" + "version": "2.0.7", + "path": "test.esy.lock/opam/zed.2.0.7" } }, "overrides": [], @@ -2076,38 +2074,31 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3" ] }, - "@opam/ocplib-endian@opam:1.0@aa720242": { - "id": "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88": { + "id": "@opam/ocplib-endian@opam:1.1@84c1ca88", "name": "@opam/ocplib-endian", - "version": "opam:1.0", + "version": "opam:1.1", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/74/74b45ba33e189283170a748c2a3ed477#md5:74b45ba33e189283170a748c2a3ed477", - "archive:https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz#md5:74b45ba33e189283170a748c2a3ed477" + "archive:https://opam.ocaml.org/cache/md5/de/dedf4d69c1b87b3c6c7234f632399285#md5:dedf4d69c1b87b3c6c7234f632399285", + "archive:https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz#md5:dedf4d69c1b87b3c6c7234f632399285" ], "opam": { "name": "ocplib-endian", - "version": "1.0", - "path": "test.esy.lock/opam/ocplib-endian.1.0" + "version": "1.1", + "path": "test.esy.lock/opam/ocplib-endian.1.1" } }, - "overrides": [ - { - "opamoverride": - "test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override" - } - ], + "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocamlbuild@opam:0.14.0@6ac75d03", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3", "@opam/cppo@opam:1.6.6@f4f83858", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/cppo@opam:1.6.6@f4f83858", + "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.4.0@639d28a3", "@opam/base-bytes@opam:base@19d0c2ff" ] }, @@ -2516,7 +2507,7 @@ "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.5@6b753c82", - "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", "@opam/cppo@opam:1.6.6@f4f83858", @@ -2527,7 +2518,7 @@ "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/seq@opam:base@d8d7de1d", "@opam/result@opam:1.5@6b753c82", - "@opam/ocplib-endian@opam:1.0@aa720242", + "@opam/ocplib-endian@opam:1.1@84c1ca88", "@opam/mmap@opam:1.1.0@b85334ff", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3" @@ -2595,7 +2586,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.6@d92df64a", + "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.7@5978011f", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", @@ -2604,7 +2595,7 @@ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.6@d92df64a", + "ocaml@4.8.1000@d41d8cd9", "@opam/zed@opam:2.0.7@5978011f", "@opam/react@opam:1.2.1@0e11855f", "@opam/lwt_react@opam:1.1.3@72987fcf", "@opam/lwt_log@opam:1.1.1@2d7a797f", "@opam/lwt@opam:4.5.0@677655b4", @@ -2957,7 +2948,7 @@ "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/integers@opam:0.3.0@d6eefd3a", - "@opam/conf-pkg-config@opam:1.1@b904ac35", + "@opam/conf-pkg-config@opam:1.1@55d8e330", "@opam/base-bytes@opam:base@19d0c2ff", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -3010,8 +3001,8 @@ "dependencies": [ "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] }, - "@opam/conf-pkg-config@opam:1.1@b904ac35": { - "id": "@opam/conf-pkg-config@opam:1.1@b904ac35", + "@opam/conf-pkg-config@opam:1.1@55d8e330": { + "id": "@opam/conf-pkg-config@opam:1.1@55d8e330", "name": "@opam/conf-pkg-config", "version": "opam:1.1", "source": { @@ -3030,7 +3021,7 @@ } ], "dependencies": [ - "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9", + "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] diff --git a/test.esy.lock/opam/ocplib-endian.1.0/opam b/test.esy.lock/opam/ocplib-endian.1.0/opam deleted file mode 100644 index d468f3e4d1..0000000000 --- a/test.esy.lock/opam/ocplib-endian.1.0/opam +++ /dev/null @@ -1,33 +0,0 @@ -opam-version: "2.0" -authors: "Pierre Chambart" -maintainer: "pierre.chambart@ocamlpro.com" -homepage: "https://github.com/OCamlPro/ocplib-endian" -build: [ - ["ocaml" "setup.ml" "-configure" "--disable-debug" "--prefix" prefix] - ["ocaml" "setup.ml" "-build"] -] -install: [ - ["ocaml" "setup.ml" "-install"] -] -remove: ["ocamlfind" "remove" "ocplib-endian"] -depends: [ - "ocaml" - "base-bytes" - "ocamlfind" - "cppo" {>= "1.1.0"} - "ocamlbuild" {build} -] -dev-repo: "git+https://github.com/OCamlPro/ocplib-endian.git" -bug-reports: "https://github.com/OCamlPro/ocplib-endian/issues" -synopsis: - "Optimised functions to read and write int16/32/64 from strings and bigarrays, based on new primitives added in version 4.01." -description: """ -The library implements three modules: -* [EndianString](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianString.cppo.mli) works directly on strings, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; -* [EndianBytes](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBytes.cppo.mli) works directly on bytes, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; -* [EndianBigstring](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBigstring.cppo.mli) works on bigstrings (Bigarrays of chars), and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts;""" -flags: light-uninstall -url { - src: "https://github.com/OCamlPro/ocplib-endian/archive/1.0.tar.gz" - checksum: "md5=74b45ba33e189283170a748c2a3ed477" -} diff --git a/test.esy.lock/opam/ocplib-endian.1.1/opam b/test.esy.lock/opam/ocplib-endian.1.1/opam new file mode 100644 index 0000000000..c3c2ac6e46 --- /dev/null +++ b/test.esy.lock/opam/ocplib-endian.1.1/opam @@ -0,0 +1,38 @@ +opam-version: "2.0" +synopsis: + "Optimised functions to read and write int16/32/64 from strings and bigarrays" +description: """ +The library implements three modules: +* [EndianString](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianString.mli) works directly on strings, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; +* [EndianBytes](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBytes.mli) works directly on bytes, and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts; +* [EndianBigstring](https://github.com/OCamlPro/ocplib-endian/blob/master/src/endianBigstring.mli) works on bigstrings (Bigarrays of chars), and provides submodules BigEndian and LittleEndian, with their unsafe counter-parts.""" +maintainer: "pierre.chambart@ocamlpro.com" +authors: "Pierre Chambart" +homepage: "https://github.com/OCamlPro/ocplib-endian" +doc: "https://ocamlpro.github.io/ocplib-endian/ocplib-endian/" +bug-reports: "https://github.com/OCamlPro/ocplib-endian/issues" +depends: [ + "base-bytes" + "ocaml" {>= "4.02.3"} + "cppo" {>= "1.1.0" & build} + "dune" {>= "1.0"} +] +build: [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} +] +dev-repo: "git+https://github.com/OCamlPro/ocplib-endian.git" +url { + src: "https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz" + checksum: [ + "md5=dedf4d69c1b87b3c6c7234f632399285" + "sha512=39351c666d1394770696fa89ac62f7c137ad1697d99888bfba2cc8de2c61df05dd8b3aa327c117bf38f3e29e081026d2c575c5ad0022bde92b3d43aba577d3f9" + ] +} \ No newline at end of file diff --git a/esy.lock/opam/zed.2.0.6/opam b/test.esy.lock/opam/zed.2.0.7/opam similarity index 94% rename from esy.lock/opam/zed.2.0.6/opam rename to test.esy.lock/opam/zed.2.0.7/opam index f464fabc80..4424ffdfa2 100644 --- a/esy.lock/opam/zed.2.0.6/opam +++ b/test.esy.lock/opam/zed.2.0.7/opam @@ -27,6 +27,6 @@ Unicode buffers. Zed also features a regular expression search on ropes. To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities.""" url { - src: "https://github.com/ocaml-community/zed/releases/download/2.0.6/zed-2.0.6.tbz" - checksum: "md5=49de58f753bb4dd43ef6c2bc864ea8ff" + src: "https://github.com/ocaml-community/zed/releases/download/2.0.7/zed-2.0.7.tbz" + checksum: "md5=a84bfb0171181e171643f494f00c0ae2" } diff --git a/test.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json b/test.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json index 6d710b6671..80258c0a7d 100644 --- a/test.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json +++ b/test.esy.lock/overrides/opam__s__conf_pkg_config_opam__c__1.1_opam_override/package.json @@ -6,6 +6,6 @@ ] ], "dependencies": { - "yarn-pkg-config": "esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0" + "yarn-pkg-config": "esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79" } } diff --git a/test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch b/test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch deleted file mode 100644 index b9e945a1f3..0000000000 --- a/test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/esy-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./setup.ml -+++ ./setup.ml -@@ -6331,9 +6331,7 @@ - [ - "-classic-display"; - "-no-log"; -- "-no-links"; -- "-install-lib-dir"; -- (Filename.concat (standard_library ()) "ocamlbuild") -+ "-no-links" - ] - else - []; diff --git a/test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch b/test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch deleted file mode 100644 index 7cafa0dd48..0000000000 --- a/test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/files/ocplib-endian-0.8.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- ./myocamlbuild.ml -+++ ./myocamlbuild.ml -@@ -573,6 +573,24 @@ - Add a dependency after dropping support for 4.01 and earlier. *) - let dispatch_cppo = function - | After_rules -> begin -+ let is_directory s = -+ let slen = String.length s in -+ let s = -+ if Sys.os_type <> "Win32" || slen < 2 then -+ s -+ else -+ match s.[slen-1] with -+ | '\\' | '/' -> -+ if slen <> 3 || s.[1] <> ':' then -+ String.sub s 0 (slen -1) -+ else -+ (match s.[0] with -+ | 'A' .. 'Z' | 'a' .. 'z' -> s -+ | _ -> String.sub s 0 (slen -1)) -+ | _ -> s -+ in -+ Pathname.is_directory s -+ in - let cppo_rules ext = - let dep = "%(name).cppo"-.-ext - and prod1 = "%(name: <*> and not <*.cppo>)"-.-ext -@@ -591,11 +609,11 @@ - pflag ["cppo"] "cppo_D" (fun s -> S [A "-D"; A s]) ; - pflag ["cppo"] "cppo_U" (fun s -> S [A "-U"; A s]) ; - pflag ["cppo"] "cppo_I" (fun s -> -- if Pathname.is_directory s then S [A "-I"; P s] -+ if is_directory s then S [A "-I"; P s] - else S [A "-I"; P (Pathname.dirname s)] - ) ; - pdep ["cppo"] "cppo_I" (fun s -> -- if Pathname.is_directory s then [] else [s]) ; -+ if is_directory s then [] else [s]) ; - flag ["cppo"; "cppo_q"] (A "-q") ; - flag ["cppo"; "cppo_s"] (A "-s") ; - flag ["cppo"; "cppo_n"] (A "-n") ; diff --git a/test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json b/test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json deleted file mode 100644 index 86ea38bce9..0000000000 --- a/test.esy.lock/overrides/opam__s__ocplib_endian_opam__c__1.0_opam_override/package.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "build": [ - [ - "bash", - "-c", - "#{os == 'windows' ? 'patch -p1 < ocplib-endian-0.8.patch' : 'true'}" - ], - [ - "bash", - "-c", - "#{os == 'windows' ? 'patch -p1 < esy-fix.patch' : 'true'}" - ], - [ - "ocaml", - "setup.ml", - "-configure", - "--disable-debug", - "--prefix", - "#{self.install}" - ], - [ - "ocaml", - "setup.ml", - "-build" - ] - ], - "install": [ - [ - "ocaml", - "setup.ml", - "-install" - ] - ] -} From 78022905239a61e6d030a36450ed49f9f34d4272 Mon Sep 17 00:00:00 2001 From: CrossR Date: Fri, 10 Apr 2020 21:59:17 +0100 Subject: [PATCH 2/6] Add a way to get an option(parser). This may make more sense to actually live in reason-tree-sitter. --- src/Syntax/TreeSitterSyntaxHighlights.re | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Syntax/TreeSitterSyntaxHighlights.re b/src/Syntax/TreeSitterSyntaxHighlights.re index 18f734bcfd..9b9c0bec52 100644 --- a/src/Syntax/TreeSitterSyntaxHighlights.re +++ b/src/Syntax/TreeSitterSyntaxHighlights.re @@ -33,8 +33,19 @@ let scopesToStrings = (scopes: list(TreeSitter.Syntax.scope)) => { ); }; -let create = (~theme, ~scopeConverter, lines: array(string)) => { - let parser = Parser.json(); +let getParserFromScope = language => + switch (language) { + | "source.json" => Some(Parser.json()) + | "source.c" => Some(Parser.c()) + | "source.cpp" => Some(Parser.cpp()) + | "source.python" => Some(Parser.python()) + | "source.javascript" => Some(Parser.javascript()) + | "source.typescript" => Some(Parser.typescript()) + | "source.tsx" => Some(Parser.tsx()) + | _ => None + }; + +let create = (~theme, ~scopeConverter, ~parser, lines: array(string)) => { let (tree, baseline) = ArrayParser.parse(parser, None, lines); let job = From 24cd1a117ea8b42856f7a569d14d8ee1b0f48c96 Mon Sep 17 00:00:00 2001 From: CrossR Date: Fri, 10 Apr 2020 21:59:39 +0100 Subject: [PATCH 3/6] Pass over the parser if one exists (and a scope converter). --- src/Syntax/NativeSyntaxHighlights.re | 36 +++++++++------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/src/Syntax/NativeSyntaxHighlights.re b/src/Syntax/NativeSyntaxHighlights.re index 2e4c2f0c56..2467a68e2e 100644 --- a/src/Syntax/NativeSyntaxHighlights.re +++ b/src/Syntax/NativeSyntaxHighlights.re @@ -33,22 +33,6 @@ type t = }) : t; -let _hasTreeSitterScope = (configuration, scope: string) => { - let treeSitterEnabled = - Core.Configuration.getValue(c => c.experimentalTreeSitter, configuration); - - if (!treeSitterEnabled) { - false; - } else { - switch (scope) { - | "source.json" => true - /* | "source.c" => true - | "source.cpp" => true */ - | _ => false - }; - }; -}; - let anyPendingWork = hl => { let Highlighter({highlighter: (module SyntaxHighlighter), state}) = hl; @@ -88,18 +72,20 @@ let create = ) => { ignore(bufferUpdate); let maybeScopeConverter = getTreesitterScope(scope); + let maybeParser = TreeSitterSyntaxHighlights.getParserFromScope(scope); let allowTreeSitter = - Core.Configuration.getValue( - config => config.experimentalTreeSitter, - configuration, - ) - && _hasTreeSitterScope(configuration, scope); - - switch (maybeScopeConverter) { - | Some(scopeConverter) when allowTreeSitter => + Core.Configuration.getValue(c => c.experimentalTreeSitter, configuration); + + switch (maybeScopeConverter, maybeParser) { + | (Some(scopeConverter), Some(parser)) when allowTreeSitter => let ts = - TreeSitterSyntaxHighlights.create(~theme, ~scopeConverter, lines); + TreeSitterSyntaxHighlights.create( + ~theme, + ~scopeConverter, + ~parser, + lines, + ); Highlighter({ highlighter: (module TreeSitterSyntaxHighlights), state: ts, From 1154611e8643e2f1881c5248224f0f301260dc86 Mon Sep 17 00:00:00 2001 From: CrossR Date: Fri, 10 Apr 2020 22:08:33 +0100 Subject: [PATCH 4/6] Add scope converters. --- extensions/javascript/package.json | 1 + .../syntaxes/tree-sitter-javascript.json | 269 ++++++++++++++++++ extensions/python/package.json | 3 +- .../python/syntaxes/tree-sitter-python.json | 192 +++++++++++++ extensions/typescript-basics/package.json | 2 + .../syntaxes/tree-sitter-tsx.json | 254 +++++++++++++++++ .../syntaxes/tree-sitter-typescript.json | 223 +++++++++++++++ 7 files changed, 943 insertions(+), 1 deletion(-) create mode 100644 extensions/javascript/syntaxes/tree-sitter-javascript.json create mode 100644 extensions/python/syntaxes/tree-sitter-python.json create mode 100644 extensions/typescript-basics/syntaxes/tree-sitter-tsx.json create mode 100644 extensions/typescript-basics/syntaxes/tree-sitter-typescript.json diff --git a/extensions/javascript/package.json b/extensions/javascript/package.json index 6909de1400..e39ef18a4b 100644 --- a/extensions/javascript/package.json +++ b/extensions/javascript/package.json @@ -71,6 +71,7 @@ "language": "javascript", "scopeName": "source.js", "path": "./syntaxes/JavaScript.tmLanguage.json", + "treeSitterPath": "./syntaxes/tree-sitter-javascript.json", "embeddedLanguages": { "meta.tag.js": "jsx-tags", "meta.tag.without-attributes.js": "jsx-tags", diff --git a/extensions/javascript/syntaxes/tree-sitter-javascript.json b/extensions/javascript/syntaxes/tree-sitter-javascript.json new file mode 100644 index 0000000000..e89f8a7c79 --- /dev/null +++ b/extensions/javascript/syntaxes/tree-sitter-javascript.json @@ -0,0 +1,269 @@ +{ + "name": "JavaScript", + "scopeName": "source.js", + "type": "tree-sitter", + "parser": "tree-sitter-javascript", + "fileTypes": [ + "js", + "jsx" + ], + "injectionRegex": "^js$|^JS$|javascript|JavaScript", + "firstLineRegex": [ + "^#!.*\\b(node)\\r?\\n", + "vim\\b.*\\bset\\b.*\\b(filetype|ft|syntax)=(js|javascript)" + ], + "folds": [ + { + "type": "comment" + }, + { + "type": [ + "jsx_element", + "template_string" + ], + "start": { + "index": 0 + }, + "end": { + "index": -1 + } + }, + { + "type": "jsx_self_closing_element", + "start": { + "index": 1 + }, + "end": { + "index": -2 + } + }, + { + "start": { + "index": 0, + "type": "{" + }, + "end": { + "index": -1, + "type": "}" + } + }, + { + "start": { + "index": 0, + "type": "[" + }, + "end": { + "index": -1, + "type": "]" + } + }, + { + "start": { + "index": 0, + "type": "(" + }, + "end": { + "index": -1, + "type": ")" + } + }, + { + "type": [ + "switch_case", + "switch_default" + ], + "start": { + "index": 0 + }, + "end": { + "type": "break_statement", + "index": -1 + } + }, + { + "type": [ + "switch_case", + "switch_default" + ], + "start": { + "index": 0 + } + } + ], + "comments": { + "start": "// " + }, + "scopes": { + "program": "source.js", + "property_identifier": [ + { + "match": "^[$A-Z_]+$", + "scopes": "constant.other.property.js" + }, + "variable.other.object.property" + ], + "member_expression > property_identifier": "variable.other.object.property.unquoted", + "formal_parameters > identifier": "variable.parameter.function", + "formal_parameters > rest_parameter > identifier": "variable.parameter.rest.function", + "shorthand_property_identifier": [ + { + "match": "^[$A-Z_]{2,}$", + "scopes": "constant.other" + } + ], + "class > identifier, new_expression > identifier": "meta.class", + "jsx_opening_element > identifier, jsx_closing_element > identifier, jsx_self_closing_element > identifier": [ + { + "match": "^[A-Z]", + "scopes": "meta.class.component.jsx" + } + ], + "call_expression > identifier": [ + { + "match": "^require$", + "scopes": "support.function" + }, + "entity.name.function" + ], + "arrow_function > identifier:nth-child(0)": "variable.parameter.function", + "function > identifier": "entity.name.function", + "function_declaration > identifier": "entity.name.function", + "generator_function > identifier": "entity.name.function", + "call_expression > super": "support.function.super", + "method_definition > property_identifier": "entity.name.function", + "call_expression > member_expression > property_identifier": "entity.name.function", + "identifier": [ + { + "match": "^(global|module|exports|__filename|__dirname)$", + "scopes": "support.variable" + }, + { + "match": "^(window|event|document|performance|screen|navigator|console)$", + "scopes": "support.variable.dom" + }, + { + "exact": "require", + "scopes": "support.function" + }, + { + "match": "^[$A-Z_]{2,}$", + "scopes": "constant.other" + }, + { + "match": "^[A-Z]", + "scopes": "meta.class" + } + ], + "number": "constant.numeric", + "string": "string.quoted", + "regex": "string.regexp", + "escape_sequence": "constant.character.escape", + "template_string": "string.quoted.template", + "undefined": "constant.language", + "null": "constant.language.null", + "true": "constant.language.boolean.true", + "false": "constant.language.boolean.false", + "comment": [ + { + "match": "^//", + "scopes": "comment.line" + }, + "comment.block" + ], + "hash_bang_line": "comment.block", + "jsx_expression > \"{\", jsx_expression > \"}\", template_substitution > \"${\", template_substitution > \"}\"": "punctuation.section.embedded", + "template_substitution": "embedded.source", + "\"(\"": "punctuation.definition.parameters.begin.bracket.round", + "\")\"": "punctuation.definition.parameters.end.bracket.round", + "\"{\"": "punctuation.definition.function.body.begin.bracket.curly", + "\"}\"": "punctuation.definition.function.body.end.bracket.curly", + "\";\"": "punctuation.terminator.statement.semicolon", + "\"[\"": "punctuation.definition.array.begin.bracket.square", + "\"]\"": "punctuation.definition.array.end.bracket.square", + "\"var\"": "storage.type", + "\"let\"": "storage.type", + "\"class\"": "storage.type", + "\"extends\"": "storage.modifier", + "\"const\"": "storage.modifier", + "\"static\"": "storage.modifier", + "\"function\"": "storage.type.function", + "\"=>\"": "storage.type.function.arrow", + "\"=\"": "keyword.operator.js", + "\"+=\"": "keyword.operator.js", + "\"-=\"": "keyword.operator.js", + "\"*=\"": "keyword.operator.js", + "\"/=\"": "keyword.operator.js", + "\"%=\"": "keyword.operator.js", + "\"<<=\"": "keyword.operator.js", + "\">>=\"": "keyword.operator.js", + "\">>>=\"": "keyword.operator.js", + "\"&=\"": "keyword.operator.js", + "\"^=\"": "keyword.operator.js", + "\"|=\"": "keyword.operator.js", + "\"!\"": "keyword.operator.js", + "\"+\"": "keyword.operator.js", + "\"-\"": "keyword.operator.js", + "\"*\"": "keyword.operator.js", + "\"/\"": "keyword.operator.js", + "\"%\"": "keyword.operator.js", + "\"==\"": "keyword.operator.js", + "\"===\"": "keyword.operator.js", + "\"!=\"": "keyword.operator.js", + "\"!==\"": "keyword.operator.js", + "\">=\"": "keyword.operator.js", + "\"<=\"": "keyword.operator.js", + "\">\"": "keyword.operator.js", + "\"<\"": "keyword.operator.js", + "\":\"": "keyword.operator.js", + "\"?\"": "keyword.operator.js", + "\"&&\"": "keyword.operator.js", + "\"||\"": "keyword.operator.js", + "\"&\"": "keyword.operator.js", + "\"~\"": "keyword.operator.js", + "\"^\"": "keyword.operator.js", + "\">>\"": "keyword.operator.js", + "\">>>\"": "keyword.operator.js", + "\"<<\"": "keyword.operator.js", + "\"|\"": "keyword.operator.js", + "\"++\"": "keyword.operator.js", + "\"--\"": "keyword.operator.js", + "\"...\"": "keyword.operator.spread.js", + "\"in\"": "keyword.operator.in", + "\"instanceof\"": "keyword.operator.instanceof", + "\"of\"": "keyword.operator.of", + "\"new\"": "keyword.operator.new", + "\"typeof\"": "keyword.operator.typeof", + "\"get\"": "keyword.operator.setter", + "\"set\"": "keyword.operator.setter", + "\".\"": "meta.delimiter.period", + "\",\"": "meta.delimiter.comma", + "\"as\"": "keyword.control", + "\"if\"": "keyword.control", + "\"do\"": "keyword.control", + "\"else\"": "keyword.control", + "\"while\"": "keyword.control", + "\"for\"": "keyword.control", + "\"return\"": "keyword.control", + "\"break\"": "keyword.control", + "\"continue\"": "keyword.control", + "\"throw\"": "keyword.control", + "\"try\"": "keyword.control", + "\"catch\"": "keyword.control", + "\"finally\"": "keyword.control", + "\"switch\"": "keyword.control", + "\"case\"": "keyword.control", + "\"default\"": "keyword.control", + "\"export\"": "keyword.control", + "\"import\"": "keyword.control", + "\"from\"": "keyword.control", + "\"yield\"": "keyword.control", + "\"async\"": "keyword.control", + "\"await\"": "keyword.control", + "\"debugger\"": "keyword.control", + "\"delete\"": "keyword.control", + "jsx_attribute > property_identifier": "entity.other.attribute-name", + "jsx_opening_element > identifier": "entity.name.tag", + "jsx_closing_element > identifier": "entity.name.tag", + "jsx_self_closing_element > identifier": "entity.name.tag" + } +} \ No newline at end of file diff --git a/extensions/python/package.json b/extensions/python/package.json index 53ca25bd88..b4d41b837b 100644 --- a/extensions/python/package.json +++ b/extensions/python/package.json @@ -18,7 +18,8 @@ "grammars": [{ "language": "python", "scopeName": "source.python", - "path": "./syntaxes/MagicPython.tmLanguage.json" + "path": "./syntaxes/MagicPython.tmLanguage.json", + "treeSitterPath": "./syntaxes/tree-sitter-python.json" },{ "scopeName": "source.regexp.python", "path": "./syntaxes/MagicRegExp.tmLanguage.json" diff --git a/extensions/python/syntaxes/tree-sitter-python.json b/extensions/python/syntaxes/tree-sitter-python.json new file mode 100644 index 0000000000..5b8473b340 --- /dev/null +++ b/extensions/python/syntaxes/tree-sitter-python.json @@ -0,0 +1,192 @@ +{ + "name": "Python", + "scopeName": "source.python", + "type": "tree-sitter", + "parser": "tree-sitter-python", + "firstLineRegex": [ + "^#![ \\t]*/.*\\bpython[\\d\\.]*\\b", + "vim\\b.*\\bset\\b.*\\b(filetype|ft|syntax)=python" + ], + "fileTypes": [ + "py", + "pyi", + "pyw", + "gyp", + "gypi", + "SConstruct", + "Sconstruct", + "sconstruct", + "SConscript", + "wsgi" + ], + "folds": [ + { + "type": [ + "if_statement" + ], + "start": { + "type": ":" + }, + "end": { + "type": [ + "elif_clause", + "else_clause" + ] + } + }, + { + "type": [ + "if_statement", + "elif_clause", + "else_clause", + "for_statement", + "try_statement", + "with_statement", + "while_statement", + "class_definition", + "function_definition", + "async_function_definition" + ], + "start": { + "type": ":" + } + }, + { + "start": { + "type": "(", + "index": 0 + }, + "end": { + "type": ")", + "index": -1 + } + }, + { + "start": { + "type": "[", + "index": 0 + }, + "end": { + "type": "]", + "index": -1 + } + }, + { + "start": { + "type": "{", + "index": 0 + }, + "end": { + "type": "}", + "index": -1 + } + } + ], + "comments": { + "start": "# " + }, + "scopes": { + "module": "source.python", + "comment": "comment.line", + "string": "string.quoted", + "escape_sequence": "constant.character.escape", + "interpolation": "meta.embedded", + "interpolation > \"{\"": "punctuation.section.embedded", + "interpolation > \"}\"": "punctuation.section.embedded", + "class_definition > identifier": "entity.name.type.class", + "function_definition > identifier": "entity.name.function", + "call > identifier:nth-child(0)": [ + { + "match": "^(abs|all|any|ascii|bin|bool|breakpoint|bytearray|bytes|callable|chr|classmethod|compile|complex|delattr|dict|dir|divmod|enumerate|eval|exec|filter|float|format|frozenset|getattr|globals|hasattr|hash|help|hex|id|input|int|isinstance|issubclass|iter|len|list|locals|map|max|memoryview|min|next|object|oct|open|ord|pow|print|property|range|repr|reversed|round|set|setattr|slice|sorted|staticmethod|str|sum|super|tuple|type|vars|zip|__import__)$", + "scopes": "support.function" + }, + "entity.name.function" + ], + "call > attribute > identifier:nth-child(2)": "entity.name.function", + "identifier": { + "match": "^(BaseException|Exception|TypeError|StopAsyncIteration|StopIteration|ImportError|ModuleNotFoundError|OSError|ConnectionError|BrokenPipeError|ConnectionAbortedError|ConnectionRefusedError|ConnectionResetError|BlockingIOError|ChildProcessError|FileExistsError|FileNotFoundError|IsADirectoryError|NotADirectoryError|InterruptedError|PermissionError|ProcessLookupError|TimeoutError|EOFError|RuntimeError|RecursionError|NotImplementedError|NameError|UnboundLocalError|AttributeError|SyntaxError|IndentationError|TabError|LookupError|IndexError|KeyError|ValueError|UnicodeError|UnicodeEncodeError|UnicodeDecodeError|UnicodeTranslateError|AssertionError|ArithmeticError|FloatingPointError|OverflowError|ZeroDivisionError|SystemError|ReferenceError|BufferError|MemoryError|Warning|UserWarning|DeprecationWarning|PendingDeprecationWarning|SyntaxWarning|RuntimeWarning|FutureWarning|ImportWarning|UnicodeWarning|BytesWarning|ResourceWarning|GeneratorExit|SystemExit|KeyboardInterrupt)$", + "scopes": "support.type.exception" + }, + "attribute > identifier:nth-child(2)": "variable.other.object.property", + "decorator": "entity.name.function.decorator", + "none": "constant.language", + "true": "constant.language", + "false": "constant.language", + "integer": "constant.numeric", + "float": "constant.numeric", + "type > identifier": "support.storage.type", + "class_definition > argument_list > attribute": "entity.other.inherited-class", + "class_definition > argument_list > identifier": "entity.other.inherited-class", + "class_definition > argument_list > keyword_argument > attribute": "entity.other.inherited-class", + "class_definition > argument_list > keyword_argument > identifier:nth-child(2)": "entity.other.inherited-class", + "\"class\"": "storage.type.class", + "\"def\"": "storage.type.function", + "\"lambda\"": "storage.type.function", + "\"global\"": "storage.modifier.global", + "\"nonlocal\"": "storage.modifier.nonlocal", + "parameters > identifier": "variable.parameter.function", + "parameters > list_splat > identifier": "variable.parameter.function", + "parameters > dictionary_splat > identifier": "variable.parameter.function", + "default_parameter > identifier:nth-child(0)": "variable.parameter.function", + "keyword_argument > identifier:nth-child(0)": "variable.parameter.function", + "\"if\"": "keyword.control", + "\"else\"": "keyword.control", + "\"elif\"": "keyword.control", + "\"while\"": "keyword.control", + "\"for\"": "keyword.control", + "\"return\"": "keyword.control", + "\"break\"": "keyword.control", + "\"continue\"": "keyword.control", + "\"pass\"": "keyword.control", + "\"raise\"": "keyword.control", + "\"yield\"": "keyword.control", + "\"await\"": "keyword.control", + "\"async\"": "keyword.control", + "\"try\"": "keyword.control", + "\"except\"": "keyword.control", + "\"with\"": "keyword.control", + "\"as\"": "keyword.control", + "\"finally\"": "keyword.control", + "\"import\"": "keyword.control", + "\"from\"": "keyword.control", + "\"print\"": "keyword.other", + "\"assert\"": "keyword.other", + "\"exec\"": "keyword.other", + "\"del\"": "keyword.other", + "\"+\"": "keyword.operator", + "\"-\"": "keyword.operator", + "\"*\"": "keyword.operator", + "\"/\"": "keyword.operator", + "\"%\"": "keyword.operator", + "\"**\"": "keyword.operator", + "\"//\"": "keyword.operator", + "\"==\"": "keyword.operator", + "\"!=\"": "keyword.operator", + "\"<>\"": "keyword.operator", + "\">\"": "keyword.operator", + "\"<\"": "keyword.operator", + "\">=\"": "keyword.operator", + "\"<=\"": "keyword.operator", + "\"=\"": "keyword.operator", + "\"+=\"": "keyword.operator", + "\"-=\"": "keyword.operator", + "\"*=\"": "keyword.operator", + "\"/=\"": "keyword.operator", + "\"%=\"": "keyword.operator", + "\"**=\"": "keyword.operator", + "\"//=\"": "keyword.operator", + "\"&\"": "keyword.operator", + "\"|\"": "keyword.operator", + "\"^\"": "keyword.operator", + "\"~\"": "keyword.operator", + "\"<<\"": "keyword.operator", + "\">>\"": "keyword.operator", + "binary_operator > \"@\"": "keyword.operator", + "binary_operator > \"@=\"": "keyword.operator", + "\"in\"": "keyword.operator.logical.python", + "\"and\"": "keyword.operator.logical.python", + "\"or\"": "keyword.operator.logical.python", + "\"not\"": "keyword.operator.logical.python", + "\"is\"": "keyword.operator.logical.python" + } +} \ No newline at end of file diff --git a/extensions/typescript-basics/package.json b/extensions/typescript-basics/package.json index 3f697de5ce..0b74fff91a 100644 --- a/extensions/typescript-basics/package.json +++ b/extensions/typescript-basics/package.json @@ -54,6 +54,7 @@ "language": "typescript", "scopeName": "source.ts", "path": "./syntaxes/TypeScript.tmLanguage.json", + "treeSitterPath": "./syntaxes/tree-sitter-typescript.json", "tokenTypes": { "entity.name.type.instance.jsdoc": "other", "entity.name.function.tagged-template": "other", @@ -64,6 +65,7 @@ { "language": "typescriptreact", "scopeName": "source.tsx", + "treeSitterPath": "./syntaxes/tree-sitter-tsx.json", "path": "./syntaxes/TypeScriptReact.tmLanguage.json", "embeddedLanguages": { "meta.tag.tsx": "jsx-tags", diff --git a/extensions/typescript-basics/syntaxes/tree-sitter-tsx.json b/extensions/typescript-basics/syntaxes/tree-sitter-tsx.json new file mode 100644 index 0000000000..bfb4356316 --- /dev/null +++ b/extensions/typescript-basics/syntaxes/tree-sitter-tsx.json @@ -0,0 +1,254 @@ +{ + "name": "TypeScriptReact", + "scopeName": "source.tsx", + "type": "tree-sitter", + "parser": "tree-sitter-typescript/tsx", + "fileTypes": [ + "tsx" + ], + "comments": { + "start": "// " + }, + "folds": [ + { + "type": "comment" + }, + { + "type": [ + "jsx_element", + "template_string" + ], + "start": { + "index": 0 + }, + "end": { + "index": -1 + } + }, + { + "type": "jsx_self_closing_element", + "start": { + "index": 1 + }, + "end": { + "index": -2 + } + }, + { + "type": [ + "object_type", + "type_arguments", + "type_parameters" + ], + "start": { + "index": 0 + }, + "end": { + "index": -1 + } + }, + { + "start": { + "index": 0, + "type": "{" + }, + "end": { + "index": -1, + "type": "}" + } + }, + { + "start": { + "index": 0, + "type": "[" + }, + "end": { + "index": -1, + "type": "]" + } + }, + { + "start": { + "index": 0, + "type": "(" + }, + "end": { + "index": -1, + "type": ")" + } + } + ], + "scopes": { + "program": "source.ts", + "property_identifier": [ + { + "match": "^[$A-Z_]+$", + "scopes": "constant.other.property.js" + }, + "variable.other.object.property" + ], + "shorthand_property_identifier": [ + { + "match": "^[$A-Z_]{2,}$", + "scopes": "constant.other" + } + ], + "class > identifier, new_expression > call_expression > identifier": "support.type", + "jsx_opening_element > identifier, jsx_closing_element > identifier, jsx_self_closing_element > identifier, call_expression > identifier": [ + { + "match": "^[A-Z]", + "scopes": "support.type" + } + ], + "function > identifier": "entity.name.function", + "generator_function > identifier": "entity.name.function", + "call_expression > identifier": [ + { + "match": "^require$", + "scopes": "support.function" + }, + "entity.name.function" + ], + "call_expression > super": "support.function.super", + "method_definition > property_identifier": "entity.name.function", + "call_expression > member_expression > property_identifier": "entity.name.function", + "identifier": [ + { + "match": "^(global|module|exports|__filename|__dirname|window|document)$", + "scopes": "support.variable" + }, + { + "exact": "require", + "scopes": "support.function" + }, + { + "match": "^[$A-Z_]{2,}$", + "scopes": "constant.other" + }, + { + "match": "^[A-Z]", + "scopes": "support.type" + } + ], + "number": "constant.numeric", + "string": "string.quoted", + "regex": "string.regexp", + "escape_sequence": "constant.character.escape", + "template_string": "string.quoted.template", + "undefined": "constant.language", + "null": "constant.language.null", + "true": "constant.language.boolean.true", + "false": "constant.language.boolean.false", + "comment": "comment.block", + "hash_bang_line": "comment.block", + "jsx_expression > \"{\", jsx_expression > \"}\", template_substitution > \"${\", template_substitution > \"}\"": "punctuation.section.embedded", + "template_substitution": "embedded.source", + "\"(\"": "punctuation.definition.parameters.begin.bracket.round", + "\")\"": "punctuation.definition.parameters.end.bracket.round", + "\"{\"": "punctuation.definition.function.body.begin.bracket.curly", + "\"}\"": "punctuation.definition.function.body.end.bracket.curly", + "\";\"": "punctuation.terminator.statement.semicolon", + "\"[\"": "punctuation.definition.array.begin.bracket.square", + "\"]\"": "punctuation.definition.array.end.bracket.square", + "\"var\"": "storage.type", + "\"let\"": "storage.type", + "\"class\"": "storage.type", + "\"extends\"": "storage.modifier", + "\"const\"": "storage.modifier", + "\"static\"": "storage.modifier", + "\"function\"": "storage.type.function", + "\"=>\"": "storage.type.function.arrow", + "\"=\"": "keyword.operator.js", + "\"+=\"": "keyword.operator.js", + "\"-=\"": "keyword.operator.js", + "\"*=\"": "keyword.operator.js", + "\"/=\"": "keyword.operator.js", + "\"%=\"": "keyword.operator.js", + "\"<<=\"": "keyword.operator.js", + "\">>=\"": "keyword.operator.js", + "\">>>=\"": "keyword.operator.js", + "\"&=\"": "keyword.operator.js", + "\"^=\"": "keyword.operator.js", + "\"|=\"": "keyword.operator.js", + "\"!\"": "keyword.operator.js", + "\"+\"": "keyword.operator.js", + "\"-\"": "keyword.operator.js", + "\"*\"": "keyword.operator.js", + "\"/\"": "keyword.operator.js", + "\"%\"": "keyword.operator.js", + "\"==\"": "keyword.operator.js", + "\"===\"": "keyword.operator.js", + "\"!=\"": "keyword.operator.js", + "\"!==\"": "keyword.operator.js", + "\">=\"": "keyword.operator.js", + "\"<=\"": "keyword.operator.js", + "\">\"": "keyword.operator.js", + "\"<\"": "keyword.operator.js", + "\":\"": "keyword.operator.js", + "\"?\"": "keyword.operator.js", + "\"&&\"": "keyword.operator.js", + "\"||\"": "keyword.operator.js", + "\"&\"": "keyword.operator.js", + "\"~\"": "keyword.operator.js", + "\"^\"": "keyword.operator.js", + "\">>\"": "keyword.operator.js", + "\">>>\"": "keyword.operator.js", + "\"<<\"": "keyword.operator.js", + "\"|\"": "keyword.operator.js", + "\"++\"": "keyword.operator.js", + "\"--\"": "keyword.operator.js", + "\"...\"": "keyword.operator.js", + "\"in\"": "keyword.control", + "\"instanceof\"": "keyword.control", + "\"of\"": "keyword.control", + "\"new\"": "keyword.control", + "\"typeof\"": "keyword.control", + "\"get\"": "keyword.operator.setter", + "\"set\"": "keyword.operator.setter", + "\".\"": "meta.delimiter.period", + "\",\"": "meta.delimiter.comma", + "\"as\"": "keyword.control", + "\"if\"": "keyword.control", + "\"do\"": "keyword.control", + "\"else\"": "keyword.control", + "\"while\"": "keyword.control", + "\"for\"": "keyword.control", + "\"return\"": "keyword.control", + "\"break\"": "keyword.control", + "\"continue\"": "keyword.control", + "\"throw\"": "keyword.control", + "\"try\"": "keyword.control", + "\"catch\"": "keyword.control", + "\"finally\"": "keyword.control", + "\"switch\"": "keyword.control", + "\"case\"": "keyword.control", + "\"default\"": "keyword.control", + "\"export\"": "keyword.control", + "\"import\"": "keyword.control", + "\"from\"": "keyword.control", + "\"yield\"": "keyword.control", + "\"async\"": "keyword.control", + "\"await\"": "keyword.control", + "\"debugger\"": "keyword.control", + "\"delete\"": "keyword.control", + "jsx_attribute > property_identifier": "entity.other.attribute-name", + "jsx_opening_element > identifier": "entity.name.tag", + "jsx_closing_element > identifier": "entity.name.tag", + "jsx_self_closing_element > identifier": "entity.name.tag", + "class > identifier": "support.storage.type", + "type_identifier": "support.storage.type", + "predefined_type": "support.storage.type", + "method_signature > property_identifier, function_signature > identifier": "entity.name.function", + "\"implements\"": "keyword.modifier", + "\"namespace\"": "keyword.modifier", + "\"enum\"": "keyword.modifier", + "\"interface\"": "keyword.modifier", + "\"module\"": "keyword.modifier", + "\"declare\"": "keyword.modifier", + "\"public\"": "keyword.modifier", + "\"private\"": "keyword.modifier", + "\"protected\"": "keyword.modifier", + "readonly": "keyword.modifier", + "\"type\"": "keyword.modifier" + } +} \ No newline at end of file diff --git a/extensions/typescript-basics/syntaxes/tree-sitter-typescript.json b/extensions/typescript-basics/syntaxes/tree-sitter-typescript.json new file mode 100644 index 0000000000..6d44d39068 --- /dev/null +++ b/extensions/typescript-basics/syntaxes/tree-sitter-typescript.json @@ -0,0 +1,223 @@ +{ + "name": "TypeScript", + "scopeName": "source.ts", + "type": "tree-sitter", + "parser": "tree-sitter-typescript/typescript", + "fileTypes": [ + "ts" + ], + "comments": { + "start": "// " + }, + "folds": [ + { + "type": "comment" + }, + { + "type": [ + "object_type", + "type_arguments", + "type_parameters" + ], + "start": { + "index": 0 + }, + "end": { + "index": -1 + } + }, + { + "start": { + "index": 0, + "type": "{" + }, + "end": { + "index": -1, + "type": "}" + } + }, + { + "start": { + "index": 0, + "type": "[" + }, + "end": { + "index": -1, + "type": "]" + } + }, + { + "start": { + "index": 0, + "type": "(" + }, + "end": { + "index": -1, + "type": ")" + } + } + ], + "scopes": { + "program": "source.ts", + "property_identifier": [ + { + "match": "^[$A-Z_]+$", + "scopes": "constant.other.property.js" + }, + "variable.other.object.property" + ], + "shorthand_property_identifier": [ + { + "match": "^[$A-Z_]{2,}$", + "scopes": "constant.other" + } + ], + "class > identifier, new_expression > call_expression > identifier": "support.type", + "call_expression > identifier": [ + { + "match": "^require$", + "scopes": "support.function" + }, + "entity.name.function" + ], + "function > identifier": "entity.name.function", + "generator_function > identifier": "entity.name.function", + "call_expression > super": "support.function.super", + "method_definition > property_identifier": "entity.name.function", + "call_expression > member_expression > property_identifier": "entity.name.function", + "identifier": [ + { + "match": "^(global|module|exports|__filename|__dirname|window|document)$", + "scopes": "support.variable" + }, + { + "exact": "require", + "scopes": "support.function" + }, + { + "match": "^[$A-Z_]{2,}$", + "scopes": "constant.other" + }, + { + "match": "^[A-Z]", + "scopes": "support.type" + } + ], + "number": "constant.numeric", + "string": "string.quoted", + "regex": "string.regexp", + "escape_sequence": "constant.character.escape", + "template_string": "string.quoted.template", + "undefined": "constant.language", + "null": "constant.language.null", + "true": "constant.language.boolean.true", + "false": "constant.language.boolean.false", + "comment": "comment.block", + "hash_bang_line": "comment.block", + "template_substitution > \"${\", template_substitution > \"}\"": "punctuation.section.embedded", + "template_substitution": "embedded.source", + "\"(\"": "punctuation.definition.parameters.begin.bracket.round", + "\")\"": "punctuation.definition.parameters.end.bracket.round", + "\"{\"": "punctuation.definition.function.body.begin.bracket.curly", + "\"}\"": "punctuation.definition.function.body.end.bracket.curly", + "\";\"": "punctuation.terminator.statement.semicolon", + "\"[\"": "punctuation.definition.array.begin.bracket.square", + "\"]\"": "punctuation.definition.array.end.bracket.square", + "\"var\"": "storage.type", + "\"let\"": "storage.type", + "\"class\"": "storage.type", + "\"extends\"": "storage.modifier", + "\"const\"": "storage.modifier", + "\"static\"": "storage.modifier", + "\"function\"": "storage.type.function", + "\"=>\"": "storage.type.function.arrow", + "\"=\"": "keyword.operator.js", + "\"+=\"": "keyword.operator.js", + "\"-=\"": "keyword.operator.js", + "\"*=\"": "keyword.operator.js", + "\"/=\"": "keyword.operator.js", + "\"%=\"": "keyword.operator.js", + "\"<<=\"": "keyword.operator.js", + "\">>=\"": "keyword.operator.js", + "\">>>=\"": "keyword.operator.js", + "\"&=\"": "keyword.operator.js", + "\"^=\"": "keyword.operator.js", + "\"|=\"": "keyword.operator.js", + "\"!\"": "keyword.operator.js", + "\"+\"": "keyword.operator.js", + "\"-\"": "keyword.operator.js", + "\"*\"": "keyword.operator.js", + "\"/\"": "keyword.operator.js", + "\"%\"": "keyword.operator.js", + "\"==\"": "keyword.operator.js", + "\"===\"": "keyword.operator.js", + "\"!=\"": "keyword.operator.js", + "\"!==\"": "keyword.operator.js", + "\">=\"": "keyword.operator.js", + "\"<=\"": "keyword.operator.js", + "\">\"": "keyword.operator.js", + "\"<\"": "keyword.operator.js", + "\":\"": "keyword.operator.js", + "\"?\"": "keyword.operator.js", + "\"&&\"": "keyword.operator.js", + "\"||\"": "keyword.operator.js", + "\"&\"": "keyword.operator.js", + "\"~\"": "keyword.operator.js", + "\"^\"": "keyword.operator.js", + "\">>\"": "keyword.operator.js", + "\">>>\"": "keyword.operator.js", + "\"<<\"": "keyword.operator.js", + "\"|\"": "keyword.operator.js", + "\"++\"": "keyword.operator.js", + "\"--\"": "keyword.operator.js", + "\"...\"": "keyword.operator.js", + "\"in\"": "keyword.control", + "\"instanceof\"": "keyword.control", + "\"of\"": "keyword.control", + "\"new\"": "keyword.control", + "\"typeof\"": "keyword.control", + "\"get\"": "keyword.operator.setter", + "\"set\"": "keyword.operator.setter", + "\".\"": "meta.delimiter.period", + "\",\"": "meta.delimiter.comma", + "\"as\"": "keyword.control", + "\"if\"": "keyword.control", + "\"do\"": "keyword.control", + "\"else\"": "keyword.control", + "\"while\"": "keyword.control", + "\"for\"": "keyword.control", + "\"return\"": "keyword.control", + "\"break\"": "keyword.control", + "\"continue\"": "keyword.control", + "\"throw\"": "keyword.control", + "\"try\"": "keyword.control", + "\"catch\"": "keyword.control", + "\"finally\"": "keyword.control", + "\"switch\"": "keyword.control", + "\"case\"": "keyword.control", + "\"default\"": "keyword.control", + "\"export\"": "keyword.control", + "\"import\"": "keyword.control", + "\"from\"": "keyword.control", + "\"yield\"": "keyword.control", + "\"async\"": "keyword.control", + "\"await\"": "keyword.control", + "\"debugger\"": "keyword.control", + "\"delete\"": "keyword.control", + "class > identifier": "support.storage.type", + "type_identifier": "support.storage.type", + "predefined_type": "support.storage.type", + "method_signature > property_identifier, function_signature > identifier": "entity.name.function", + "\"implements\"": "keyword.modifier", + "\"namespace\"": "keyword.modifier", + "\"enum\"": "keyword.modifier", + "\"interface\"": "keyword.modifier", + "\"module\"": "keyword.modifier", + "\"declare\"": "keyword.modifier", + "\"public\"": "keyword.modifier", + "\"private\"": "keyword.modifier", + "\"protected\"": "keyword.modifier", + "readonly": "keyword.modifier", + "\"type\"": "keyword.modifier" + } +} \ No newline at end of file From f64dcb79682ef390307a38f71a0efb8f78a996fb Mon Sep 17 00:00:00 2001 From: CrossR Date: Fri, 10 Apr 2020 22:36:47 +0100 Subject: [PATCH 5/6] Fix scopes for Javascript and Typescript. --- src/Syntax/TreeSitterSyntaxHighlights.re | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Syntax/TreeSitterSyntaxHighlights.re b/src/Syntax/TreeSitterSyntaxHighlights.re index 9b9c0bec52..01c4c7ec20 100644 --- a/src/Syntax/TreeSitterSyntaxHighlights.re +++ b/src/Syntax/TreeSitterSyntaxHighlights.re @@ -39,8 +39,8 @@ let getParserFromScope = language => | "source.c" => Some(Parser.c()) | "source.cpp" => Some(Parser.cpp()) | "source.python" => Some(Parser.python()) - | "source.javascript" => Some(Parser.javascript()) - | "source.typescript" => Some(Parser.typescript()) + | "source.js" => Some(Parser.javascript()) + | "source.ts" => Some(Parser.typescript()) | "source.tsx" => Some(Parser.tsx()) | _ => None }; From fe18443c4a5562cd8d0041f356a8b5a5d49e3b3f Mon Sep 17 00:00:00 2001 From: CrossR Date: Sat, 11 Apr 2020 15:14:58 +0100 Subject: [PATCH 6/6] Bump to newest version of reason-tree-sitter. --- bench.esy.lock/index.json | 22 +++++++++++----------- esy.lock/index.json | 22 +++++++++++----------- integrationtest.esy.lock/index.json | 22 +++++++++++----------- package.json | 2 +- test.esy.lock/index.json | 22 +++++++++++----------- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json index a2d1b95ec5..bea24ab05a 100644 --- a/bench.esy.lock/index.json +++ b/bench.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "3c5a89bf3734c34cd52aec0d364c6da1", + "checksum": "c18cb1ee0cac3f6ad9ee0f2216df8a24", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -287,20 +287,20 @@ ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9": { + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9": { "id": - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9", "name": "reason-tree-sitter", - "version": "github:CrossR/reason-tree-sitter#5baa4ae", + "version": "github:CrossR/reason-tree-sitter#b2913d3", "source": { "type": "install", - "source": [ "github:CrossR/reason-tree-sitter#5baa4ae" ] + "source": [ "github:CrossR/reason-tree-sitter#b2913d3" ] }, "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "ocaml@4.8.1000@d41d8cd9", - "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9", "editor-core-types@github:onivim/editor-core-types#6a8afaf@d41d8cd9", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", @@ -842,13 +842,13 @@ ], "devDependencies": [] }, - "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9": { - "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9": { + "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9", "name": "esy-tree-sitter", - "version": "github:CrossR/esy-tree-sitter#4453dce", + "version": "github:CrossR/esy-tree-sitter#fdcf8f7", "source": { "type": "install", - "source": [ "github:CrossR/esy-tree-sitter#4453dce" ] + "source": [ "github:CrossR/esy-tree-sitter#fdcf8f7" ] }, "overrides": [], "dependencies": [], @@ -1208,7 +1208,7 @@ "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9", "reason-textmate@3.0.0@d41d8cd9", "reason-sdl2@2.10.3021@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9", "reason-libvim@github:onivim/reason-libvim#5a6976d@d41d8cd9", diff --git a/esy.lock/index.json b/esy.lock/index.json index 382d423c74..2ffa95d835 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "3c5a89bf3734c34cd52aec0d364c6da1", + "checksum": "c18cb1ee0cac3f6ad9ee0f2216df8a24", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -287,20 +287,20 @@ ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9": { + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9": { "id": - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9", "name": "reason-tree-sitter", - "version": "github:CrossR/reason-tree-sitter#5baa4ae", + "version": "github:CrossR/reason-tree-sitter#b2913d3", "source": { "type": "install", - "source": [ "github:CrossR/reason-tree-sitter#5baa4ae" ] + "source": [ "github:CrossR/reason-tree-sitter#b2913d3" ] }, "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "ocaml@4.8.1000@d41d8cd9", - "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9", "editor-core-types@github:onivim/editor-core-types#6a8afaf@d41d8cd9", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", @@ -842,13 +842,13 @@ ], "devDependencies": [] }, - "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9": { - "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9": { + "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9", "name": "esy-tree-sitter", - "version": "github:CrossR/esy-tree-sitter#4453dce", + "version": "github:CrossR/esy-tree-sitter#fdcf8f7", "source": { "type": "install", - "source": [ "github:CrossR/esy-tree-sitter#4453dce" ] + "source": [ "github:CrossR/esy-tree-sitter#fdcf8f7" ] }, "overrides": [], "dependencies": [], @@ -1207,7 +1207,7 @@ "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9", "reason-textmate@3.0.0@d41d8cd9", "reason-sdl2@2.10.3021@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9", "reason-libvim@github:onivim/reason-libvim#5a6976d@d41d8cd9", diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json index 9c562a3b4a..8fafbbd123 100644 --- a/integrationtest.esy.lock/index.json +++ b/integrationtest.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "3c5a89bf3734c34cd52aec0d364c6da1", + "checksum": "c18cb1ee0cac3f6ad9ee0f2216df8a24", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -287,20 +287,20 @@ ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9": { + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9": { "id": - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9", "name": "reason-tree-sitter", - "version": "github:CrossR/reason-tree-sitter#5baa4ae", + "version": "github:CrossR/reason-tree-sitter#b2913d3", "source": { "type": "install", - "source": [ "github:CrossR/reason-tree-sitter#5baa4ae" ] + "source": [ "github:CrossR/reason-tree-sitter#b2913d3" ] }, "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "ocaml@4.8.1000@d41d8cd9", - "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9", "editor-core-types@github:onivim/editor-core-types#6a8afaf@d41d8cd9", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", @@ -842,13 +842,13 @@ ], "devDependencies": [] }, - "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9": { - "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9": { + "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9", "name": "esy-tree-sitter", - "version": "github:CrossR/esy-tree-sitter#4453dce", + "version": "github:CrossR/esy-tree-sitter#fdcf8f7", "source": { "type": "install", - "source": [ "github:CrossR/esy-tree-sitter#4453dce" ] + "source": [ "github:CrossR/esy-tree-sitter#fdcf8f7" ] }, "overrides": [], "dependencies": [], @@ -1207,7 +1207,7 @@ "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9", "reason-textmate@3.0.0@d41d8cd9", "reason-sdl2@2.10.3021@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9", "reason-libvim@github:onivim/reason-libvim#5a6976d@d41d8cd9", diff --git a/package.json b/package.json index 353156fdef..48c33d0596 100644 --- a/package.json +++ b/package.json @@ -246,7 +246,7 @@ "rench": "bryphe/rench#a976fe5", "@esy-ocaml/reason": "facebook/reason#8f71db0", "reasonFuzz": "CrossR/reasonFuzz#1ad6f5d", - "reason-tree-sitter": "CrossR/reason-tree-sitter#5baa4ae", + "reason-tree-sitter": "CrossR/reason-tree-sitter#b2913d3", "reason-harfbuzz": "revery-ui/reason-harfbuzz#eca58ea", "@esy-ocaml/libffi": "onivim/libffi#590b041", "esy-oniguruma": "onivim/esy-oniguruma#4698ce4", diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json index 3f20b93e48..0df0b30415 100644 --- a/test.esy.lock/index.json +++ b/test.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "e0714b1bf7bb24df4a5f0ffdafbbcc38", + "checksum": "611eb0f7404ccaf34f3468f47359cf53", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b63883606dd57c54a7158d560d6cba8cd79@d41d8cd9": { @@ -287,20 +287,20 @@ ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] }, - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9": { + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9": { "id": - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9", "name": "reason-tree-sitter", - "version": "github:CrossR/reason-tree-sitter#5baa4ae", + "version": "github:CrossR/reason-tree-sitter#b2913d3", "source": { "type": "install", - "source": [ "github:CrossR/reason-tree-sitter#5baa4ae" ] + "source": [ "github:CrossR/reason-tree-sitter#b2913d3" ] }, "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "ocaml@4.8.1000@d41d8cd9", - "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9", "editor-core-types@github:onivim/editor-core-types#6a8afaf@d41d8cd9", "@opam/dune-configurator@opam:2.4.0@6976bb12", "@opam/dune@opam:2.4.0@639d28a3", @@ -842,13 +842,13 @@ ], "devDependencies": [] }, - "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9": { - "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#4453dce@d41d8cd9", + "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9": { + "id": "esy-tree-sitter@github:CrossR/esy-tree-sitter#fdcf8f7@d41d8cd9", "name": "esy-tree-sitter", - "version": "github:CrossR/esy-tree-sitter#4453dce", + "version": "github:CrossR/esy-tree-sitter#fdcf8f7", "source": { "type": "install", - "source": [ "github:CrossR/esy-tree-sitter#4453dce" ] + "source": [ "github:CrossR/esy-tree-sitter#fdcf8f7" ] }, "overrides": [], "dependencies": [], @@ -1207,7 +1207,7 @@ "rench@github:bryphe/rench#a976fe5@d41d8cd9", "refmterr@3.3.0@d41d8cd9", "reasonFuzz@github:CrossR/reasonFuzz#1ad6f5d@d41d8cd9", - "reason-tree-sitter@github:CrossR/reason-tree-sitter#5baa4ae@d41d8cd9", + "reason-tree-sitter@github:CrossR/reason-tree-sitter#b2913d3@d41d8cd9", "reason-textmate@3.0.0@d41d8cd9", "reason-sdl2@2.10.3021@d41d8cd9", "reason-native-crash-utils@github:onivim/reason-native-crash-utils#ae1fd34@d41d8cd9", "reason-libvim@github:onivim/reason-libvim#5a6976d@d41d8cd9",