Update syntax/propane.vim for propane 4.5.0

README.md

@@ -3,7 +3,7 @@
 - Install packages:
 
 ```
-sudo pacman -S fd fzf neovim neovim-qt xclip xxhash wl-clipboard
+sudo pacman -S fd fzf neovim neovim-qt xclip xxhash
 ```
 
 - `mkdir ~/.config/nvim`

plugin/holtrop.lua

@@ -12,12 +12,6 @@ require('fzf-lua').setup({
       vertical = 'down:50%',
     },
   },
-  keymap = {
-    fzf = {
-      ["tab"] = "down",
-      ["shift-tab"] = "up",
-    },
-  },
 })
 
 -- Show titlestring in GUI window title
@@ -108,14 +102,3 @@ vim.api.nvim_create_autocmd({ "FocusGained", "BufEnter" }, {
 })
 
 vim.filetype.add({filename = {["Rsconscript"] = "ruby"}})
-
--- Treat *.rs.erb files as eruby with an embedded Rust subtype
-vim.filetype.add({
-  pattern = {
-    [".*%.rs%.erb"] = function(_, bufnr)
-      return "eruby", function()
-        vim.b[bufnr].eruby_subtype = "rust"
-      end
-    end,
-  },
-})

syntax/propane.vim

@@ -20,32 +20,18 @@ exe "syn include @propaneTarget syntax/".b:propane_subtype.".vim"
 syn region propaneTarget matchgroup=propaneDelimiter start="<<" end=">>$" contains=@propaneTarget keepend
 
 syn match propaneComment "#.*"
+syn match propaneOperator "->"
 syn match propaneFieldAlias ":[a-zA-Z0-9_]\+" contains=propaneFieldOperator
 syn match propaneFieldOperator ":" contained
 syn match propaneOperator "?"
-" The right-hand side of a rule (after '->' up to '<<' or ';') lists symbol
-" names that may coincide with propane keywords (e.g. 'start', 'token',
-" 'tree'). Wrap it in a region that excludes keyword matches so those names
-" are not highlighted as keywords. The '<<' is left unconsumed so the
-" propaneTarget region can still match it.
-syn region propaneRuleRhs matchgroup=propaneOperator start="->" end="\ze<<" end=";" contains=propaneFieldAlias,propaneRuleOperator,propaneComment keepend
-syn match propaneRuleOperator "?" contained
-" Keywords that introduce a user-defined name. The name is consumed by
-" propaneName via nextgroup so a name matching a keyword (e.g. 'token start')
-" is not highlighted as a keyword. These must be a match (not syn keyword)
-" because a syn keyword always wins over a contained nextgroup match.
-syn match propaneNameDecl "\<\%(tokenid\|token\|lex_fn\|module\|start\|tree_prefix\|tree_suffix\)\>" nextgroup=propaneName skipwhite
-syn match propaneName "\<\h\w*\>" contained
-syn match propaneKeyword "\<\%(context_user_fields\|drop\|free_token_node\|noline\|on_token_node\|prefix\|ptype\|token_user_fields\|tree\)\>"
+syn keyword propaneKeyword context_user_fields drop free_token_node lex_fn module noline on_token_node prefix ptype start token token_user_fields tokenid tree tree_prefix tree_suffix
 
 syn region propaneRegex start="/" end="/" skip="\v\\\\|\\/"
 
 hi def link propaneComment Comment
 hi def link propaneKeyword Keyword
-hi def link propaneNameDecl Keyword
 hi def link propaneRegex String
 hi def link propaneOperator Operator
-hi def link propaneRuleOperator Operator
 hi def link propaneFieldOperator Operator
 hi def link propaneDelimiter Delimiter
 hi def link propaneFieldAlias Identifier