[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/csharp-mode 6566964 440/459: Merge pull request #231 fr
From: |
ELPA Syncer |
Subject: |
[elpa] externals/csharp-mode 6566964 440/459: Merge pull request #231 from emacs-csharp/bugfix/tree-sitter-crashes |
Date: |
Sun, 22 Aug 2021 14:00:18 -0400 (EDT) |
branch: externals/csharp-mode
commit 65669643834b8bda7d950185688754cc10bc15a5
Merge: 43e5919 254b91b
Author: Jostein Kjønigsen <jostein@kjonigsen.net>
Commit: GitHub <noreply@github.com>
Merge pull request #231 from emacs-csharp/bugfix/tree-sitter-crashes
Fix parse and sigabort errors on latest tree-sitter
---
csharp-tree-sitter.el | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/csharp-tree-sitter.el b/csharp-tree-sitter.el
index d3ea117..fea036f 100644
--- a/csharp-tree-sitter.el
+++ b/csharp-tree-sitter.el
@@ -40,7 +40,7 @@
;;; Tree-sitter
-(defvar-local csharp-mode-tree-sitter-patterns
+(setq csharp-mode-tree-sitter-patterns
[ ;; Various constructs
(comment) @comment
(modifier) @keyword
@@ -189,8 +189,8 @@
;; Type constraints
(type_parameter_constraints_clause
(identifier) @type)
- (type_parameter_constraint
- (identifier) @type)
+ ;; (type_parameter_constraint
+ ;; (identifier) @type) ;; causes parsing error in tree-sitter
(type_constraint
(identifier) @type)
@@ -198,7 +198,7 @@
(binary_expression (identifier) @variable (identifier) @variable)
(binary_expression (identifier)* @variable)
(conditional_expression (identifier) @variable)
- (prefix_unary_expression (identifier)* @variable)
+ ;; (prefix_unary_expression (identifier)* @variable) ;; crashes tree-sitter
c-code with SIGABRT
(postfix_unary_expression (identifier)* @variable)
(assignment_expression (identifier) @variable)
(cast_expression (identifier) @type)
@@ -233,12 +233,12 @@
(lock_statement (identifier) @variable)
;; Other
- (argument_list
- (identifier) @variable)
+ ;; (argument_list
+ ;; (identifier) @variable) ;; causes parsing error in tree-sitter
(label_name) @variable
(qualified_name (identifier) @type)
(using_directive (identifier)* @type)
- (await_expression (identifier)* @function)
+ ;; (await_expression (identifier)* @function) ;; crashes tree-sitter c-code
with sigabrt!
(invocation_expression (identifier) @function)
(element_access_expression (identifier) @variable)
(conditional_access_expression (identifier) @variable)
@@ -254,7 +254,7 @@
;; Interpolation
;; (interpolated_string_expression) @string
]
- "Default patterns for tree-sitter support.")
+ )
;;; Tree-sitter indentation
- [elpa] externals/csharp-mode 4947497 412/459: Update readme to reflect tree-sitter in master, (continued)
- [elpa] externals/csharp-mode 4947497 412/459: Update readme to reflect tree-sitter in master, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 064f481 418/459: Fix autoload for tree-sitter support (#211), ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 1de6556 422/459: Add base_list, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 1d02a54 424/459: Records and init-only fields, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 7d4af0d 425/459: Add with_expression, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 98a179a 427/459: Add dependencies to csharp-mode, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 6b232b1 429/459: Much better support for strings, interpolated in particular, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode c928423 435/459: Add generic property name, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode d272272 436/459: Add let keyword, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 43e5919 438/459: Prevent c-default-style error when set to string (#202), ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 6566964 440/459: Merge pull request #231 from emacs-csharp/bugfix/tree-sitter-crashes,
ELPA Syncer <=
- [elpa] externals/csharp-mode 1c2b9cb 442/459: Add more nodes to beginning/end-of-defun, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode d942b27 441/459: Add tree-sitter based utility methods. (#232), ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode f977800 443/459: Add indentation settings for lambda functions (#229), ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 40c183e 452/459: Adjust wording in readme, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 2641599 454/459: Fix spectacular mis-edit of readme, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 26f1f8c 457/459: Add switch_expression, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 69fe52b 453/459: Version bump, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 0edf059 445/459: Fix ci (#234), ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode dd30649 459/459: Bump version, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 299d3f1 450/459: Don't require tree-sitter, ELPA Syncer, 2021/08/22