From 0f80f9511d6346c9dac4efa8a34f150f0bf0991a Mon Sep 17 00:00:00 2001
From: Eric Freese <ericdfreese@gmail.com>
Date: Sat, 26 May 2018 14:01:03 -0600
Subject: [PATCH] Fix handling of newline + carriage return in async pty (#333)

---
 spec/async_spec.rb      | 39 +++++++++++++++++++++++++++++++++++++++
 src/async.zsh           |  5 ++++-
 zsh-autosuggestions.zsh |  5 ++++-
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/spec/async_spec.rb b/spec/async_spec.rb
index 0bcbaa1..10f1a74 100644
--- a/spec/async_spec.rb
+++ b/spec/async_spec.rb
@@ -27,6 +27,45 @@ context 'with asynchronous suggestions enabled' do
     end
   end
 
+  it 'should not add extra carriage returns before newlines' do
+    session.
+      send_string('echo "').
+      send_keys('escape').
+      send_keys('enter').
+      send_string('"').
+      send_keys('enter')
+
+    session.clear_screen
+
+    session.send_string('echo')
+    wait_for { session.content }.to eq("echo \"\n\"")
+  end
+
+  it 'should treat carriage returns and newlines as separate characters' do
+    session.
+      send_string('echo "').
+      send_keys('C-v').
+      send_keys('enter').
+      send_string('foo"').
+      send_keys('enter')
+
+    session.
+      send_string('echo "').
+      send_keys('control').
+      send_keys('enter').
+      send_string('bar"').
+      send_keys('enter')
+
+    session.clear_screen
+
+    session.
+      send_string('echo "').
+      send_keys('C-v').
+      send_keys('enter')
+
+    wait_for { session.content }.to eq('echo "^Mfoo"')
+  end
+
   describe 'exiting a subshell' do
     it 'should not cause error messages to be printed' do
       session.run_command('$(exit)')
diff --git a/src/async.zsh b/src/async.zsh
index 9a0cfaa..62e3329 100644
--- a/src/async.zsh
+++ b/src/async.zsh
@@ -17,9 +17,12 @@ _zsh_autosuggest_async_server() {
 		sleep 1 # Block for long enough for the signal to come through
 	}
 
-	# Output only newlines (not carriage return + newline)
+	# Don't add any extra carriage returns
 	stty -onlcr
 
+	# Don't translate carriage returns to newlines
+	stty -icrnl
+
 	# Silence any error messages
 	exec 2>/dev/null
 
diff --git a/zsh-autosuggestions.zsh b/zsh-autosuggestions.zsh
index 1c3eab5..e2e06be 100644
--- a/zsh-autosuggestions.zsh
+++ b/zsh-autosuggestions.zsh
@@ -595,9 +595,12 @@ _zsh_autosuggest_async_server() {
 		sleep 1 # Block for long enough for the signal to come through
 	}
 
-	# Output only newlines (not carriage return + newline)
+	# Don't add any extra carriage returns
 	stty -onlcr
 
+	# Don't translate carriage returns to newlines
+	stty -icrnl
+
 	# Silence any error messages
 	exec 2>/dev/null