Skip to content

Conversation

@litoj
Copy link
Contributor

@litoj litoj commented Dec 2, 2025

  • cleanup of PR for tearing (Update sway commands #18293) and cleanup of other output options
    • removed allow_tearing from global keywords (it's only an output option)
    • moved ...clockwise directives from general to transform options
    • separated icc highlight to correctly detect and highlight paths
    • updated output bg to use the same approach as icc for file path highlighting
  • updated all identifier-matchers to the same design
    • complex ("string") or referenced ($var) identifiers always included
      • extend fixes string matches to recognize there was some text already matched (otherwise errors as it thinks it was an empty space)
      • string matches skip spaces first and thereby extend the match over spaces - we can drop space parsing from the identifier match itself
    • one-word identifiers get highlighted with the respective identifier highlight group
      • therefore OutputIdent mostly removed since it was misused for setting the highlight, not parsing
    • all identifiers now stop before the ,; command separators
  • added support for bar identifiers in swayconfig (and supporting bar matcher restructure in i3config)
  • separated input type and device name highlights
  • added missing highlight defaults for mark options
  • removed extend from block commands that cannot be in another block

(Syntax tested with https://github.com/litoj/i3config.vim/blob/master/test.swayconfig#L222)

Ping @jamespeapen @hiqua

litoj added 2 commits December 2, 2025 20:25
- mapped all identifier-highlighting groups to a new group `i3ConfigIdent`
- i3config bar is now split into keyword and block matches
- support `xft:` namespace in fonts
- cleanup of PR for tearing and other output options
  - removed `allow_tearing` from global keywords (it's only an output option)
  - moved `...clockwise` directives from general to transform options
  - separated `icc` highlight to correctly detect and highlight paths
  - updated output bg to use the same approach as `icc` for file path
- separated all identifier-matchers into their own groups
- added support for bar identifiers
@litoj litoj changed the title syntax(i3config+swayconfig): separate identifier highlight groups + cleanup of output options syntax(i3config+swayconfig): identifier + output option matcher style cleanup Dec 2, 2025
@hiqua
Copy link
Contributor

hiqua commented Dec 2, 2025

I'll review it later this week, but in the meantime @litoj would you consider becoming the official maintainer instead of me for the i3 files? I only volunteered because no one else did, but if you're active and even creating PRs, it might make sense, if you're interested.

@litoj
Copy link
Contributor Author

litoj commented Dec 2, 2025

would you consider becoming the official maintainer instead of me for the i3 files?

@hiqua I'd love to, although I'm unsure what the process for that is.

@hiqua
Copy link
Contributor

hiqua commented Dec 3, 2025

I'd assume it's as simple as replacing my username with yours at the top of the file!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants