[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/treesit-fold 704a0463ed 357/417: fixed merge conflict
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/treesit-fold 704a0463ed 357/417: fixed merge conflict |
Date: |
Mon, 1 Jul 2024 10:03:04 -0400 (EDT) |
branch: elpa/treesit-fold
commit 704a0463edd1ebd2e5f3323c86c762d4196b4426
Author: Nidish Narayanaa Balaji <nidbid@gmail.com>
Commit: Jen-Chieh Shen <jcs090218@gmail.com>
fixed merge conflict
---
ts-fold.el | 49 -------------------------------------------------
1 file changed, 49 deletions(-)
diff --git a/ts-fold.el b/ts-fold.el
index aaefa18230..6b28518547 100644
--- a/ts-fold.el
+++ b/ts-fold.el
@@ -1178,55 +1178,6 @@ more information."
(ts-fold--cons-add (cons beg end) offset))
)
-(defun ts-fold-range-matlab-function (node offset)
- "Define fold range for MATLAB function definitions.
-
-For arguments NODE and OFFSET, see function `ts-fold-range-seq' for
-more information."
- (when-let* ((named-node (or (tsc-get-child-by-field node :superclass)
- (tsc-get-child-by-field node :properties)
- (tsc-get-child-by-field node :methods)
- (tsc-get-child-by-field node :function_arguments)
- (tsc-get-child-by-field node :function_output)
- (tsc-get-child-by-field node :name)))
- (beg (tsc-node-end-position (tsc-get-next-sibling named-node)))
- (end (tsc-node-end-position node)))
- (ts-fold--cons-add (cons beg end) offset)))
-
-(defun ts-fold-range-matlab-statements (node offset)
- "Define fold range for MATLAB statements.
-
-For arguments NODE and OFFSET, see function `ts-fold-range-line-comment' for
-more information."
- (when-let* ((named-node (car (ts-fold-find-children node "\n")))
- (beg (tsc-node-start-position named-node))
- (ins (append
- (ts-fold-find-children node "catch_clause")
- (ts-fold-find-children node "case_clause")
- (ts-fold-find-children node "otherwise_clause")
- (ts-fold-find-children node "elseif_clause")
- (ts-fold-find-children node "else_clause")
- (ts-fold-find-children node "end"))) ;; can include parts
maybe
- (end (tsc-node-start-position (car (ts-fold-find-children node
"end")))))
- (ts-fold--cons-add (cons beg end) offset)))
-
-(defun ts-fold-range-matlab-blocks (node offset)
- "Define fold range for MATLAB blocks.
-
-Each block is delimited by a line starting with '%%'.
-For arguments NODE and OFFSET, see function `ts-fold-range-line-comment' for
-more information."
- (when (string-prefix-p "%%" (ts-node-text node))
- (let* ((beg (ts-node-end-position node))
- (end (or (save-excursion
- (progn (goto-char beg)
- (when (re-search-forward "^\s*\^L%%" nil t)
- (forward-line -1) (end-of-line)
- (point))))
- (ts-node-end-position (ts-get-parent node)))))
- (message (format "%d %d" beg end))
- (ts-fold--cons-add (cons beg end) offset))))
-
(defun ts-fold-range-rst-body (node offset)
"Define fold range for `body' in reStructuredText.
- [nongnu] elpa/treesit-fold 7c8e1a5467 406/417: fix: In case the AST doesn't get refreshed, (continued)
- [nongnu] elpa/treesit-fold 7c8e1a5467 406/417: fix: In case the AST doesn't get refreshed, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold e2d4cb9fac 411/417: docs: Add Gleam to supported list, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold af3a57b656 413/417: docs: Changelog bump, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold 75d6f9ed31 253/417: Add extra folding definitions for golang (#42), ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold d2f88cbf1b 123/417: Add parser, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold 1b54cdc9fc 139/417: Update doc, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold 3d1be710a6 200/417: Update README.md, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold 1bc43aa561 254/417: updated line-reminder compatibility in README (#50), ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold 27c6bc4819 265/417: feature(parser): Add support for python docstring (#58), ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold 663dcac0a9 301/417: chore(deps): bump actions/checkout from 3 to 4 (#84), ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold 704a0463ed 357/417: fixed merge conflict,
ELPA Syncer <=
- [nongnu] elpa/treesit-fold 46fdb65c77 395/417: feat: Add hook after indicator refresh, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold a39f3bbe48 117/417: WIP for C preprocessor, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold af2679860f 129/417: Def prog, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold e334470a17 203/417: update, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold 7667a37644 268/417: fix(indicators): Warning 'when' with empty body, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold b19f6f54bf 371/417: feat: Add Haxe support, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold de6d9ae174 255/417: docs(README.md): Improve instruction for line-reminder, ELPA Syncer, 2024/07/01
- [nongnu] elpa/treesit-fold a70c9ab017 327/417: feat: Add Groovy support (#98), ELPA Syncer, 2024/07/01