aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax
diff options
context:
space:
mode:
authorSean Dewar <seandewar@users.noreply.github.com>2023-06-11 12:40:22 +0100
committerGitHub <noreply@github.com>2023-06-11 12:40:22 +0100
commit473a216a21fdc086ef71e0ca7d40c2fdf5346245 (patch)
treeaa16b9a349099dd0f4133313dae3f45d5cfad296 /runtime/syntax
parent643546b82b4bc0c29ca869f81af868a019723d83 (diff)
downloadrneovim-473a216a21fdc086ef71e0ca7d40c2fdf5346245.tar.gz
rneovim-473a216a21fdc086ef71e0ca7d40c2fdf5346245.tar.bz2
rneovim-473a216a21fdc086ef71e0ca7d40c2fdf5346245.zip
vim-patch:10e8ff9b2607 (#23977)
Update runtime files https://github.com/vim/vim/commit/10e8ff9b26078994cae57c2422b145d37aaf714e Also: - fix a missing `<` in builtin.txt. - edit `:function` `{name}` wording to match the change made for the docs above by Justin in #10619. - link to `*vimrc*` rather than `*init.vim*` in repeat.txt change (as `init.lua` may also be used). Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/meson.vim8
-rw-r--r--runtime/syntax/structurizr.vim5
-rw-r--r--runtime/syntax/swayconfig.vim18
-rw-r--r--runtime/syntax/urlshortcut.vim14
-rw-r--r--runtime/syntax/xpm.vim8
5 files changed, 42 insertions, 11 deletions
diff --git a/runtime/syntax/meson.vim b/runtime/syntax/meson.vim
index 0af0d776f8..4eaf696322 100644
--- a/runtime/syntax/meson.vim
+++ b/runtime/syntax/meson.vim
@@ -3,7 +3,7 @@
" License: VIM License
" Maintainer: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
" Liam Beguin <liambeguin@gmail.com>
-" Last Change: 2021 Aug 16
+" Last Change: 2023 May 27
" Credits: Zvezdan Petkovic <zpetkovic@acm.org>
" Neil Schemenauer <nas@meson.ca>
" Dmitry Vasiliev
@@ -68,6 +68,7 @@ syn keyword mesonBuiltin
\ add_global_link_arguments
\ add_languages
\ add_project_arguments
+ \ add_project_dependencies
\ add_project_link_arguments
\ add_test_setup
\ alias_target
@@ -99,6 +100,7 @@ syn keyword mesonBuiltin
\ install_headers
\ install_man
\ install_subdir
+ \ install_symlink
\ install_emptydir
\ is_disabler
\ is_variable
@@ -115,6 +117,7 @@ syn keyword mesonBuiltin
\ shared_library
\ shared_module
\ static_library
+ \ structured_sources
\ subdir
\ subdir_done
\ subproject
@@ -125,6 +128,7 @@ syn keyword mesonBuiltin
\ vcs_tag
\ warning
\ range
+ \ debug
if exists("meson_space_error_highlight")
" trailing whitespace
@@ -146,7 +150,7 @@ hi def link mesonEscape Special
hi def link mesonNumber Number
hi def link mesonBuiltin Function
hi def link mesonBoolean Boolean
-if exists("meson_space_error_higlight")
+if exists("meson_space_error_highlight")
hi def link mesonSpaceError Error
endif
diff --git a/runtime/syntax/structurizr.vim b/runtime/syntax/structurizr.vim
index ab9e4ee609..363ee70438 100644
--- a/runtime/syntax/structurizr.vim
+++ b/runtime/syntax/structurizr.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Structurizr DSL
" Maintainer: Bastian Venthur <venthur@debian.org>
-" Last Change: 2022-02-15
+" Last Change: 2022-05-22
" Remark: For a language reference, see
" https://github.com/structurizr/dsl
@@ -26,6 +26,7 @@ syn keyword skeyword configuration
syn keyword skeyword container
syn keyword skeyword containerinstance
syn keyword skeyword custom
+syn keyword skeyword default
syn keyword skeyword deployment
syn keyword skeyword deploymentenvironment
syn keyword skeyword deploymentgroup
@@ -40,6 +41,7 @@ syn keyword skeyword group
syn keyword skeyword healthcheck
syn keyword skeyword include
syn keyword skeyword infrastructurenode
+syn keyword skeyword instances
syn keyword skeyword model
syn keyword skeyword person
syn keyword skeyword perspectives
@@ -54,6 +56,7 @@ syn keyword skeyword tags
syn keyword skeyword technology
syn keyword skeyword terminology
syn keyword skeyword theme
+syn keyword skeyword themes
syn keyword skeyword title
syn keyword skeyword url
syn keyword skeyword users
diff --git a/runtime/syntax/swayconfig.vim b/runtime/syntax/swayconfig.vim
index 996b8f596c..6b36210252 100644
--- a/runtime/syntax/swayconfig.vim
+++ b/runtime/syntax/swayconfig.vim
@@ -2,9 +2,9 @@
" Language: sway window manager config
" Original Author: James Eapen <james.eapen@vai.org>
" Maintainer: James Eapen <james.eapen@vai.org>
-" Version: 0.1.6
-" Reference version (jamespeapen/swayconfig.vim): 0.11.6
-" Last Change: 2022 Aug 08
+" Version: 0.2.1
+" Reference version (jamespeapen/swayconfig.vim): 0.12.1
+" Last Change: 2023 Mar 20
" References:
" http://i3wm.org/docs/userguide.html#configuring
@@ -58,6 +58,10 @@ syn match swayConfigClientColor /^\s*client.\w\+\s\+.*$/ contains=i3ConfigClient
syn keyword swayConfigInputKeyword input contained
syn match swayConfigInput /^\s*input\s\+.*$/ contains=swayConfigInputKeyword
+" Seat config
+syn keyword swayConfigSeatKeyword seat contained
+syn match swayConfigSeat /^\s*seat\s\+.*$/ contains=swayConfigSeatKeyword
+
" set display outputs
syn match swayConfigOutput /^\s*output\s\+.*$/ contains=i3ConfigOutput
@@ -66,6 +70,10 @@ syn keyword swayConfigFocusKeyword focus contained
syn keyword swayConfigFocusType output contained
syn match swayConfigFocus /^\s*focus\soutput\s.*$/ contains=swayConfigFocusKeyword,swayConfigFocusType
+" mouse warping
+syn keyword swayConfigMouseWarpingType container contained
+syn match swayConfigMouseWarping /^\s*mouse_warping\s\+\(output\|container\|none\)\s\?$/ contains=i3ConfigMouseWarpingKeyword,i3ConfigMouseWarpingType,swayConfigMouseWarpingType
+
" focus follows mouse
syn clear i3ConfigFocusFollowsMouseType
syn clear i3ConfigFocusFollowsMouse
@@ -80,7 +88,7 @@ syn match swayConfigXwaylandModifier /^\s*xwayland\s\+\(enable\|disable\|force\)
" Group mode/bar
syn clear i3ConfigBlock
-syn region swayConfigBlock start=+.*s\?{$+ end=+^}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigInitializeKeyword,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable,swayConfigInputKeyword,i3ConfigOutput transparent keepend extend
+syn region swayConfigBlock start=+.*s\?{$+ end=+^}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigInitializeKeyword,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable,swayConfigInputKeyword,swayConfigSeatKeyword,i3ConfigOutput transparent keepend extend
"hi def link swayConfigError Error
hi def link i3ConfigFloating Error
@@ -89,6 +97,8 @@ hi def link swayConfigFloatingMouseAction Type
hi def link swayConfigFocusKeyword Type
hi def link swayConfigSmartBorderKeyword Type
hi def link swayConfigInputKeyword Type
+hi def link swayConfigSeatKeyword Type
+hi def link swayConfigMouseWarpingType Type
hi def link swayConfigFocusFollowsMouseType Type
hi def link swayConfigBindGestureCommand Identifier
hi def link swayConfigBindGestureDirection Constant
diff --git a/runtime/syntax/urlshortcut.vim b/runtime/syntax/urlshortcut.vim
new file mode 100644
index 0000000000..f6cc3835a2
--- /dev/null
+++ b/runtime/syntax/urlshortcut.vim
@@ -0,0 +1,14 @@
+" Vim syntax file
+" Language: MS Windows URL shortcut file
+" Maintainer: ObserverOfTime <chronobserver@disroot.org>
+" LastChange: 2023-06-04
+
+" Quit when a syntax file was already loaded.
+if exists("b:current_syntax")
+ finish
+endif
+
+" Just use the dosini syntax for now
+runtime! syntax/dosini.vim
+
+let b:current_syntax = "urlshortcut"
diff --git a/runtime/syntax/xpm.vim b/runtime/syntax/xpm.vim
index 77d82403e9..b094092b73 100644
--- a/runtime/syntax/xpm.vim
+++ b/runtime/syntax/xpm.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: X Pixmap
" Maintainer: Ronald Schild <rs@scutum.de>
-" Last Change: 2023 May 11
+" Last Change: 2023 May 24
" Version: 5.4n.2
" Jemma Nelson added termguicolors support
" Dominique Pellé fixed spelling support
@@ -42,7 +42,7 @@ function s:CreateSyntax() abort
let values = split(s[1 : -2])
" Values string invalid, bail out
- if len(values) != 4
+ if len(values) != 4 && len(values) != 6 && len(values) != 7
return
endif
@@ -100,8 +100,8 @@ function s:CreateSyntax() abort
endif
" escape meta characters in patterns
- let s = escape(s, '/\*^$.~[] ')
- let chars = escape(chars, '/\*^$.~[] ')
+ let s = escape(s, '/\*^$.~[]')
+ let chars = escape(chars, '/\*^$.~[]')
" now create syntax items
" highlight the color string as normal string (no pixel string)