From 95f757e8e672f4420f299b467e66bc889ec8aded Mon Sep 17 00:00:00 2001 From: nicked Date: Sat, 9 May 2020 15:01:24 +0200 Subject: [PATCH 1/3] Fixed @objcMembers in Swift Would match `@objc` first, and the `Members` part would be unhighlighted --- src/languages/swift.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/swift.js b/src/languages/swift.js index c5e5b0e8ac..29d59c1f61 100644 --- a/src/languages/swift.js +++ b/src/languages/swift.js @@ -125,7 +125,7 @@ export default function(hljs) { { className: 'meta', // @attributes begin: '(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|' + - '@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|' + + '@NSCopying|@NSManaged|@objcMembers|@objc|@convention|@required|' + '@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|' + '@infix|@prefix|@postfix|@autoclosure|@testable|@available|' + '@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|' + From e21e956cead6f31b1dfebd738e2a2a579fc4685a Mon Sep 17 00:00:00 2001 From: nicked Date: Sat, 9 May 2020 15:05:34 +0200 Subject: [PATCH 2/3] Update CHANGES.md --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 2b74d3d100..3ddb1a2c23 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -32,12 +32,14 @@ Language Improvements: - fix(javascript) `=>` function with nested `()` in params now works (#2502) [Josh Goebel][] - fix(typescript) `=>` function with nested `()` in params now works (#2502) [Josh Goebel][] - fix(yaml) Fix tags to include non-word characters (#2486) [Peter Plantinga][] +- fix(swift) `@objcMembers` was being partially highlighted (#2543) [Nick Randall][] [Josh Goebel]: https://github.com/yyyc514 [Peter Plantinga]: https://github.com/pplantinga [David Benjamin]: https://github.com/davidben [Vania Kucher]: https://github.com/qWici [Hankun Lin]: https://github.com/Linhk1606 +[Nick Randall]: https://github.com/nicked ## Version 10.0.2 From 9dce0985bf9c85795d10100ff75c31822a4cec43 Mon Sep 17 00:00:00 2001 From: nicked Date: Sun, 10 May 2020 11:24:30 +0200 Subject: [PATCH 3/3] Update swift.js --- src/languages/swift.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/swift.js b/src/languages/swift.js index 29d59c1f61..e04fd72109 100644 --- a/src/languages/swift.js +++ b/src/languages/swift.js @@ -125,11 +125,11 @@ export default function(hljs) { { className: 'meta', // @attributes begin: '(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|' + - '@NSCopying|@NSManaged|@objcMembers|@objc|@convention|@required|' + + '@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|' + '@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|' + '@infix|@prefix|@postfix|@autoclosure|@testable|@available|' + '@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|' + - '@propertyWrapper)' + '@propertyWrapper)\\b' }, {