diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f250ce3..bfb30029 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ ## Syntaxes - NSE (Nmap Scripting Engine) is mapped to Lua, see #2151 (@Cre3per) +- Correctly color `fstab` dump and pass fields, see #2246 (@yuvalmo) ## Themes diff --git a/assets/syntaxes/02_Extra/Fstab.sublime-syntax b/assets/syntaxes/02_Extra/Fstab.sublime-syntax index b450f99d..de79aea3 100644 --- a/assets/syntaxes/02_Extra/Fstab.sublime-syntax +++ b/assets/syntaxes/02_Extra/Fstab.sublime-syntax @@ -95,7 +95,7 @@ contexts: fstab_dump: - include: comment - - match: '\s*[01]\s*' + - match: '\s*[012]\s*' comment: dump field scope: constant.numeric set: fstab_pass @@ -107,7 +107,7 @@ contexts: fstab_pass: - include: comment - - match: '\s*[01]\s*' + - match: '\s*[012]\s*' comment: pass field scope: constant.numeric set: expected_eol diff --git a/tests/syntax-tests/highlighted/Fstab/fstab b/tests/syntax-tests/highlighted/Fstab/fstab index 0107bf4f..2a44ab61 100644 --- a/tests/syntax-tests/highlighted/Fstab/fstab +++ b/tests/syntax-tests/highlighted/Fstab/fstab @@ -3,5 +3,6 @@ #  -UUID=9e6faddf-31ab-3f3e-9b50-2ad4fbc2ea8b / ext4 rw,relatime,data=ordered 0 1 -UUID=62F8-2047 /boot vfat rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro 0 2 +UUID=9e6faddf-31ab-3f3e-9b50-2ad4fbc2ea8b / ext4 rw,relatime,data=ordered 0 0 +UUID=9e6faddf-31ab-3f3e-9b50-2ad4fbc2ea8b / ext4 rw,relatime,data=ordered 1 1 +UUID=62F8-2047 /boot vfat rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro 2 2 diff --git a/tests/syntax-tests/source/Fstab/fstab b/tests/syntax-tests/source/Fstab/fstab index e000b8d9..2282f0cf 100644 --- a/tests/syntax-tests/source/Fstab/fstab +++ b/tests/syntax-tests/source/Fstab/fstab @@ -3,5 +3,6 @@ # -UUID=9e6faddf-31ab-3f3e-9b50-2ad4fbc2ea8b / ext4 rw,relatime,data=ordered 0 1 -UUID=62F8-2047 /boot vfat rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro 0 2 +UUID=9e6faddf-31ab-3f3e-9b50-2ad4fbc2ea8b / ext4 rw,relatime,data=ordered 0 0 +UUID=9e6faddf-31ab-3f3e-9b50-2ad4fbc2ea8b / ext4 rw,relatime,data=ordered 1 1 +UUID=62F8-2047 /boot vfat rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro 2 2