Merge pull request #10360 from ffaf1/backport-3.14-extension

Add OrPatterns extension (backport #10339)
haskell · Sep 16, 2024 · a370e62 · a370e62
2 parents 7829842 + a856656
commit a370e62
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Cabal-syntax/src/Language/Haskell/Extension.hs b/Cabal-syntax/src/Language/Haskell/Extension.hs
@@ -551,8 +551,11 @@ data KnownExtension
   | -- | Allow the use of built-in syntax for list, tuple and sum type constructors
     -- rather than being exclusive to data constructors.
     ListTuplePuns
-  | -- | Support multiline strings
+  | -- | Support multiline strings.
     MultilineStrings
+  | -- | Allow use of or-pattern syntax, condensing multiple patterns
+    -- into a single one.
+    OrPatterns
   deriving (Generic, Show, Read, Eq, Ord, Enum, Bounded, Typeable, Data)
 
 instance Binary KnownExtension

diff --git a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
@@ -30,8 +30,8 @@ md5Check proxy md5Int = structureHash proxy @?= md5FromInteger md5Int
 
 md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion
 md5CheckGenericPackageDescription proxy = md5Check proxy
-    0xe40d8d67b85712f245354657d7a80165
+    0x09251b46ffc5178a7526d31e794d9c62
 
 md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
 md5CheckLocalBuildInfo proxy = md5Check proxy
-    0x94827844fdb1afedee525061749fb16f
+    0x93b7e8ebb5b9f879fa5fe49b1708b43b
diff --git a/editors/vim/syntax/cabal.vim b/editors/vim/syntax/cabal.vim
@@ -232,6 +232,7 @@ syn keyword cabalExtension contained
   \ NullaryTypeClasses
   \ NumDecimals
   \ NumericUnderscores
+  \ OrPatterns
   \ OverlappingInstances
   \ OverloadedLabels
   \ OverloadedLists
@@ -362,6 +363,7 @@ syn keyword cabalExtension contained
   \ NoMonoLocalBinds
   \ NoMonoPatBinds
   \ NoMonomorphismRestriction
+  \ NoMultilineStrings
   \ NoMultiParamTypeClasses
   \ NoMultiWayIf
   \ NoNPlusKPatterns
@@ -379,6 +381,7 @@ syn keyword cabalExtension contained
   \ NoOverloadedLists
   \ NoOverloadedRecordDot
   \ NoOverloadedStrings
+  \ NoOrPatterns
   \ NoPackageImports
   \ NoParallelArrays
   \ NoParallelListComp