Skip to content

Commit f25b1c6

Browse files
AdamWrslvvko
authored andcommitted
Add ext_chromium_mv3 to known platforms, update AGLint to v2.1.1
AG-36166 Squashed commit of the following: commit ec16d53 Author: Slava Leleka <v.leleka@adguard.com> Date: Sat Sep 21 16:26:38 2024 +0300 CHANGELOG.md edited online with Bitbucket commit 2bb6604 Author: Adam Wróblewski <adam@adguard.com> Date: Fri Sep 20 22:24:24 2024 +0200 Update changelog commit 874c38d Author: Dávid Tóta <d.tota@adguard.com> Date: Fri Sep 20 23:23:09 2024 +0300 CHANGELOG.md edited online with Bitbucket commit 8c33c96 Author: Adam Wróblewski <adam@adguard.com> Date: Fri Sep 20 22:20:08 2024 +0200 Update changelog commit f4f68c4 Author: Dávid Tóta <d.tota@adguard.com> Date: Fri Sep 20 23:16:53 2024 +0300 syntaxes/adblock.yaml-tmlanguage edited online with Bitbucket commit 1c86aaf Author: Adam Wróblewski <adam@adguard.com> Date: Fri Sep 20 22:12:14 2024 +0200 Add ext_chromium_mv3 to known platforms
1 parent 8b3b2e8 commit f25b1c6

File tree

5 files changed

+21
-6
lines changed

5 files changed

+21
-6
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog][keepachangelog], and this project adheres to [Semantic Versioning][semver].
66

7+
## 1.1.14 - 2024-09-21
8+
9+
### Added
10+
11+
- Highlighting for `ext_chromium_mv3` platform name: [#138]
12+
13+
### Changed
14+
15+
- Updated integrated [AGLint] to v2.1.1
16+
717
## 1.1.13 - 2024-09-20
818

919
### Changed
@@ -407,6 +417,7 @@ The format is based on [Keep a Changelog][keepachangelog], and this project adhe
407417
[#119]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/119
408418
[#122]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/122
409419
[#123]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/123
420+
[#138]: https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/138
410421
[AGLint]: https://github.com/AdguardTeam/AGLint/blob/master/CHANGELOG.md
411422
[keepachangelog]: https://keepachangelog.com/en/1.0.0/
412423
[semver]: https://semver.org/spec/v2.0.0.html

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"vscode-languageserver-textdocument": "^1.0.8"
1313
},
1414
"devDependencies": {
15-
"@adguard/aglint": "2.1.0",
15+
"@adguard/aglint": "2.1.1",
1616
"@types/clone-deep": "^4.0.1",
1717
"@types/semver": "^7.5.0",
1818
"clone-deep": "^4.0.1",

server/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

5-
"@adguard/aglint@2.1.0":
6-
version "2.1.0"
7-
resolved "https://registry.yarnpkg.com/@adguard/aglint/-/aglint-2.1.0.tgz#ecbc7067fecabd49586e630e242d1116f1c0515a"
8-
integrity sha512-SjXAlufcen/Mp10X/UtFMeGBjJQEP5IPgAjVTGffhyAbii87yXiz98EBjCUbQ4h8TlO6VCzAgw9PPd+xX94Wkw==
5+
"@adguard/aglint@2.1.1":
6+
version "2.1.1"
7+
resolved "https://registry.yarnpkg.com/@adguard/aglint/-/aglint-2.1.1.tgz#f5b582e0f0048ebeff864cf3a01d23eb4ea97087"
8+
integrity sha512-Q7c7A9obUcIhmxG7b1iWHahAZ/rhdg/G+1AWDy3wzKrWfWLdnMSLj1Zd26cOAjmNMwsblldWw2HuDc+Kbvt66Q==
99
dependencies:
1010
"@adguard/agtree" "^2.0.2"
1111
"@adguard/ecss-tree" "^1.1.0"

syntaxes/adblock.yaml-tmlanguage

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ repository:
138138
- name: keyword.control.hint.name
139139
match: "(NOT_OPTIMIZED|OPTIMIZED|PLATFORM|NOT_PLATFORM)"
140140
- name: constant.language.platform.name
141-
match: "(windows|mac|android|ios|ext_chromium|ext_ff|ext_edge|ext_opera|ext_ublock|ext_safari|ext_android_cb)"
141+
# The basic regexp is greedy and stops once it finds a match, so 'ext_chromium_mv3' should be before 'ext_chromium'
142+
match: "(windows|mac|android|ios|ext_chromium_mv3|ext_chromium|ext_ff|ext_edge|ext_opera|ext_ublock|ext_safari|ext_android_cb)"
142143
- name: keyword.control.characters
143144
match: "(\\(|\\)|,)"
144145
- match: "^!#(?!#).+$"

test/static/rules/test_rules.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
!#endif
1919
!+ NOT_OPTIMIZED PLATFORM(android)
2020
||example.org^
21+
! https://github.com/AdguardTeam/VscodeAdblockSyntax/issues/138
22+
!+ PLATFORM(ext_chromium_mv3)
23+
||example.com^
2124
!#invalidpreprocessor
2225
!#if (invalid_platform)
2326
!#safari_cb_affinity(general,privacy)

0 commit comments

Comments
 (0)