Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions server/stdio.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,11 @@ func (s *StdioServer) processMessage(
line string,
writer io.Writer,
) error {
// If line is empty, likely due to ctx cancellation
if len(line) == 0 {
return nil
}

// Parse the message as raw JSON
var rawMessage json.RawMessage
if err := json.Unmarshal([]byte(line), &rawMessage); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions server/stdio_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ func TestStdioServer(t *testing.T) {
if err != nil && err != io.EOF && err != context.Canceled {
serverErrCh <- err
}
stdoutWriter.Close()
close(serverErrCh)
}()

Expand Down Expand Up @@ -106,7 +107,6 @@ func TestStdioServer(t *testing.T) {
// Clean up
cancel()
stdinWriter.Close()
stdoutWriter.Close()

// Check for server errors
if err := <-serverErrCh; err != nil {
Expand Down Expand Up @@ -162,6 +162,7 @@ func TestStdioServer(t *testing.T) {
if err != nil && err != io.EOF && err != context.Canceled {
serverErrCh <- err
}
stdoutWriter.Close()
close(serverErrCh)
}()

Expand Down Expand Up @@ -260,7 +261,6 @@ func TestStdioServer(t *testing.T) {
// Clean up
cancel()
stdinWriter.Close()
stdoutWriter.Close()

// Check for server errors
if err := <-serverErrCh; err != nil {
Expand Down