Commit19283e7

committed

Improve handling of buffer when line ends with /r

1 parent241dbc6 commit19283e7Copy full SHA for 19283e7

File tree

+11

-7

lines changed

+11

-7

lines changed

Lines changed: 11 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -180,21 +180,25 @@ let readLinesAsync (reader: System.IO.StreamReader) trigger =`
`180`	`180`	`letcharBuffer=`
`181`	`181`	`letmaxCharsInBuffer= encoding.GetMaxCharCount byteBuffer.Length`
`182`	`182`	`Array.zeroCreate maxCharsInBuffer`
`183`		`-`
	`183`	`+`
`184`	`184`	`let recfindLinesInBuffer pos=`
`185`	`185`	`if pos>= buffer.Lengththen max(buffer.Length-1)0// exit and point to the last char`
`186`	`186`	`else`
`187`	`187`	`letc= buffer.[pos]`
`188`		`-if c='\r'\|\| c='\n'then`
	`188`	`+letdeletePos=match cwith`
	`189`	`+\|'\r'when(pos+1)< buffer.Length&& buffer.[pos+1]='\n'-> Some(pos+2)`
	`190`	`+\|'\r'when(pos+1)= buffer.Length-> None`
	`191`	`+\|'\r'-> Some(pos+1)`
	`192`	`+\|'\n'-> Some(pos+1)`
	`193`	`+\|_-> None`
	`194`	`+`
	`195`	`+match deletePoswith`
	`196`	`+\| Some deletePos->`
`189`	`197`	`letline= buffer.ToString(0, pos)`
`190`	`198`	`trigger line`
`191`		`-`
`192`		`-letdeletePos=`
`193`		`-if c='\r'&&(pos+1)< buffer.Length&& buffer.[pos+1]='\n'then pos+2else pos+1`
`194`	`199`	`buffer.Remove(0, deletePos)\|> ignore`
`195`	`200`	`findLinesInBuffer0`
`196`		`-else`
`197`		`- findLinesInBuffer(pos+1)`
	`201`	`+\| None-> findLinesInBuffer(pos+1)`
`198`	`202`
`199`	`203`	`let recread pos=`
`200`	`204`	`async{`

Comments

(0)