From 92228fd8eb96014d48848e6acf5648c3211e156b Mon Sep 17 00:00:00 2001 From: chessai Date: Mon, 26 Nov 2018 22:28:54 -0500 Subject: [PATCH 1/2] parse more stuff in .cabal files --- yi-misc-modes/src/Yi/Lexer/Cabal.x | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yi-misc-modes/src/Yi/Lexer/Cabal.x b/yi-misc-modes/src/Yi/Lexer/Cabal.x index 3cb745504..7f50fcae3 100644 --- a/yi-misc-modes/src/Yi/Lexer/Cabal.x +++ b/yi-misc-modes/src/Yi/Lexer/Cabal.x @@ -51,8 +51,12 @@ $nl = [\n\r] @reservedid = GPL |LGPL + |BSD2 |BSD3 |BSD4 + |BSD\-2\-Clause + |BSD\-3\-Clause + |BSD\-4\-Clause |PublicDomain |AllRightsReserved |OtherLicense @@ -80,6 +84,7 @@ $nl = [\n\r] |[Dd]ata\-[Dd]ir |[Dd]ata\-[Ff]iles |[Dd]efault + |[Dd]efault\-[Ll]anguage |[Dd]escription |[Ee]xecutable |[Ee]xposed From 6b7a6cfac2d6826a9b82249cc85152117fface6e Mon Sep 17 00:00:00 2001 From: chessai Date: Mon, 26 Nov 2018 22:50:55 -0500 Subject: [PATCH 2/2] add remaining knownLicenses --- yi-misc-modes/src/Yi/Lexer/Cabal.x | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/yi-misc-modes/src/Yi/Lexer/Cabal.x b/yi-misc-modes/src/Yi/Lexer/Cabal.x index 7f50fcae3..ec8141ed5 100644 --- a/yi-misc-modes/src/Yi/Lexer/Cabal.x +++ b/yi-misc-modes/src/Yi/Lexer/Cabal.x @@ -50,13 +50,24 @@ $nl = [\n\r] @reservedid = GPL + |GPL\-2 + |GPL\-3 + |AGPL + |AGPL\-3 |LGPL + |LGPL\-2\.1 + |LGPL\-3 |BSD2 |BSD3 |BSD4 |BSD\-2\-Clause |BSD\-3\-Clause |BSD\-4\-Clause + |MIT + |ISC + |MPL\-2\.0 + |Apache + |Apache\-2\.0 |PublicDomain |AllRightsReserved |OtherLicense