Merge pull request #491 from haskell/mpj/cak-subsume

Add codeActionKindSubsumes back

Author: michaelpj

lsp-types/lsp-types.cabal

@@ -117,6 +117,7 @@ library
     Language.LSP.Protocol.Message.Parsing
     Language.LSP.Protocol.Message.Registration
     Language.LSP.Protocol.Message.Types
+    Language.LSP.Protocol.Types.CodeAction
     Language.LSP.Protocol.Types.Common
     Language.LSP.Protocol.Types.Edit
     Language.LSP.Protocol.Types.Lens

lsp-types/src/Language/LSP/Protocol/Types.hs

@@ -16,6 +16,8 @@ module Language.LSP.Protocol.Types (
   , module Edits
   -- ** Markup
   , module Markup
+  -- ** Code actions
+  , module CodeAction
   -- ** Progress
   , module Progress
   -- ** Semantic tokens
@@ -24,11 +26,10 @@ module Language.LSP.Protocol.Types (
   , module WatchKinds
   -- * Main LSP types and functions
   , module Generated
-  -- ** Orphan instances for the generated types
-  , module Orphans
   ) where
 
 import Language.LSP.Protocol.Internal.Types as Generated
+import Language.LSP.Protocol.Types.CodeAction as CodeAction
 import Language.LSP.Protocol.Types.Common as Common
 import Language.LSP.Protocol.Types.Location as Locations
 import Language.LSP.Protocol.Types.LspEnum as LspEnum
@@ -39,5 +40,5 @@ import Language.LSP.Protocol.Types.Singletons as Singletons
 import Language.LSP.Protocol.Types.Uri as Uri
 import Language.LSP.Protocol.Types.Uri.OsPath as Uri
 import Language.LSP.Protocol.Types.Edit as Edits
-import Language.LSP.Protocol.Types.Orphans as Orphans
+import Language.LSP.Protocol.Types.Orphans ()
 import Language.LSP.Protocol.Types.WatchKinds as WatchKinds

lsp-types/src/Language/LSP/Protocol/Types/CodeAction.hs

@@ -0,0 +1,10 @@
+module Language.LSP.Protocol.Types.CodeAction where
+
+import           Language.LSP.Protocol.Types.LspEnum
+import           Language.LSP.Protocol.Internal.Types
+import qualified Data.Text as T
+
+-- | Does the first 'CodeActionKind' subsume the other one, hierarchically. Reflexive.
+codeActionKindSubsumes :: CodeActionKind -> CodeActionKind -> Bool
+-- Simple but ugly implementation: prefix on the string representation
+codeActionKindSubsumes parent child = toEnumBaseType parent `T.isPrefixOf` toEnumBaseType child