From 130e027ffe53befae455197187c1afac7fe48290 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 21 Jun 2024 16:11:17 -0400 Subject: [PATCH 1/6] Add NEWS file --- bindings/r/NEWS.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 bindings/r/NEWS.md diff --git a/bindings/r/NEWS.md b/bindings/r/NEWS.md new file mode 100644 index 0000000..def859e --- /dev/null +++ b/bindings/r/NEWS.md @@ -0,0 +1,3 @@ +# treesitter.r (development version) + +* Initial CRAN submission. From c4bd127f4e3e60be873abfbf8f1c1334fe61884a Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 21 Jun 2024 16:12:11 -0400 Subject: [PATCH 2/6] Add `cran-comments.md` --- bindings/r/.Rbuildignore | 1 + bindings/r/cran-comments.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 bindings/r/cran-comments.md diff --git a/bindings/r/.Rbuildignore b/bindings/r/.Rbuildignore index d63cade..fc15825 100644 --- a/bindings/r/.Rbuildignore +++ b/bindings/r/.Rbuildignore @@ -11,3 +11,4 @@ ^_pkgdown\.yml$ ^docs$ ^pkgdown$ +^cran-comments\.md$ diff --git a/bindings/r/cran-comments.md b/bindings/r/cran-comments.md new file mode 100644 index 0000000..8e9a374 --- /dev/null +++ b/bindings/r/cran-comments.md @@ -0,0 +1 @@ +This is a new release. It should be considered alongside the treesitter R package, which is being released at the same time (right before this one was sent in). From 8854f5d65bc1663c0abc5c1144ee84c89290e003 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 21 Jun 2024 16:12:58 -0400 Subject: [PATCH 3/6] Remove `Remote` for release --- bindings/r/DESCRIPTION | 2 -- 1 file changed, 2 deletions(-) diff --git a/bindings/r/DESCRIPTION b/bindings/r/DESCRIPTION index 8585e74..98d3b82 100644 --- a/bindings/r/DESCRIPTION +++ b/bindings/r/DESCRIPTION @@ -15,8 +15,6 @@ Depends: Suggests: testthat (>= 3.0.0), treesitter -Remotes: - treesitter=DavisVaughan/r-tree-sitter Config/build/bootstrap: TRUE Config/Needs/website: tidyverse/tidytemplate Config/testthat/edition: 3 From 42a2fd0cd8475b08980d28ca4c1efbb8c2a43048 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 21 Jun 2024 16:15:48 -0400 Subject: [PATCH 4/6] Add license note for tree-sitter pieces --- bindings/r/DESCRIPTION | 4 +++- bindings/r/LICENSE.note | 24 ++++++++++++++++++++++++ bindings/r/man/treesitter.r-package.Rd | 1 + 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 bindings/r/LICENSE.note diff --git a/bindings/r/DESCRIPTION b/bindings/r/DESCRIPTION index 98d3b82..70cc93f 100644 --- a/bindings/r/DESCRIPTION +++ b/bindings/r/DESCRIPTION @@ -3,7 +3,9 @@ Title: 'R' Grammar for 'Tree-Sitter' Version: 0.0.0.9000 Authors@R: c( person("Davis", "Vaughan", , "davis@posit.co", role = c("aut", "cre")), - person("Posit Software, PBC", role = c("cph", "fnd")) + person("Posit Software, PBC", role = c("cph", "fnd")), + person("Tree-sitter authors", role = "cph", + comment = "Tree-sitter C headers and parser.c") ) Description: Provides bindings to an 'R' grammar for 'Tree-sitter', to be used alongside the 'treesitter' package. 'Tree-sitter' builds concrete diff --git a/bindings/r/LICENSE.note b/bindings/r/LICENSE.note new file mode 100644 index 0000000..918b2bc --- /dev/null +++ b/bindings/r/LICENSE.note @@ -0,0 +1,24 @@ +Tree-sitter C headers and parser.c +-------------------------------------------------------------------------------- + +The MIT License (MIT) + +Copyright (c) 2018-2024 Max Brunsfeld + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/bindings/r/man/treesitter.r-package.Rd b/bindings/r/man/treesitter.r-package.Rd index 471d89e..cefe58c 100644 --- a/bindings/r/man/treesitter.r-package.Rd +++ b/bindings/r/man/treesitter.r-package.Rd @@ -14,6 +14,7 @@ Provides bindings to an 'R' grammar for 'Tree-sitter', to be used alongside the Other contributors: \itemize{ \item Posit Software, PBC [copyright holder, funder] + \item Tree-sitter authors (Tree-sitter C headers and parser.c) [copyright holder] } } From 2585cb4a49015a8076ed2876eeb6a3d411e08e87 Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 21 Jun 2024 16:18:31 -0400 Subject: [PATCH 5/6] Add URLs --- bindings/r/DESCRIPTION | 2 ++ bindings/r/man/treesitter.r-package.Rd | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/bindings/r/DESCRIPTION b/bindings/r/DESCRIPTION index 70cc93f..cb799e9 100644 --- a/bindings/r/DESCRIPTION +++ b/bindings/r/DESCRIPTION @@ -12,6 +12,8 @@ Description: Provides bindings to an 'R' grammar for 'Tree-sitter', to be syntax trees for source files of any language, and can efficiently update those syntax trees as the source file is edited. License: MIT + file LICENSE +URL: https://github.com/r-lib/tree-sitter-r +BugReports: https://github.com/r-lib/tree-sitter-r/issues Depends: R (>= 4.3.0) Suggests: diff --git a/bindings/r/man/treesitter.r-package.Rd b/bindings/r/man/treesitter.r-package.Rd index cefe58c..f19c445 100644 --- a/bindings/r/man/treesitter.r-package.Rd +++ b/bindings/r/man/treesitter.r-package.Rd @@ -7,6 +7,14 @@ \title{treesitter.r: 'R' Grammar for 'Tree-Sitter'} \description{ Provides bindings to an 'R' grammar for 'Tree-sitter', to be used alongside the 'treesitter' package. 'Tree-sitter' builds concrete syntax trees for source files of any language, and can efficiently update those syntax trees as the source file is edited. +} +\seealso{ +Useful links: +\itemize{ + \item \url{https://github.com/r-lib/tree-sitter-r} + \item Report bugs at \url{https://github.com/r-lib/tree-sitter-r/issues} +} + } \author{ \strong{Maintainer}: Davis Vaughan \email{davis@posit.co} From 8f52ca67ef4466efff5c7d9e9889738598bdc9dd Mon Sep 17 00:00:00 2001 From: Davis Vaughan Date: Fri, 21 Jun 2024 16:21:16 -0400 Subject: [PATCH 6/6] Bump version to 1.0.1 --- bindings/r/DESCRIPTION | 2 +- bindings/r/NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/r/DESCRIPTION b/bindings/r/DESCRIPTION index cb799e9..f431886 100644 --- a/bindings/r/DESCRIPTION +++ b/bindings/r/DESCRIPTION @@ -1,6 +1,6 @@ Package: treesitter.r Title: 'R' Grammar for 'Tree-Sitter' -Version: 0.0.0.9000 +Version: 1.0.1 Authors@R: c( person("Davis", "Vaughan", , "davis@posit.co", role = c("aut", "cre")), person("Posit Software, PBC", role = c("cph", "fnd")), diff --git a/bindings/r/NEWS.md b/bindings/r/NEWS.md index def859e..6cbc68e 100644 --- a/bindings/r/NEWS.md +++ b/bindings/r/NEWS.md @@ -1,3 +1,3 @@ -# treesitter.r (development version) +# treesitter.r 1.0.1 * Initial CRAN submission.