feature: Use tree-sitter @spell directive for spell check

Author: kristijanhusak

lua/orgmode/colors/todo_highlighter.lua

@@ -44,10 +44,13 @@ local function add_todo_keyword_highlights()
             end, todo_keywords.DONE),
             ' '
           )
-          table.insert(lines, string.format([[(item . (expr) @OrgTODO (#any-of? @OrgTODO %s))]], todo_type))
-          table.insert(lines, string.format([[(item . (expr) @OrgDONE (#any-of? @OrgDONE %s))]], done_type))
+          table.insert(lines, string.format([[(item . (expr) @OrgTODO @nospell (#any-of? @OrgTODO %s))]], todo_type))
+          table.insert(lines, string.format([[(item . (expr) @OrgDONE @nospell (#any-of? @OrgDONE %s))]], done_type))
           for face_name, face_hl in pairs(faces) do
-            table.insert(lines, string.format([[(item . (expr) @%s (#eq? @%s %s))]], face_hl, face_hl, face_name))
+            table.insert(
+              lines,
+              string.format([[(item . (expr) @%s @nospell (#eq? @%s %s))]], face_hl, face_hl, face_name)
+            )
           end
           for _, v in ipairs(lines) do
             table.insert(all_lines, v)

queries/org/highlights.scm

@@ -8,6 +8,9 @@
 (headline (stars) @stars (#eq? @stars "******")) @OrgTSHeadlineLevel6
 (headline (stars) @stars (#eq? @stars "*******")) @OrgTSHeadlineLevel7
 (headline (stars) @stars (#eq? @stars "********")) @OrgTSHeadlineLevel8
+(headline (item) @spell)
+(list (listitem (paragraph) @spell))
+(body (paragraph) @spell)
 (bullet) @OrgTSBullet
 (checkbox) @OrgTSCheckbox
 (checkbox status: (expr "-") @OrgTSCheckboxHalfChecked)
@@ -24,6 +27,6 @@
 (drawer) @OrgTSDrawer
 (tag_list) @OrgTSTag
 (plan) @OrgTSPlan
-(comment) @OrgTSComment
+(comment) @OrgTSComment @spell
 (directive) @OrgTSDirective
 (ERROR) @LspDiagnosticsUnderlineError

syntax/org.vim

@@ -5,9 +5,9 @@ if exists('b:current_syntax')
 endif
 
 lua require('orgmode.colors.highlights').define_highlights()
-lua require('orgmode.org.syntax').add_todo_keywords_to_spellgood()
 let s:ts_highlight = luaeval('require("orgmode.config"):ts_highlights_enabled()')
 if !s:ts_highlight
+  lua require('orgmode.org.syntax').add_todo_keywords_to_spellgood()
   runtime syntax/org_legacy.vim
 endif
 
@@ -48,8 +48,6 @@ syn match org_timestamp_inactive /\(\[%%(diary-float.\+\]\)/
 hi def link org_timestamp PreProc
 hi def link org_timestamp_inactive Comment
 
-syntax spell toplevel
-
 lua require("orgmode.org.syntax").load_code_blocks()
 
 let s:highlight_latex = luaeval('require("orgmode.config").org_highlight_latex_and_related')

syntax/org_legacy.vim

@@ -119,4 +119,6 @@ hi def link org_subtask_percent String
 hi def link org_subtask_percent_100 Identifier
 hi def link org_subtask_number_all Identifier
 
+syntax spell toplevel
+
 " vi: ft=vim:tw=80:sw=4:ts=4:fdm=marker