Minor syntax highlighting issue with swayconfig files

[diegoviola]

Steps to reproduce

This is a continuation of #14752, syntax highlighting improved a lot but there is still a minor issue with the following config:

floating_modifier $mod normal

The "normal" string shows up as red.

Here's a screenshot of what it currently looks like:

Expected behaviour

Syntax highlighting is properly applied to all commands.

Version of Vim

9.1.429

Environment

Operating system: Arch Linux
Terminal: foot
Value of $TERM: foot
Shell: /usr/bin/bash

Logs and stack traces

No response

[diegoviola]

Should have been labelled as bug, and not enhancement. Anyway, @JosefLitos @jamespeapen (ping).

[jamespeapen]

I can replicate this. It looks like contained was introduced in 679f5ab to floating_modifier in swayconfig.vim which seems to conflict with the i3 floating_modifier.

-syn match i3ConfigKeyword /^floating_modifier [$a-zA-Z0-9+]\+ \(normal\|inverse\)$/ contains=i3ConfigVariable,i3ConfigBindModkey,swayConfigFloatingModifierOpts
+syn match i3ConfigKeyword /floating_modifier [$a-zA-Z0-9+]\+ \(normal\|inverse\)$/ contained contains=i3ConfigVariable,i3ConfigBindModkey,swayConfigFloatingModifierOpts

Removing this fixes this problem. However, on checking the docs, it looks like floating_modifier none is a valid option that the syntax does not currently cover so I'll send a fix with both.

[diegoviola]

@jamespeapen Thanks a lot again for your amazing work!