aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPo Lu2023-02-12 20:32:31 +0800
committerPo Lu2023-02-12 20:32:31 +0800
commit19eb27d47787bd8a519a37a8e6080ed5b56435dc (patch)
tree61669a450983bdaa356698b6f26958bebfa191ad /admin
parent0198b8cffd82893412c738dae8e50c45a99286f1 (diff)
parent9510e8ad68271f58b4813478703a4b8eb1ba597b (diff)
downloademacs-19eb27d47787bd8a519a37a8e6080ed5b56435dc.tar.gz
emacs-19eb27d47787bd8a519a37a8e6080ed5b56435dc.zip
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'admin')
-rw-r--r--admin/notes/tree-sitter/html-manual/Multiple-Languages.html6
-rw-r--r--admin/notes/tree-sitter/starter-guide4
2 files changed, 5 insertions, 5 deletions
diff --git a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
index 65507687d51..390d9082590 100644
--- a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
+++ b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
@@ -223,9 +223,9 @@ ranges for <acronym>CSS</acronym> and JavaScript parsers:
223</p> 223</p>
224<div class="example"> 224<div class="example">
225<pre class="example">;; Create parsers. 225<pre class="example">;; Create parsers.
226(setq html (treesit-get-parser-create 'html)) 226(setq html (treesit-parser-create 'html))
227(setq css (treesit-get-parser-create 'css)) 227(setq css (treesit-parser-create 'css))
228(setq js (treesit-get-parser-create 'javascript)) 228(setq js (treesit-parser-create 'javascript))
229</pre><pre class="example"> 229</pre><pre class="example">
230 230
231</pre><pre class="example">;; Set CSS ranges. 231</pre><pre class="example">;; Set CSS ranges.
diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
index 606f7891dfa..b8910aab5ca 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -45,7 +45,7 @@ You can use this script that I put together here:
45You can also find them under this directory in /build-modules. 45You can also find them under this directory in /build-modules.
46 46
47This script automatically pulls and builds language definitions for C, 47This script automatically pulls and builds language definitions for C,
48C++, Rust, JSON, Go, HTML, Javascript, CSS, Python, Typescript, 48C++, Rust, JSON, Go, HTML, JavaScript, CSS, Python, Typescript,
49and C#. Better yet, I pre-built these language definitions for 49and C#. Better yet, I pre-built these language definitions for
50GNU/Linux and macOS, they can be downloaded here: 50GNU/Linux and macOS, they can be downloaded here:
51 51
@@ -271,7 +271,7 @@ Matchers and anchors are functions that takes (NODE PARENT BOL &rest
271_). Matches return nil/non-nil for no match/match, and anchors return 271_). Matches return nil/non-nil for no match/match, and anchors return
272the anchor point. Below are some convenient builtin matchers and anchors. 272the anchor point. Below are some convenient builtin matchers and anchors.
273 273
274For MATHCER we have 274For MATCHER we have
275 275
276 (parent-is TYPE) => matches if PARENT’s type matches TYPE as regexp 276 (parent-is TYPE) => matches if PARENT’s type matches TYPE as regexp
277 (node-is TYPE) => matches NODE’s type 277 (node-is TYPE) => matches NODE’s type