From 2f091b829c919a7980c5b7df10fb4d454c997b76 Mon Sep 17 00:00:00 2001
From: anseki <AnSeki.aff@gmail.com>
Date: Mon, 30 Mar 2015 19:36:31 +0900
Subject: [PATCH] Change the way to exit from input.

---
 lib/read.ps1         | 33 +++++++++++++++------------------
 lib/readline-sync.js |  2 +-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/lib/read.ps1 b/lib/read.ps1
index 78d4831..2aebe75 100644
--- a/lib/read.ps1
+++ b/lib/read.ps1
@@ -36,7 +36,7 @@ if ($options.encoded) {
 [bool] $isCooked = (-not $options.noEchoBack) -and (-not $options.keyIn)
 
 function writeTTY ($text) {
-  execWithTTY ('Write-Host ''' + ($text -replace '''', '''''') + ''' -NoNewline')
+  execWithTTY ('Write-Host ''' + ($text -replace '''', '''''') + ''' -NoNewline') | Out-Null
   $script:isInputLine = $True
 }
 
@@ -69,35 +69,32 @@ if ($options.noEchoBack -and (-not $options.keyIn) -and ($options.mask -eq '*'))
 if ($options.keyIn) { $reqSize = 1 }
 
 while ($True) {
-  if ($isCooked) {
-    $chunk = execWithTTY 'Read-Host' $True
-    $chunk += "`n"
-  } else { # raw
+  if (-not $isCooked) {
     $chunk = execWithTTY '[System.Console]::ReadKey($True).KeyChar' $True
+    $chunk = $chunk -replace '[\r\n]', ''
+    if ($chunk -eq '') { $isEol = $True } # NL or empty-text was input
+  } else {
+    $chunk = execWithTTY 'Read-Host' $True
+    $chunk = $chunk -replace '[\r\n]', ''
+    $isEol = $True
   }
 
-  if ($chunk -eq '') { break }
   # other ctrl-chars
   $chunk = $chunk -replace '[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]', ''
-  if ($chunk -eq '') { continue }
 
-  if (-not $isCooked) {
-    $displayTmp = $chunk -replace '[\r\n]', ''
-    if ($displayTmp -ne '') {
-      if ($options.noEchoBack) {
-        if ($options.mask -eq '') { $displayTmp = '' }
-        else { $displayTmp = $options.mask * $displayTmp.Length }
-      }
-      if ($displayTmp -ne '') { writeTTY $displayTmp }
+  if ($chunk -ne '' -and (-not $isCooked)) {
+    if (-not $options.noEchoBack) {
+      writeTTY $chunk
+    } elseif ($options.mask -ne '') {
+      writeTTY ($options.mask * $chunk.Length)
     }
   }
 
   $inputTTY += $chunk
-  if (($inputTTY -match '[\r\n]$') -or
-    ($options.keyIn -and ($inputTTY.Length -ge $reqSize))) { break }
+  if ($isEol -or ($options.keyIn -and ($inputTTY.Length -ge $reqSize))) { break }
 }
 
 if ((-not $isCooked) -and (-not ($options.keyIn -and (-not $isInputLine))))
-  { execWithTTY 'Write-Host ''''' } # new line
+  { execWithTTY 'Write-Host ''''' | Out-Null } # new line
 
 return '''' + $inputTTY + ''''
diff --git a/lib/readline-sync.js b/lib/readline-sync.js
index 3397ff8..d238ddd 100644
--- a/lib/readline-sync.js
+++ b/lib/readline-sync.js
@@ -241,7 +241,7 @@ function readlineExt(options) {
     res = _execFileSync(options, execOptions);
   }
   if (!res.error) {
-    res.input = res.input.replace(/^'|'$/g, '');
+    res.input = res.input.replace(/^\s*'|'\s*$/g, '');
     options.display = '';
   }