Skip to content

Commit

Permalink
Adds support for auto-merge option in set
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel FORESTIER committed Sep 16, 2023
1 parent 7988649 commit 1b55726
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Added
- `auto-merge` option in `set`

## [v2.2.0] - 2023-07-16
### Added
Expand Down
2 changes: 2 additions & 0 deletions Nftables.sublime-syntax
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,8 @@ contexts:
scope: constant.language.set-flag.nftables
- include: comma
- include: statement-separators
- match: \b(auto-merge)\b
scope: storage.type.set-automerge.nftables
- match: \b(gc-interval)\b
scope: storage.type.set-gcinterval.nftables
push: _expect-time-string
Expand Down
2 changes: 2 additions & 0 deletions syntax_test_Nftables.nft
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,8 @@ table a-strang3_Name {
# ^ punctuation.separator.comma.nftables
# ^ constant.language.set-flag.nftables
# ^ punctuation.terminator.semi-colon.nftables
auto-merge
# <- storage.type.set-automerge.nftables
size 65535
# <- storage.type.set-size.nftables
# ^ constant.numeric.integer.decimal.nftables
Expand Down

0 comments on commit 1b55726

Please sign in to comment.