1
0

2 Commits

6 changed files with 55 additions and 93 deletions

View File

@@ -1,60 +0,0 @@
From 9d86f3761bb30e8dcc81e754b81d3ce91848477e Mon Sep 17 00:00:00 2001
From: Amaan Qureshi <amaanq12@gmail.com>
Date: Sun, 10 Mar 2024 11:50:33 -0400
Subject: [PATCH] fix: escape braces in regex
---
grammar.js | 4 ++--
package.json | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/grammar.js b/grammar.js
index 13167db..9bd4a6b 100644
--- a/grammar.js
+++ b/grammar.js
@@ -1096,7 +1096,7 @@ module.exports = grammar({
chained_string: $ => seq($.string, repeat1($.string)),
- character: $ => /\?(\\\S({[0-9A-Fa-f]*}|[0-9A-Fa-f]*|-\S([MC]-\S)?)?|\S)/,
+ character: $ => /\?(\\\S(\{[0-9A-Fa-f]*\}|[0-9A-Fa-f]*|-\S([MC]-\S)?)?|\S)/,
interpolation: $ => choice(
seq('#{', optional($._statements), '}'),
@@ -1167,7 +1167,7 @@ module.exports = grammar({
/x[0-9a-fA-F]{1,2}/, // hex code
/[0-7]{1,3}/, // octal
/u[0-9a-fA-F]{4}/, // single unicode
- /u{[0-9a-fA-F ]+}/, // multiple unicode
+ /u\{[0-9a-fA-F]+\}/, // multiple unicode
),
)),
diff --git a/package.json b/package.json
index eb77e56..356552a 100644
--- a/package.json
+++ b/package.json
@@ -10,15 +10,15 @@
"author": "Rob Rix",
"license": "MIT",
"dependencies": {
- "nan": "^2.18.0",
+ "nan": "^2.19.0",
"node-gyp": "^10.0.1",
- "prebuild-install": "^7.1.1"
+ "prebuild-install": "^7.1.2"
},
"devDependencies": {
- "eslint": ">=8.56.0",
+ "eslint": ">=8.57.0",
"eslint-config-google": "^0.14.0",
"prebuild": "^13.0.0",
- "tree-sitter-cli": "^0.20.8"
+ "tree-sitter-cli": "^0.21.0"
},
"scripts": {
"build": "tree-sitter generate && node-gyp build",
--
2.44.0

View File

@@ -1,18 +0,0 @@
<!-- -*- xml -*- !-->
<services>
<service name="obs_scm" mode="disabled">
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="revision">@PARENT_TAG@</param>
<param name="url">https://github.com/tree-sitter/tree-sitter-ruby.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="changesauthor">Björn Bidar &#60;bjorn.bidar@thaodan.de&#62;</param>
</service>
<service mode="disabled" name="tar" />
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0732b29b94b71c5f155f869241a2ba2c0f33ebdb7bc3982be12986ab9f103b48
size 644358

BIN
tree-sitter-ruby-0.23.1.tar.gz LFS Normal file

Binary file not shown.

View File

@@ -1,3 +1,35 @@
-------------------------------------------------------------------
Wed Dec 4 23:43:56 UTC 2024 - Richard Rahl <rrahl0@opensuse.org>
- update to 0.23.1:
* ci(publish): add attestations and generate parser
* build: update bindings
* fix: remove unnecessary empty string usage
* chore: regenerate
* build: update bindings
* ci: update workflows
* fix(swift): include scanner.c
- update to 0.23.0:
* build: update bindings
* fix(go): correct test
* fix: handle != operator definition
* feat: support element references with blocks
* fix: do not require newline after block comment =end
* fix: parsing of multiple unicode escapes
* fix: correct repo url
- update to 0.21.0:
* ci: update workflows
* feat: rewrite scanner with array header and regenerate
* build: update bindings and manifests
* fix: reverse precedence queries
* fix: escape braces in regex
* docs: update badges
- switch to download_files service
- add neovim links
- add license file to package
- remove 0001-fix-escape-braces-in-regex.patch as it got fixed upstream
- enable devel package
-------------------------------------------------------------------
Fri Mar 22 22:09:04 UTC 2024 - Björn Bidar <bjorn.bidar@thaodan.de>

View File

@@ -16,26 +16,22 @@
#
%define _name ruby
Summary: Ruby grammar for tree-sitter
Name: tree-sitter-%{_name}
Version: 0.20.1
%define _name ruby
Name: tree-sitter-ruby
Version: 0.23.1
Release: 0
Summary: Ruby grammar for tree-sitter
License: MIT
Group: Development/Tools/Other
URL: https://github.com/tree-sitter/tree-sitter-ruby
Source0: %{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM 0001-fix-escape-braces-in-regex.patch
# -- unescaped curly brace in regex and invert query precedence for test
# Fix build against new tree-sitter based taken from master branch
Patch1: 0001-fix-escape-braces-in-regex.patch
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: tree-sitter
%treesitter_grammars %{_name}
%description
%{summary}.
%prep
%autosetup -p1
%autosetup
%build
%treesitter_configure
@@ -43,8 +39,20 @@ BuildRequires: tree-sitter
%install
%treesitter_install
%treesitter_devel_install
#neovim stuff
install -d %{buildroot}%{_libdir}/tree_sitter
ln -s %{_libdir}/lib%{name}.so %{buildroot}%{_libdir}/tree_sitter/%{_name}.so
%files
%{treesitter_files}
%license LICENSE
%treesitter_files
%{_libdir}/tree_sitter/%{_name}.so
%if 0%{?suse_version} < 1600
%dir %{_libdir}/tree_sitter
%endif
%treesitter_devel_package
%changelog