Mercurial > vim
changeset 33252:76d9597780ce
syntax(i3config): improved i3config highlighting (#13054)
Commit: https://github.com/vim/vim/commit/62145db91b104075277cb3a940e18832ad106264
Author: Josef Lito? <54900518+JosefLitos@users.noreply.github.com>
Date: Mon Sep 11 20:12:48 2023 +0200
syntax(i3config): improved i3config highlighting (https://github.com/vim/vim/issues/13054)
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 11 Sep 2023 20:15:07 +0200 |
| parents | fa862847b843 |
| children | 3bc84e3fd05c |
| files | runtime/syntax/i3config.vim |
| diffstat | 1 files changed, 192 insertions(+), 149 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/syntax/i3config.vim +++ b/runtime/syntax/i3config.vim @@ -2,8 +2,9 @@ " Language: i3 config file " Original Author: Mohamed Boughaba <mohamed dot bgb at gmail dot com> " Maintainer: Quentin Hibon (github user hiqua) -" Version: 0.4 -" Last Change: 2022 Jun 05 +" Version: 0.4.22 +" Reference version (JosefLitos/i3config.vim): 4.22 +" Last Change: 2023-09-09 " References: " http://i3wm.org/docs/userguide.html#configuring @@ -18,7 +19,7 @@ endif scriptencoding utf-8 " Error -syn match i3ConfigError /.*/ +syn match i3ConfigError /.\+/ " Todo syn keyword i3ConfigTodo TODO FIXME XXX contained @@ -27,238 +28,280 @@ syn keyword i3ConfigTodo TODO FIXME XXX " Comments are started with a # and can only be used at the beginning of a line syn match i3ConfigComment /^\s*#.*$/ contains=i3ConfigTodo +syn match i3ConfigOperator /[,;:]/ contained +syn match i3ConfigParen /[{}]/ contained + " Font " A FreeType font description is composed by: " a font family, a style, a weight, a variant, a stretch and a size. -syn match i3ConfigFontSeparator /,/ contained -syn match i3ConfigFontSeparator /:/ contained syn keyword i3ConfigFontKeyword font contained -syn match i3ConfigFontNamespace /\w\+:/ contained contains=i3ConfigFontSeparator -syn match i3ConfigFontContent /-\?\w\+\(-\+\|\s\+\|,\)/ contained contains=i3ConfigFontNamespace,i3ConfigFontSeparator,i3ConfigFontKeyword +syn match i3ConfigFontNamespace /\w\+:/ contained contains=i3ConfigOperator +syn match i3ConfigFontContent /-\?\w\+\(-\+\|\s\+\|,\)/ contained contains=i3ConfigFontNamespace,i3ConfigFontKeyword,i3ConfigOperator syn match i3ConfigFontSize /\s\=\d\+\(px\)\?\s\?$/ contained -syn match i3ConfigFont /^\s*font\s\+.*$/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace -syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?$/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace -syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?[^\\]\+$/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace -syn match i3ConfigFont /^\s*font\s\+\(\(.*\\\_.*\)\|\(.*[^\\]\+$\)\)/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace +syn match i3ConfigFont /^\s*font\s\+.*$/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace +syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?$/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace +syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?[^\\]\+$/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace +syn match i3ConfigFont /^\s*font\s\+\(\(.*\\\_.*\)\|\(.*[^\\]\+$\)\)/ contains=i3ConfigFontContent,i3ConfigFontSize,i3ConfigFontNamespace -" variables -syn match i3ConfigString /\(['"]\)\(.\{-}\)\1/ contained -syn match i3ConfigColor /#\w\{6}/ contained -syn match i3ConfigVariableModifier /+/ contained -syn match i3ConfigVariableAndModifier /+\w\+/ contained contains=i3ConfigVariableModifier -syn match i3ConfigVariable /\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?/ contains=i3ConfigVariableModifier,i3ConfigVariableAndModifier -syn keyword i3ConfigInitializeKeyword set contained -syn match i3ConfigInitialize /^\s*set\s\+.*$/ contains=i3ConfigVariable,i3ConfigInitializeKeyword,i3ConfigColor,i3ConfigString +" Common value types +syn keyword i3ConfigBoolean yes no enabled disabled on off true false contained +syn region i3ConfigString start=/"/ skip=/\\"/ end=/"/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable keepend extend +syn region i3ConfigString start=/'/ end=/'/ contained contains=i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigVariable keepend extend +syn match i3ConfigColor /#\w\{3,8}/ contained +syn match i3ConfigNumber /\([a-zA-Z0-9_$]\)\@<!\d\+\([a-zA-Z0-9_$]\)\@!/ contained -" Include +" Variables +syn match i3ConfigVariable /\$[A-Z0-9a-z_:|[\]-]\+/ +syn keyword i3ConfigSetKeyword set contained +syn match i3ConfigSet /^set \$.*$/ contains=i3ConfigVariable,i3ConfigSetKeyword,i3ConfigColor,i3ConfigString,i3ConfigNoStartupId,i3ConfigNumber,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper + +" Include other config files syn keyword i3ConfigIncludeKeyword include contained -syn match i3ConfigInclude /^\s*include\s\+.*$/ contains=i3ConfigIncludeKeyword,i3ConfigString,i3ConfigVariable +syn match i3ConfigCommandSubstitutionRegion /`[^`]*`/ contained contains=i3ConfigShDelim,i3ConfigShParam,i3ConfigShOper,i3ConfigShCommand +syn match i3ConfigIncludePath /[~./a-zA-Z0-9`][^~]*$/ contained contains=i3ConfigCommandSubstitutionRegion +syn match i3ConfigInclude /^include .[^~]*$/ contains=i3ConfigIncludeKeyword,i3ConfigString,i3ConfigVariable,i3ConfigIncludePath " Gaps syn keyword i3ConfigGapStyleKeyword inner outer horizontal vertical top right bottom left current all set plus minus toggle up down contained -syn match i3ConfigGapStyle /^\s*\(gaps\)\s\+\(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=i3ConfigGapStyleKeyword,i3ConfigNumber,i3ConfigVariable -syn keyword i3ConfigSmartGapKeyword on inverse_outer off contained -syn match i3ConfigSmartGap /^\s*smart_gaps\s\+\(on\|inverse_outer\|off\)\s\?$/ contains=i3ConfigSmartGapKeyword +syn match i3ConfigGapStyle /^gaps \(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=i3ConfigGapStyleKeyword,i3ConfigNumber,i3ConfigVariable +syn keyword i3ConfigSmartGapKeyword on inverse_outer contained +syn match i3ConfigSmartGap /^smart_gaps \(on\|inverse_outer\)$/ contains=i3ConfigSmartGapKeyword syn keyword i3ConfigSmartBorderKeyword on no_gaps contained -syn match i3ConfigSmartBorder /^\s*smart_borders\s\+\(on\|no_gaps\)\s\?$/ contains=i3ConfigSmartBorderKeyword +syn match i3ConfigSmartBorder /^smart_borders \(on\|no_gaps\)$/ contains=i3ConfigSmartBorderKeyword + +" Commands useable in keybinds +syn keyword i3ConfigAction move exit restart reload layout append_layout workspace focus kill open fullscreen sticky split floating mark unmark resize rename scratchpad swap mode bar gaps border nop contained +syn keyword i3ConfigOption enable disable toggle mode_toggle key shrink grow height width restore container to left right up down position absolute relative window splitv splith tabbed stacked default on off inner outer current all set plus minus top bottom horizontal vertical auto none normal pixel prev next back_and_forth child parent show contained +syn match i3ConfigUnit /\sp\(pt\|x\)/ contained +syn match i3ConfigUnitOr /\sor/ contained " Keyboard bindings -syn keyword i3ConfigAction toggle fullscreen restart key import kill shrink grow contained -syn keyword i3ConfigAction focus move grow height width split layout resize restore reload mute unmute exit mode workspace container to contained -syn match i3ConfigModifier /\w\++\w\+\(\(+\w\+\)\+\)\?/ contained contains=i3ConfigVariableModifier -syn match i3ConfigNumber /\s\d\+/ contained -syn match i3ConfigUnit /\sp\(pt\|x\)/ contained -syn match i3ConfigUnitOr /\sor/ contained -syn keyword i3ConfigBindKeyword bindsym bindcode exec gaps border contained -syn match i3ConfigBindArgument /--\w\+\(\(-\w\+\)\+\)\?\s/ contained -syn match i3ConfigBind /^\s*\(bindsym\|bindcode\)\s\+.*$/ contains=i3ConfigVariable,i3ConfigBindKeyword,i3ConfigVariableAndModifier,i3ConfigNumber,i3ConfigUnit,i3ConfigUnitOr,i3ConfigBindArgument,i3ConfigModifier,i3ConfigAction,i3ConfigString,i3ConfigGapStyleKeyword,i3ConfigBorderStyleKeyword +syn keyword i3ConfigBindKeyword bindsym bindcode contained +syn match i3ConfigBindArgument /--\(release\|border\|whole-window\|exclude-titlebar\)/ contained +syn match i3ConfigBindModifier /+/ contained +syn match i3ConfigBindModkey /Ctrl\|Shift\|Mod[1-5]/ contained +syn match i3ConfigBindCombo /[$a-zA-Z0-9_+]\+ / contained contains=i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey +syn match i3ConfigBindComboLine /bind\(sym\|code\)\( --[a-z-]\+\)* [$a-zA-Z0-9_+]\+ / contained contains=i3ConfigBindKeyword,i3ConfigBindArgument,i3ConfigBindCombo +syn match i3ConfigBind /^\s*bind\(sym\|code\)\s\+.*[^{]$/ contains=i3ConfigBindComboLine,i3ConfigNumber,i3ConfigVariable,i3ConfigAction,i3ConfigOption,i3ConfigGapStyleKeyword,i3ConfigOperator,i3ConfigString,i3ConfigUnit,i3ConfigUnitOr,i3ConfigConditional,i3ConfigBoolean,i3ConfigExec -" Floating +" Floating modifier +syn keyword i3ConfigFloatingModifierKeyword floating_modifier contained +syn match i3ConfigFloatingModifier /^floating_modifier [$a-zA-Z0-9+]\+$/ contains=i3ConfigVariable,i3ConfigBindModkey,i3ConfigFloatingModifierKeyword + +" Floating window size limitation syn keyword i3ConfigSizeSpecial x contained -syn match i3ConfigNegativeSize /-/ contained -syn match i3ConfigSize /-\?\d\+\s\?x\s\?-\?\d\+/ contained contains=i3ConfigSizeSpecial,i3ConfigNumber,i3ConfigNegativeSize -syn match i3ConfigFloatingModifier /^\s*floating_modifier\s\+\$\w\+\d\?/ contains=i3ConfigVariable -syn match i3ConfigFloating /^\s*floating_\(maximum\|minimum\)_size\s\+-\?\d\+\s\?x\s\?-\?\d\+/ contains=i3ConfigSize +syn match i3ConfigSize / -\?\d\+ x -\?\d\+/ contained contains=i3ConfigSizeSpecial,i3ConfigNumber +syn keyword i3ConfigFloatingSizeKeyword floating_minimum_size floating_maximum_size contained +syn match i3ConfigFloatingSize /^floating_\(maximum\|minimum\)_size -\?\d\+ x -\?\d\+/ contains=i3ConfigFloatingSizeKeyword,i3ConfigSize " Orientation syn keyword i3ConfigOrientationKeyword vertical horizontal auto contained -syn match i3ConfigOrientation /^\s*default_orientation\s\+\(vertical\|horizontal\|auto\)\s\?$/ contains=i3ConfigOrientationKeyword +syn match i3ConfigOrientation /^default_orientation \(vertical\|horizontal\|auto\)$/ contains=i3ConfigOrientationKeyword " Layout syn keyword i3ConfigLayoutKeyword default stacking tabbed contained -syn match i3ConfigLayout /^\s*workspace_layout\s\+\(default\|stacking\|tabbed\)\s\?$/ contains=i3ConfigLayoutKeyword +syn match i3ConfigLayout /^workspace_layout \(default\|stacking\|tabbed\)$/ contains=i3ConfigLayoutKeyword " Border style syn keyword i3ConfigBorderStyleKeyword none normal pixel contained -syn match i3ConfigBorderStyle /^\s*\(new_window\|new_float\|default_border\|default_floating_border\)\s\+\(none\|\(normal\|pixel\)\(\s\+\d\+\)\?\(\s\+\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?\)\?\)\s\?$/ contains=i3ConfigBorderStyleKeyword,i3ConfigNumber,i3ConfigVariable +syn match i3ConfigBorderStyle /^\(new_window\|new_float\|default_border\|default_floating_border\)\s\+\(none\|\(normal\|pixel\)\(\s\+\d\+\)\?\(\s\+\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?\)\?\)$/ contains=i3ConfigBorderStyleKeyword,i3ConfigNumber,i3ConfigVariable " Hide borders and edges syn keyword i3ConfigEdgeKeyword none vertical horizontal both smart smart_no_gaps contained -syn match i3ConfigEdge /^\s*hide_edge_borders\s\+\(none\|vertical\|horizontal\|both\|smart\|smart_no_gaps\)\s\?$/ contains=i3ConfigEdgeKeyword +syn match i3ConfigEdge /^hide_edge_borders\s\+\(none\|vertical\|horizontal\|both\|smart\|smart_no_gaps\)\s\?$/ contains=i3ConfigEdgeKeyword + " Arbitrary commands for specific windows (for_window) syn keyword i3ConfigCommandKeyword for_window contained -syn region i3ConfigWindowStringSpecial start=+"+ skip=+\\"+ end=+"+ contained contains=i3ConfigString -syn region i3ConfigWindowCommandSpecial start="\[" end="\]" contained contains=i3ConfigWindowStringSpacial,i3ConfigString -syn match i3ConfigArbitraryCommand /^\s*for_window\s\+.*$/ contains=i3ConfigWindowCommandSpecial,i3ConfigCommandKeyword,i3ConfigBorderStyleKeyword,i3ConfigLayoutKeyword,i3ConfigOrientationKeyword,Size,i3ConfigNumber +syn match i3ConfigConditionalText /\w\+\(-\w\+\)*/ contained +syn match i3ConfigEqualsOperator /=/ contained +syn region i3ConfigConditional start=/\[/ end=/\]/ contained contains=i3ConfigString,i3ConfigEqualsOperator,i3ConfigConditionalText +syn match i3ConfigArbitraryCommand /^for_window\s\+.*$/ contains=i3ConfigConditional,i3ConfigCommandKeyword,i3ConfigAction,i3ConfigOption,i3ConfigSize,i3ConfigNumber,i3ConfigString,i3ConfigOperator,i3ConfigBoolean,i3ConfigVariable " Disable focus open opening syn keyword i3ConfigNoFocusKeyword no_focus contained -syn match i3ConfigDisableFocus /^\s*no_focus\s\+.*$/ contains=i3ConfigWindowCommandSpecial,i3ConfigNoFocusKeyword +syn match i3ConfigDisableFocus /^no_focus\s\+.*$/ contains=i3ConfigConditional,i3ConfigNoFocusKeyword " Move client to specific workspace automatically syn keyword i3ConfigAssignKeyword assign contained syn match i3ConfigAssignSpecial /→/ contained -syn match i3ConfigAssign /^\s*assign\s\+.*$/ contains=i3ConfigAssignKeyword,i3ConfigWindowCommandSpecial,i3ConfigAssignSpecial +syn match i3ConfigAssign /^assign\s\+.*$/ contains=i3ConfigAssignKeyword,i3ConfigAssignSpecial,i3ConfigConditional,i3ConfigVariable,i3ConfigString,i3ConfigNumber " X resources syn keyword i3ConfigResourceKeyword set_from_resource contained -syn match i3ConfigResource /^\s*set_from_resource\s\+.*$/ contains=i3ConfigResourceKeyword,i3ConfigWindowCommandSpecial,i3ConfigColor,i3ConfigVariable +syn match i3ConfigResource /^set_from_resource\s\+.*$/ contains=i3ConfigResourceKeyword,i3ConfigConditional,i3ConfigColor,i3ConfigVariable,i3ConfigString,i3ConfigNumber -" Auto start applications -syn keyword i3ConfigExecKeyword exec exec_always contained -syn match i3ConfigNoStartupId /--no-startup-id/ contained " We are not using i3ConfigBindArgument as only no-startup-id is supported here -syn match i3ConfigExec /^\s*exec\(_always\)\?\s\+.*$/ contains=i3ConfigExecKeyword,i3ConfigNoStartupId,i3ConfigString +" Executing shell commands +syn keyword i3ConfigExecKeyword exec contained +syn keyword i3ConfigExecAlwaysKeyword exec_always contained +syn match i3ConfigShCmdDelim /\$/ contained +syn region i3ConfigShCommand start=/\$(/ end=/)/ contained contains=i3ConfigShCmdDelim,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigString,i3ConfigNumber,i3ConfigVariable keepend extend +syn match i3ConfigShDelim /[[\]{}();`]\+/ contained +syn match i3ConfigShOper /[<>&|+=~^*!.?]\+/ contained +syn match i3ConfigShParam /\<-[a-zA-Z0-9_-]\+\>/ contained containedin=i3ConfigVar +syn region i3ConfigExec start=/exec\(_always\)\?\( --no-startup-id\)\? [^{]/ skip=/\\$/ end=/\([,;]\|$\)/ contains=i3ConfigExecKeyword,i3ConfigExecAlwaysKeyword,i3ConfigShCommand,i3ConfigShDelim,i3ConfigShOper,i3ConfigShParam,i3ConfigNumber,i3ConfigString,i3ConfigVariable,i3ConfigOperator keepend extend " Automatically putting workspaces on specific screens syn keyword i3ConfigWorkspaceKeyword workspace contained syn keyword i3ConfigOutput output contained -syn match i3ConfigWorkspace /^\s*workspace\s\+.*$/ contains=i3ConfigWorkspaceKeyword,i3ConfigNumber,i3ConfigString,i3ConfigOutput +syn match i3ConfigWorkspace /^\s*workspace\s\+.*$/ contains=i3ConfigWorkspaceKeyword,i3ConfigNumber,i3ConfigString,i3ConfigOutput,i3ConfigVariable,i3ConfigBoolean " Changing colors syn keyword i3ConfigClientColorKeyword client focused focused_inactive unfocused urgent placeholder background contained syn match i3ConfigClientColor /^\s*client.\w\+\s\+.*$/ contains=i3ConfigClientColorKeyword,i3ConfigColor,i3ConfigVariable syn keyword i3ConfigTitleAlignKeyword left center right contained -syn match i3ConfigTitleAlign /^\s*title_align\s\+.*$/ contains=i3ConfigTitleAlignKeyword +syn match i3ConfigTitleAlign /^title_align .*$/ contains=i3ConfigTitleAlignKeyword " Interprocess communication syn match i3ConfigInterprocessKeyword /ipc-socket/ contained -syn match i3ConfigInterprocess /^\s*ipc-socket\s\+.*$/ contains=i3ConfigInterprocessKeyword +syn match i3ConfigInterprocess /^ipc-socket .*$/ contains=i3ConfigInterprocessKeyword " Mouse warping syn keyword i3ConfigMouseWarpingKeyword mouse_warping contained -syn keyword i3ConfigMouseWarpingType output none contained -syn match i3ConfigMouseWarping /^\s*mouse_warping\s\+\(output\|none\)\s\?$/ contains=i3ConfigMouseWarpingKeyword,i3ConfigMouseWarpingType +syn keyword i3ConfigMouseWarpingType output container none contained +syn match i3ConfigMouseWarping /^mouse_warping \(output\|container\|none\)$/ contains=i3ConfigMouseWarpingKeyword,i3ConfigMouseWarpingType " Focus follows mouse syn keyword i3ConfigFocusFollowsMouseKeyword focus_follows_mouse contained -syn keyword i3ConfigFocusFollowsMouseType yes no contained -syn match i3ConfigFocusFollowsMouse /^\s*focus_follows_mouse\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusFollowsMouseKeyword,i3ConfigFocusFollowsMouseType - -" Popups during fullscreen mode -syn keyword i3ConfigPopupOnFullscreenKeyword popup_during_fullscreen contained -syn keyword i3ConfigPopuponFullscreenType smart ignore leave_fullscreen contained -syn match i3ConfigPopupOnFullscreen /^\s*popup_during_fullscreen\s\+\w\+\s\?$/ contains=i3ConfigPopupOnFullscreenKeyword,i3ConfigPopupOnFullscreenType +syn keyword i3ConfigFocusFollowsMouseType always contained +syn match i3ConfigFocusFollowsMouse /^focus_follows_mouse \(yes\|no\|always\)$/ contains=i3ConfigFocusFollowsMouseKeyword,i3ConfigBoolean,i3ConfigFocusFollowsMouseType " Focus wrapping syn keyword i3ConfigFocusWrappingKeyword force_focus_wrapping focus_wrapping contained -syn keyword i3ConfigFocusWrappingType yes no contained -syn match i3ConfigFocusWrapping /^\s*\(force_\)\?focus_wrapping\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigFocusWrappingKeyword +syn keyword i3ConfigFocusWrappingType force workspace contained +syn match i3ConfigFocusWrapping /^focus_wrapping \(yes\|no\|force\|workspace\)$/ contains=i3ConfigBoolean,i3ConfigFocusWrappingKeyword,i3ConfigFocusWrappingType + +" Popups during fullscreen mode +syn keyword i3ConfigPopupOnFullscreenKeyword popup_during_fullscreen contained +syn keyword i3ConfigPopupOnFullscreenType smart ignore leave_fullscreen contained +syn match i3ConfigPopupOnFullscreen /^popup_during_fullscreen \w\+$/ contains=i3ConfigPopupOnFullscreenKeyword,i3ConfigPopupOnFullscreenType " Forcing Xinerama syn keyword i3ConfigForceXineramaKeyword force_xinerama contained -syn match i3ConfigForceXinerama /^\s*force_xinerama\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigForceXineramaKeyword +syn match i3ConfigForceXinerama /^force_xinerama \(yes\|no\)$/ contains=i3ConfigBoolean,i3ConfigForceXineramaKeyword " Automatic back-and-forth when switching to the current workspace syn keyword i3ConfigAutomaticSwitchKeyword workspace_auto_back_and_forth contained -syn match i3ConfigAutomaticSwitch /^\s*workspace_auto_back_and_forth\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigAutomaticSwitchKeyword +syn match i3ConfigAutomaticSwitch /^workspace_auto_back_and_forth \(yes\|no\)$/ contains=i3ConfigBoolean,i3ConfigAutomaticSwitchKeyword " Delay urgency hint syn keyword i3ConfigTimeUnit ms contained syn keyword i3ConfigDelayUrgencyKeyword force_display_urgency_hint contained -syn match i3ConfigDelayUrgency /^\s*force_display_urgency_hint\s\+\d\+\s\+ms\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigDelayUrgencyKeyword,i3ConfigNumber,i3ConfigTimeUnit +syn match i3ConfigDelayUrgency /^force_display_urgency_hint \d\+ ms$/ contains=i3ConfigBoolean,i3ConfigDelayUrgencyKeyword,i3ConfigNumber,i3ConfigTimeUnit " Focus on window activation syn keyword i3ConfigFocusOnActivationKeyword focus_on_window_activation contained syn keyword i3ConfigFocusOnActivationType smart urgent focus none contained -syn match i3ConfigFocusOnActivation /^\s*focus_on_window_activation\s\+\(smart\|urgent\|focus\|none\)\s\?$/ contains=i3ConfigFocusOnActivationKeyword,i3ConfigFocusOnActivationType +syn match i3ConfigFocusOnActivation /^focus_on_window_activation \(smart\|urgent\|focus\|none\)$/ contains=i3ConfigFocusOnActivationKeyword,i3ConfigFocusOnActivationType -" Automatic back-and-forth when switching to the current workspace -syn keyword i3ConfigDrawingMarksKeyword show_marks contained -syn match i3ConfigDrawingMarks /^\s*show_marks\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigDrawingMarksKeyword +" Show window marks in their window title +syn keyword i3ConfigShowMarksKeyword show_marks contained +syn match i3ConfigShowMarks /^show_marks \(yes\|no\)$/ contains=i3ConfigBoolean,i3ConfigShowMarksKeyword + +" Mode block +syn match i3ConfigModeKeyword /^mode/ contained +syn region i3ConfigModeBlock start=/^mode\( --pango_markup\)\? \([^'" {]\+\|'[^']\+'\|".\+"\)\s\+{$/ end=/^\s*}$/ contains=i3ConfigModeKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigNumber,i3ConfigParen,i3ConfigVariable fold keepend extend -" Group mode/bar -syn keyword i3ConfigBlockKeyword mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_min_width workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained -syn region i3ConfigBlock start=+^\s*[^#]*s\?{$+ end=+^\s*[^#]*}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend +" Color block +syn keyword i3ConfigColorsKeyword colors contained +syn match i3ConfigColorsCategory /\(focused_\)\?\(background\|statusline\|separator\)\|\(focused\|active\|inactive\|urgent\)_workspace\|binding_mode/ contained +syn region i3ConfigColorsBlock start=/^\s\+colors {$/ end=/^\s\+}$/ contained contains=i3ConfigColorsKeyword,i3ConfigColorsCategory,i3ConfigColor,i3ConfigVariable,i3ConfigComment,i3ConfigParen fold keepend extend -" Line continuation -syn region i3ConfigLineCont start=/^.*\\$/ end=/^.*$/ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend +" Bar block +syn keyword i3ConfigBarBlockKeyword bar i3bar_command status_command mode hidden_state id position output tray_output tray_padding font separator_symbol workspace_buttons workspace_min_width strip_workspace_numbers strip_workspace_name binding_mode_indicator padding contained +syn keyword i3ConfigBarModifierKeyword modifier contained +syn match i3ConfigBarModifierLine /^\s\+modifier [^ ]\+$/ contained contains=i3ConfigBarModifierKeyword,i3ConfigBindModifier,i3ConfigVariable,i3ConfigBindModkey +syn region i3ConfigBarBlock start=/^bar {$/ end=/^}$/ contains=i3ConfigBarBlockKeyword,i3ConfigBarModifierLine,i3ConfigBind,i3ConfigString,i3ConfigComment,i3ConfigFont,i3ConfigBoolean,i3ConfigNumber,i3ConfigOperator,i3ConfigParen,i3ConfigColor,i3ConfigVariable,i3ConfigColorsBlock fold keepend extend " Define the highlighting. +hi def link i3ConfigKeyword Keyword +hi def link i3ConfigCommand Statement hi def link i3ConfigError Error hi def link i3ConfigTodo Todo hi def link i3ConfigComment Comment -hi def link i3ConfigFontContent Type -hi def link i3ConfigFocusOnActivationType Type -hi def link i3ConfigPopupOnFullscreenType Type -hi def link i3ConfigOrientationKeyword Type -hi def link i3ConfigMouseWarpingType Type -hi def link i3ConfigFocusFollowsMouseType Type -hi def link i3ConfigGapStyleKeyword Type -hi def link i3ConfigTitleAlignKeyword Type -hi def link i3ConfigSmartGapKeyword Type -hi def link i3ConfigSmartBorderKeyword Type -hi def link i3ConfigLayoutKeyword Type -hi def link i3ConfigBorderStyleKeyword Type -hi def link i3ConfigEdgeKeyword Type -hi def link i3ConfigAction Type -hi def link i3ConfigCommand Type -hi def link i3ConfigOutput Type -hi def link i3ConfigWindowCommandSpecial Type -hi def link i3ConfigFocusWrappingType Type -hi def link i3ConfigUnitOr Type -hi def link i3ConfigFontSize Constant +hi def link i3ConfigOperator Operator +hi def link i3ConfigParen Delimiter +hi def link i3ConfigFontKeyword i3ConfigKeyword +hi def link i3ConfigFontNamespace i3ConfigOption +hi def link i3ConfigFontContent String +hi def link i3ConfigFontSize Number +hi def link i3ConfigString String +hi def link i3ConfigNumber Number +hi def link i3ConfigBoolean Boolean hi def link i3ConfigColor Constant -hi def link i3ConfigNumber Constant -hi def link i3ConfigUnit Constant -hi def link i3ConfigVariableAndModifier Constant -hi def link i3ConfigTimeUnit Constant -hi def link i3ConfigModifier Constant -hi def link i3ConfigString Constant -hi def link i3ConfigNegativeSize Constant -hi def link i3ConfigInclude Constant -hi def link i3ConfigFontSeparator Special -hi def link i3ConfigVariableModifier Special -hi def link i3ConfigSizeSpecial Special -hi def link i3ConfigWindowSpecial Special -hi def link i3ConfigAssignSpecial Special -hi def link i3ConfigFontNamespace PreProc -hi def link i3ConfigBindArgument PreProc -hi def link i3ConfigNoStartupId PreProc -hi def link i3ConfigIncludeKeyword Identifier -hi def link i3ConfigFontKeyword Identifier -hi def link i3ConfigBindKeyword Identifier -hi def link i3ConfigOrientation Identifier -hi def link i3ConfigGapStyle Identifier -hi def link i3ConfigTitleAlign Identifier -hi def link i3ConfigSmartGap Identifier -hi def link i3ConfigSmartBorder Identifier -hi def link i3ConfigLayout Identifier -hi def link i3ConfigBorderStyle Identifier -hi def link i3ConfigEdge Identifier -hi def link i3ConfigFloating Identifier -hi def link i3ConfigFloatingModifier Identifier -hi def link i3ConfigCommandKeyword Identifier -hi def link i3ConfigNoFocusKeyword Identifier -hi def link i3ConfigInitializeKeyword Identifier -hi def link i3ConfigAssignKeyword Identifier -hi def link i3ConfigResourceKeyword Identifier -hi def link i3ConfigExecKeyword Identifier -hi def link i3ConfigWorkspaceKeyword Identifier -hi def link i3ConfigClientColorKeyword Identifier -hi def link i3ConfigInterprocessKeyword Identifier -hi def link i3ConfigMouseWarpingKeyword Identifier -hi def link i3ConfigFocusFollowsMouseKeyword Identifier -hi def link i3ConfigPopupOnFullscreenKeyword Identifier -hi def link i3ConfigFocusWrappingKeyword Identifier -hi def link i3ConfigForceXineramaKeyword Identifier -hi def link i3ConfigAutomaticSwitchKeyword Identifier -hi def link i3ConfigDelayUrgencyKeyword Identifier -hi def link i3ConfigFocusOnActivationKeyword Identifier -hi def link i3ConfigDrawingMarksKeyword Identifier -hi def link i3ConfigBlockKeyword Identifier -hi def link i3ConfigVariable Statement -hi def link i3ConfigArbitraryCommand Type +hi def link i3ConfigVariable Variable +hi def link i3ConfigSetKeyword i3ConfigKeyword +hi def link i3ConfigIncludeKeyword i3ConfigKeyword +hi def link i3ConfigCommandSubstitutionDelimiter Delimiter +hi def link i3ConfigIncludePath String +hi def link i3ConfigGapStyleKeyword i3ConfigOption +hi def link i3ConfigGapStyle i3ConfigCommand +hi def link i3ConfigSmartGapKeyword i3ConfigOption +hi def link i3ConfigSmartGap i3ConfigKeyword +hi def link i3ConfigSmartBorderKeyword i3ConfigOption +hi def link i3ConfigSmartBorder i3ConfigKeyword +hi def link i3ConfigAction i3ConfigCommand +hi def link i3ConfigOption Type +hi def link i3ConfigUnit i3ConfigNumber +hi def link i3ConfigUnitOr i3ConfigOperator +hi def link i3ConfigBindKeyword i3ConfigKeyword +hi def link i3ConfigBindModkey Special +hi def link i3ConfigBindCombo SpecialChar +hi def link i3ConfigBindModifier i3ConfigOperator +hi def link i3ConfigBindArgument i3ConfigShParam +hi def link i3ConfigFloatingModifierKeyword i3ConfigKeyword +hi def link i3ConfigSizeSpecial i3ConfigOperator +hi def link i3ConfigFloatingSizeKeyword i3ConfigKeyword +hi def link i3ConfigOrientationKeyword i3ConfigOption +hi def link i3ConfigOrientation i3ConfigKeyword +hi def link i3ConfigLayoutKeyword i3ConfigOption +hi def link i3ConfigLayout i3ConfigKeyword +hi def link i3ConfigBorderStyleKeyword i3ConfigOption +hi def link i3ConfigBorderStyle i3ConfigKeyword +hi def link i3ConfigEdgeKeyword i3ConfigOption +hi def link i3ConfigEdge i3ConfigKeyword +hi def link i3ConfigCommandKeyword i3ConfigKeyword +hi def link i3ConfigEqualsOperator i3ConfigOperator +hi def link i3ConfigConditionalText Conditional +hi def link i3ConfigConditional Delimiter +hi def link i3ConfigNoFocusKeyword i3ConfigKeyword +hi def link i3ConfigAssignKeyword i3ConfigKeyword +hi def link i3ConfigAssignSpecial i3ConfigOption +hi def link i3ConfigResourceKeyword i3ConfigKeyword +hi def link i3ConfigShParam PreProc +hi def link i3ConfigShDelim Delimiter +hi def link i3ConfigShOper Operator +hi def link i3ConfigShCmdDelim i3ConfigShDelim +hi def link i3ConfigShCommand Normal +hi def link i3ConfigExecKeyword i3ConfigCommand +hi def link i3ConfigExecAlwaysKeyword i3ConfigKeyword +hi def link i3ConfigWorkspaceKeyword i3ConfigCommand +hi def link i3ConfigOutput i3ConfigOption +hi def link i3ConfigClientColorKeyword i3ConfigKeyword +hi def link i3ConfigClientColor Operator +hi def link i3ConfigTitleAlignKeyword i3ConfigOption +hi def link i3ConfigTitleAlign i3ConfigKeyword +hi def link i3ConfigInterprocessKeyword i3ConfigKeyword +hi def link i3ConfigMouseWarpingKeyword i3ConfigKeyword +hi def link i3ConfigMouseWarpingType i3ConfigOption +hi def link i3ConfigFocusFollowsMouseKeyword i3ConfigKeyword +hi def link i3ConfigFocusFollowsMouseType i3ConfigOption +hi def link i3ConfigFocusWrappingKeyword i3ConfigKeyword +hi def link i3ConfigFocusWrappingType i3ConfigOption +hi def link i3ConfigPopupOnFullscreenKeyword i3ConfigKeyword +hi def link i3ConfigPopupOnFullscreenType i3ConfigOption +hi def link i3ConfigForceXineramaKeyword i3ConfigKeyword +hi def link i3ConfigAutomaticSwitchKeyword i3ConfigKeyword +hi def link i3ConfigTimeUnit i3ConfigNumber +hi def link i3ConfigDelayUrgencyKeyword i3ConfigKeyword +hi def link i3ConfigFocusOnActivationKeyword i3ConfigKeyword +hi def link i3ConfigFocusOnActivationType i3ConfigOption +hi def link i3ConfigShowMarksKeyword i3ConfigKeyword +hi def link i3ConfigModeKeyword i3ConfigKeyword +hi def link i3ConfigColorsKeyword i3ConfigKeyword +hi def link i3ConfigColorsCategory Type +hi def link i3ConfigBarModifierKeyword i3ConfigKeyword +hi def link i3ConfigBarBlockKeyword i3ConfigKeyword let b:current_syntax = "i3config"