Skip to content

Commit be7975f

Browse files
authored
Generalize 'Request' to 'request' in event* functions
Per #22, relaxes `request` type variable. This allows events to be sent irrespective of current `Request`.
1 parent b74e96a commit be7975f

1 file changed

Lines changed: 16 additions & 18 deletions

File tree

src/DAP/Event.hs

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ module DAP.Event
5050
import DAP.Types
5151
import DAP.Adaptor
5252
----------------------------------------------------------------------------
53-
sendBreakpointEvent :: BreakpointEvent -> Adaptor app Request ()
53+
sendBreakpointEvent :: BreakpointEvent -> Adaptor app request ()
5454
sendBreakpointEvent = sendSuccesfulEvent EventTypeBreakpoint . setBody
5555
----------------------------------------------------------------------------
56-
sendCapabilitiesEvent :: CapabilitiesEvent -> Adaptor app Request ()
56+
sendCapabilitiesEvent :: CapabilitiesEvent -> Adaptor app request ()
5757
sendCapabilitiesEvent = sendSuccesfulEvent EventTypeCapabilities . setBody
5858
----------------------------------------------------------------------------
59-
sendContinuedEvent :: ContinuedEvent -> Adaptor app Request ()
59+
sendContinuedEvent :: ContinuedEvent -> Adaptor app request ()
6060
sendContinuedEvent = sendSuccesfulEvent EventTypeContinued . setBody
6161
----------------------------------------------------------------------------
6262
defaultContinuedEvent :: ContinuedEvent
@@ -66,7 +66,7 @@ defaultContinuedEvent
6666
, continuedEventAllThreadsContinued = False
6767
}
6868
----------------------------------------------------------------------------
69-
sendExitedEvent :: ExitedEvent -> Adaptor app Request ()
69+
sendExitedEvent :: ExitedEvent -> Adaptor app request ()
7070
sendExitedEvent = sendSuccesfulEvent EventTypeExited . setBody
7171
----------------------------------------------------------------------------
7272
defaultExitedEvent :: ExitedEvent
@@ -75,10 +75,10 @@ defaultExitedEvent
7575
{ exitedEventExitCode = 0
7676
}
7777
----------------------------------------------------------------------------
78-
sendInitializedEvent :: Adaptor app Request ()
78+
sendInitializedEvent :: Adaptor app request ()
7979
sendInitializedEvent = sendSuccesfulEvent EventTypeInitialized (pure ())
8080
----------------------------------------------------------------------------
81-
sendInvalidatedEvent :: InvalidatedEvent -> Adaptor app Request ()
81+
sendInvalidatedEvent :: InvalidatedEvent -> Adaptor app request ()
8282
sendInvalidatedEvent = sendSuccesfulEvent EventTypeInvalidated . setBody
8383
----------------------------------------------------------------------------
8484
defaultInvalidatedEvent :: InvalidatedEvent
@@ -88,12 +88,11 @@ defaultInvalidatedEvent
8888
, invalidatedEventThreadId = Nothing
8989
, invalidatedEventStackFrameId = Nothing
9090
}
91-
9291
----------------------------------------------------------------------------
93-
sendLoadedSourceEvent :: LoadedSourceEvent -> Adaptor app Request ()
92+
sendLoadedSourceEvent :: LoadedSourceEvent -> Adaptor app request ()
9493
sendLoadedSourceEvent = sendSuccesfulEvent EventTypeLoadedSource . setBody
9594
----------------------------------------------------------------------------
96-
sendMemoryEvent :: MemoryEvent -> Adaptor app Request ()
95+
sendMemoryEvent :: MemoryEvent -> Adaptor app request ()
9796
sendMemoryEvent = sendSuccesfulEvent EventTypeMemory . setBody
9897
----------------------------------------------------------------------------
9998
defaultMemoryEvent :: MemoryEvent
@@ -104,7 +103,7 @@ defaultMemoryEvent
104103
, memoryEventCount = 0
105104
}
106105
----------------------------------------------------------------------------
107-
sendModuleEvent :: ModuleEvent -> Adaptor app Request ()
106+
sendModuleEvent :: ModuleEvent -> Adaptor app request ()
108107
sendModuleEvent = sendSuccesfulEvent EventTypeModule . setBody
109108
----------------------------------------------------------------------------
110109
sendOutputEvent :: OutputEvent -> Adaptor app request ()
@@ -123,7 +122,7 @@ defaultOutputEvent
123122
, outputEventData = Nothing
124123
}
125124
----------------------------------------------------------------------------
126-
sendProcessEvent :: ProcessEvent -> Adaptor app Request ()
125+
sendProcessEvent :: ProcessEvent -> Adaptor app request ()
127126
sendProcessEvent = sendSuccesfulEvent EventTypeProcess . setBody
128127
----------------------------------------------------------------------------
129128
defaultProcessEvent :: ProcessEvent
@@ -136,7 +135,7 @@ defaultProcessEvent
136135
, processEventPointerSize = Nothing
137136
}
138137
----------------------------------------------------------------------------
139-
sendProgressEndEvent :: ProgressEndEvent -> Adaptor app Request ()
138+
sendProgressEndEvent :: ProgressEndEvent -> Adaptor app request ()
140139
sendProgressEndEvent = sendSuccesfulEvent EventTypeProgressEnd . setBody
141140
----------------------------------------------------------------------------
142141
defaultProgressEndEvent :: ProgressEndEvent
@@ -146,7 +145,7 @@ defaultProgressEndEvent
146145
, progressEndEventMessage = Nothing
147146
}
148147
----------------------------------------------------------------------------
149-
sendProgressStartEvent :: ProgressStartEvent -> Adaptor app Request ()
148+
sendProgressStartEvent :: ProgressStartEvent -> Adaptor app request ()
150149
sendProgressStartEvent = sendSuccesfulEvent EventTypeProgressStart . setBody
151150
----------------------------------------------------------------------------
152151
defaultProgressStartEvent :: ProgressStartEvent
@@ -160,7 +159,7 @@ defaultProgressStartEvent
160159
, progressStartEventPercentage = Nothing
161160
}
162161
----------------------------------------------------------------------------
163-
sendProgressUpdateEvent :: ProgressUpdateEvent -> Adaptor app Request ()
162+
sendProgressUpdateEvent :: ProgressUpdateEvent -> Adaptor app request ()
164163
sendProgressUpdateEvent = sendSuccesfulEvent EventTypeProgressUpdate . setBody
165164
----------------------------------------------------------------------------
166165
defaultProgressUpdateEvent :: ProgressUpdateEvent
@@ -171,7 +170,7 @@ defaultProgressUpdateEvent
171170
, progressUpdateEventPercentage = Nothing
172171
}
173172
----------------------------------------------------------------------------
174-
sendStoppedEvent :: StoppedEvent -> Adaptor app Request ()
173+
sendStoppedEvent :: StoppedEvent -> Adaptor app request ()
175174
sendStoppedEvent = sendSuccesfulEvent EventTypeStopped . setBody
176175
----------------------------------------------------------------------------
177176
defaultStoppedEvent :: StoppedEvent
@@ -186,7 +185,7 @@ defaultStoppedEvent
186185
, stoppedEventHitBreakpointIds = []
187186
}
188187
----------------------------------------------------------------------------
189-
sendTerminatedEvent :: TerminatedEvent -> Adaptor app Request ()
188+
sendTerminatedEvent :: TerminatedEvent -> Adaptor app request ()
190189
sendTerminatedEvent = sendSuccesfulEvent EventTypeTerminated . setBody
191190
----------------------------------------------------------------------------
192191
defaultTerminatedEvent :: TerminatedEvent
@@ -195,7 +194,7 @@ defaultTerminatedEvent
195194
{ terminatedEventRestart = False
196195
}
197196
----------------------------------------------------------------------------
198-
sendThreadEvent :: ThreadEvent -> Adaptor app Request ()
197+
sendThreadEvent :: ThreadEvent -> Adaptor app request ()
199198
sendThreadEvent = sendSuccesfulEvent EventTypeThread . setBody
200199
----------------------------------------------------------------------------
201200
defaultThreadEvent :: ThreadEvent
@@ -205,4 +204,3 @@ defaultThreadEvent
205204
, threadEventThreadId = 0
206205
}
207206
----------------------------------------------------------------------------
208-

0 commit comments

Comments
 (0)