NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitcd9f3de

committed

[fsharpi]: add kill-to-end-of-line (control-k), fix control-p and control-n (F# uses decimals, not octals), and make control-d delete char when not at the end

1 parent6c3c810 commitcd9f3deCopy full SHA for cd9f3de

File tree

1 file changed

+16

-3

lines changed

src/fsharp/fsi
- console.fs

1 file changed

+16

-3

lines changed

`‎src/fsharp/fsi/console.fs‎`

Lines changed: 16 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,11 @@ type ReadLineConsole() =`
`344`	`344`	`input.Remove(!current,1)\|> ignore;`
`345`	`345`	`render();`
`346`	`346`
	`347`	`+letdeleteToEndOfLine()=`
	`348`	`+if(!current< input.Length)then`
	`349`	`+ input.Remove(!current, input.Length-!current)\|> ignore;`
	`350`	`+ render();`
	`351`	`+`
`347`	`352`	`letinsert(key:ConsoleKeyInfo)=`
`348`	`353`	`// REVIEW: is this F6 rewrite required? 0x1A looks like Ctrl-Z.`
`349`	`354`	`// REVIEW: the Ctrl-Z code is not recognised as EOF by the lexer.`
`@@ -425,17 +430,25 @@ type ReadLineConsole() =`
`425`	`430`	`\|(ConsoleModifiers.Control, '\006')->`
`426`	`431`	`moveRight()`
`427`	`432`	`change()`
	`433`	`+// Control-k delete to end of line`
	`434`	`+\|(ConsoleModifiers.Control, '\011')->`
	`435`	`+ deleteToEndOfLine()`
	`436`	`+ change()`
`428`	`437`	`// Control-P`
`429`		`-\|(ConsoleModifiers.Control, '\020')->`
	`438`	`+\|(ConsoleModifiers.Control, '\016')->`
`430`	`439`	`setInput(history.Previous());`
`431`	`440`	`change()`
`432`	`441`	`// Control-n`
`433`		`-\|(ConsoleModifiers.Control, '\016')->`
	`442`	`+\|(ConsoleModifiers.Control, '\014')->`
`434`	`443`	`setInput(history.Next());`
`435`	`444`	`change()`
`436`	`445`	`// Control-d`
`437`	`446`	`\|(ConsoleModifiers.Control, '\004')->`
`438`		`- raise<\|new System.IO.EndOfStreamException()`
	`447`	`+if(input.Length=0)then`
	`448`	`+ raise<\|new System.IO.EndOfStreamException()`
	`449`	`+else`
	`450`	`+ delete();`
	`451`	`+ change()`
`439`	`452`	`\|_->`
`440`	`453`	`// Note: If KeyChar=0, the not a proper char, e.g. it could be part of a multi key-press character,`
`441`	`454`	`// e.g. e-acute is ' and e with the French (Belgium) IME and US Intl KB.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcd9f3de

File tree

1 file changed

1 file changed

`‎src/fsharp/fsi/console.fs‎`

0 commit comments