Merge branch 'master' into master

Author: kristijanhusak

DOCS.md

@@ -1044,6 +1044,7 @@ For adding/changing TODO keyword colors see [org-todo-keyword-faces](#org_todo_k
   * `OrgTSTag`: A tag for a headline item, shown on the righthand side like `:foo:`
   * `OrgTSPlan`: `SCHEDULED`, `DEADLINE`, `CLOSED`, etc. keywords
   * `OrgTSComment`: A comment block
+  * `OrgTSLatex`: LaTeX block
   * `OrgTSDirective`: Blocks starting with `#+`
   * `OrgTSCheckbox`: The default checkbox highlight, overridden if any of the below groups are specified
   * `OrgTSCheckboxChecked`: A checkbox checked with either `[x]` or `[X]`

doc/orgmode.txt

@@ -1387,6 +1387,7 @@ HIGHLIGHT GROUPS                                        *orgmode-highlight_group
 `OrgTSTag`: A tag for a headline item, shown on the righthand side like `:foo:`
 `OrgTSPlan`: `SCHEDULED`, `DEADLINE`, `CLOSED`, etc. keywords
 `OrgTSComment`: A comment block
+`OrgTSLatex`: LaTeX block
 `OrgTSDirective`: Blocks starting with `#+`
 `OrgTSCheckbox`: The default checkbox highlight, overridden if any of the below groups are specified
 `OrgTSCheckboxChecked`: A checkbox checked with either `[x]` or `[X]`

lua/orgmode/colors/highlights.lua

@@ -30,6 +30,7 @@ function M.link_ts_highlights()
     OrgTSComment = 'Comment',
     OrgTSDirective = 'Comment',
     OrgTSBlock = 'Comment',
+    OrgTSLatex = 'Statement',
   }
 
   for src, def in pairs(links) do

lua/orgmode/init.lua

@@ -1,5 +1,5 @@
 _G.orgmode = _G.orgmode or {}
-local ts_revision = 'aeacac619457a187bb202b9dfc58541232ed4a25'
+local ts_revision = 'f78edf1ab65c854ef25356c2a96222e87d15c5c5'
 local setup_ts_grammar_used = false
 local instance = nil
 

lua/orgmode/org/autocompletion/omni.lua

@@ -3,7 +3,7 @@ local config = require('orgmode.config')
 local Hyperlinks = require('orgmode.org.hyperlinks')
 
 local data = {
-  directives = { '#+title', '#+author', '#+email', '#+name', '#+filetags', '#+archive', '#+options' },
+  directives = { '#+title', '#+author', '#+email', '#+name', '#+filetags', '#+archive', '#+options', '#+category' },
   begin_blocks = { '#+begin_src', '#+end_src', '#+begin_example', '#+end_example' },
   properties = { ':PROPERTIES:', ':END:', ':LOGBOOK:', ':STYLE:', ':REPEAT_TO_STATE:', ':CUSTOM_ID:', ':CATEGORY:' },
   metadata = { 'DEADLINE:', 'SCHEDULED:', 'CLOSED:' },

lua/orgmode/parser/file.lua

@@ -397,6 +397,9 @@ function File:_parse_directives()
     if directive_name == 'archive' then
       self.archive_location = config:parse_archive_location(self.filename, directive.value.text)
     end
+    if directive_name == 'category' then
+      self.category = directive.value.text
+    end
   end
   self.tags = tags
 end

queries/org/highlights.scm

@@ -15,10 +15,11 @@
 (block "#+begin_" @OrgTSBlock "#+end_" @OrgTSBlock "str" @OrgTSBlock)
 (block name: (expr) @OrgTSBlock)
 (block parameter: (expr) @OrgTSBlock)
- (property_drawer) @OrgTSPropertyDrawer
- (drawer) @OrgTSDrawer
- (tag) @OrgTSTag
- (plan) @OrgTSPlan
- (comment) @OrgTSComment
- (directive) @OrgTSDirective
+(property_drawer) @OrgTSPropertyDrawer
+(latex_env) @OrgTSLatex
+(drawer) @OrgTSDrawer
+(tag) @OrgTSTag
+(plan) @OrgTSPlan
+(comment) @OrgTSComment
+(directive) @OrgTSDirective
 (ERROR) @LspDiagnosticsUnderlineError

tests/plenary/org/autocompletion_spec.lua

@@ -138,6 +138,7 @@ describe('Autocompletion', function()
       { menu = '[Org]', word = '#+filetags' },
       { menu = '[Org]', word = '#+archive' },
       { menu = '[Org]', word = '#+options' },
+      { menu = '[Org]', word = '#+category' },
       { menu = '[Org]', word = '#+begin_src' },
       { menu = '[Org]', word = '#+end_src' },
       { menu = '[Org]', word = '#+begin_example' },