emacs, branch feature/tree-sitter Emacs is the extensible, customizable, self-documenting real-time display editor. Separate tree-sitter and non-tree-sitter variant of sh-mode 2022-11-22T08:56:28+00:00 Yuan Fu 2022-11-22T08:49:04+00:00 6fde1fcd0fb5111f3262e5ff829b19ec9f136d90 Now there are three modes, sh-base-mode, sh-mode, bash-ts-mode. The change I made: change sh-mode to sh-base-mode, remove docstring. Below the new sh-base-mode, create a new definition for sh-mode, paste the dostring, add setup for font-lock-defaults. Below sh-mode, add bash-ts-mode. * lisp/progmodes/sh-script.el (sh-mode): Moves all setup into sh-base-mode, except for the setup for font-lock-defaults and the docstring. (sh-base-mode): New mode. (bash-ts-mode): New mode. 
Now there are three modes, sh-base-mode, sh-mode, bash-ts-mode.

The change I made: change sh-mode to sh-base-mode, remove docstring.
Below the new sh-base-mode, create a new definition for sh-mode, paste
the dostring, add setup for font-lock-defaults.  Below sh-mode, add
bash-ts-mode.

* lisp/progmodes/sh-script.el (sh-mode): Moves all setup into
sh-base-mode, except for the setup for font-lock-defaults and the
docstring.
(sh-base-mode): New mode.
(bash-ts-mode): New mode.
Tweak faces in Java and TypeScript 2022-11-22T07:36:01+00:00 Theodor Thornhill 2022-11-21T12:12:03+00:00 7144e38da828c885b6d11c96bbccbd72f527c162 * lisp/progmodes/java-ts-mode.el (java-ts-mode--operators): Remove @ as an operator. (java-ts-mode--font-lock-settings): Use constant-face for @ to match rest of the annotation. Add bracket, delimiter and use some of the new faces. (java-ts-mode--imenu): Clean up the implementation a little. (java-ts-mode): Refer to the new features. * lisp/progmodes/ts-mode.el (ts-mode--font-lock-settings, ts-mode): Add in bracket and delimiter'. 
* lisp/progmodes/java-ts-mode.el (java-ts-mode--operators): Remove @
as an operator.

(java-ts-mode--font-lock-settings): Use constant-face for @ to match
rest of the annotation.  Add bracket, delimiter and use some of the
new faces.

(java-ts-mode--imenu): Clean up the implementation a little.

(java-ts-mode): Refer to the new features.

* lisp/progmodes/ts-mode.el (ts-mode--font-lock-settings, ts-mode):
Add in bracket and delimiter'.
treesit-font-lock-recompute-features now has two modes of operation 2022-11-22T07:06:43+00:00 Yuan Fu 2022-11-22T07:06:43+00:00 80839498614a3d898daabc2725fb814ce1e3ace0 1. Set activation of each feature (changes every feature) 2. Add/remove features (only change those explicitly configured by ADD-LIST and REMOVE-LIST) This is useful for enabling/disabling certain features for all modes (without resetting others) by calling this function in prog-mode-hook * lisp/treesit.el (treesit-font-lock-recompute-features): See above description. 
1. Set activation of each feature (changes every feature)
2. Add/remove features (only change those explicitly configured by
ADD-LIST and REMOVE-LIST)

This is useful for enabling/disabling certain features for all
modes (without resetting others) by calling this function in
prog-mode-hook

* lisp/treesit.el (treesit-font-lock-recompute-features): See above
description.
Tweak c-ts-mode fontification 2022-11-22T06:37:36+00:00 Yuan Fu 2022-11-22T06:37:36+00:00 ae91d5cd53111216788473e81b378c556ba496a2 New features: function and variable, which consistently fontify all occurrences of functions and variables, respectively. Remove expression feature, as its purpose is fulfilled by function, variable, and property combined. Fix declaration feature, remove unnecessary rule from label feature. * lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): See above description. (c-ts-mode--fontify-variable): New function. (c-ts-mode--base-mode): Add & remove features. 
New features: function and variable, which consistently fontify all
occurrences of functions and variables, respectively.

Remove expression feature, as its purpose is fulfilled by function,
variable, and property combined.

Fix declaration feature, remove unnecessary rule from label
feature.

* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): See
above description.
(c-ts-mode--fontify-variable): New function.
(c-ts-mode--base-mode): Add & remove features.
; Fix docstrings in treesit.el 2022-11-22T06:33:10+00:00 Yuan Fu 2022-11-22T06:33:10+00:00 40764ac7f852ff72b62801ca07e2d88c29f0aa61 * lisp/treesit.el (treesit--explorer--nodes-to-highlight) (treesit--explorer-draw-node): Fix docstrings. 
* lisp/treesit.el (treesit--explorer--nodes-to-highlight)
(treesit--explorer-draw-node): Fix docstrings.
* lisp/treesit.el (treesit-max-buffer-size): Enlarge value. 2022-11-22T06:32:51+00:00 Yuan Fu 2022-11-22T06:32:51+00:00 ca87a0133d893fd8cde00a9738d4c3b4dafe155f 






; * lisp/progmodes/js.el (js-ts-mode): Add autoload cookie.
2022-11-21T21:46:52+00:00

Yuan Fu

2022-11-21T21:46:52+00:00

aeadba1418d8fc18f17b4ae415cde35e9e272e7a












; * test/src/treesit-tests.el (treesit-misc): Remove test.
2022-11-21T21:34:38+00:00

Yuan Fu

2022-11-21T21:34:38+00:00

3f37f6b43565242db4409022dd9bc980cb86c3f6

This test is for treesit--setting-for-mode, which is removed when we
switched from using treesit-settings to using separate major modes.





This test is for treesit--setting-for-mode, which is removed when we
switched from using treesit-settings to using separate major modes.







; Update tree-sitter starter guide
2022-11-21T21:33:03+00:00

Yuan Fu

2022-11-21T21:33:03+00:00

eb1a35adc1c5a1a9d14ec8594580c5eb0e3d28fe

* admin/notes/tree-sitter/starter-guide: Reflect recent changes.
* admin/notes/tree-sitter/html-manual/Using-Parser.html:
* admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html:
* admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html:
* admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html:
* admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html:
* admin/notes/tree-sitter/html-manual/Multiple-Languages.html:
* admin/notes/tree-sitter/html-manual/Language-Definitions.html: Update.





* admin/notes/tree-sitter/starter-guide: Reflect recent changes.
* admin/notes/tree-sitter/html-manual/Using-Parser.html:
* admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html:
* admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html:
* admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html:
* admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html:
* admin/notes/tree-sitter/html-manual/Multiple-Languages.html:
* admin/notes/tree-sitter/html-manual/Language-Definitions.html: Update.







; Fix typo in c-ts-mode--font-lock-settings
2022-11-21T21:17:16+00:00

Yuan Fu

2022-11-21T21:17:16+00:00

abf40a41aaa71354eee50bedc04fe2123dd3836f

* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Fix
typo.





* lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Fix
typo.