From b0c066e362d60e8e1eb434e93086bdb19ee14038 Mon Sep 17 00:00:00 2001 From: Allan Renucci Date: Thu, 1 Nov 2018 10:06:44 +0100 Subject: [PATCH] Fix #5359: Use normal characters as delimiter for REPL output Using characters within the private use area was too fancy for Windows --- .../tools/languageserver/worksheet/InputStreamConsumer.scala | 2 +- .../src/dotty/tools/languageserver/worksheet/ReplProcess.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/language-server/src/dotty/tools/languageserver/worksheet/InputStreamConsumer.scala b/language-server/src/dotty/tools/languageserver/worksheet/InputStreamConsumer.scala index 871bb47eb09c..baac4df9e88a 100644 --- a/language-server/src/dotty/tools/languageserver/worksheet/InputStreamConsumer.scala +++ b/language-server/src/dotty/tools/languageserver/worksheet/InputStreamConsumer.scala @@ -21,5 +21,5 @@ class InputStreamConsumer(in: InputStream) { } object InputStreamConsumer { - def delimiter = "\uE000" // withing private use area + def delimiter = "##!!##" } diff --git a/language-server/src/dotty/tools/languageserver/worksheet/ReplProcess.scala b/language-server/src/dotty/tools/languageserver/worksheet/ReplProcess.scala index 57f2bde33659..faed5754861e 100644 --- a/language-server/src/dotty/tools/languageserver/worksheet/ReplProcess.scala +++ b/language-server/src/dotty/tools/languageserver/worksheet/ReplProcess.scala @@ -11,7 +11,8 @@ object ReplProcess { while (true) { val code = in.next() // blocking state = driver.run(code)(state) - print(InputStreamConsumer.delimiter) // needed to mark the end of REPL output + Console.print(InputStreamConsumer.delimiter) // needed to mark the end of REPL output + Console.flush() } } }