Skip to content

Fixed error detection in move_cursor_at_leftmost #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gwenn merged 1 commit into from
Sep 2, 2020
Merged

Fixed error detection in move_cursor_at_leftmost #434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/tty/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use log::{debug, warn};
use unicode_segmentation::UnicodeSegmentation;
use unicode_width::UnicodeWidthStr;
use winapi::shared::minwindef::{BOOL, DWORD, FALSE, TRUE, WORD};
use winapi::shared::winerror;
use winapi::um::winnt::{CHAR, HANDLE};
use winapi::um::{consoleapi, handleapi, processenv, winbase, wincon, winuser};

Expand Down Expand Up @@ -513,7 +514,7 @@ impl Renderer for ConsoleRenderer {
info.dwCursorPosition.Y += 1;
let res = self.set_console_cursor_position(info.dwCursorPosition);
if let Err(error::ReadlineError::Io(ref e)) = res {
if e.kind() == ErrorKind::Other && e.raw_os_error() == Some(87) {
if e.raw_os_error() == Some(winerror::ERROR_INVALID_PARAMETER as i32) {
warn!(target: "rustyline", "invalid cursor position: ({:?}, {:?}) in ({:?}, {:?})", info.dwCursorPosition.X, info.dwCursorPosition.Y, info.dwSize.X, info.dwSize.Y);
println!();
return Ok(());
Expand Down