Commit08c0f88

drivehappy

authored and

KevinRansom

committed

Fixed the insertion of an open declaration that assumed the document had Environment.NewLine line breaks. This would cause a unix-line ending source file to incorrectly be populated with CRLF when working under Windows. (#4487)

1 parent3846384 commit08c0f88Copy full SHA for 08c0f88

File tree

1 file changed

-2

lines changed

vsintegration/src/FSharp.Editor/Common
- RoslynHelpers.fs

1 file changed

-2

lines changed

`‎vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs‎`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,15 @@ module internal OpenDeclarationHelper =`
`171`	`171`	`let mutableminPos= None`
`172`	`172`
`173`	`173`	`letinsert line lineStr(sourceText:SourceText):SourceText=`
`174`		`-letpos= sourceText.Lines.[line].Start`
	`174`	`+letln= sourceText.Lines.[line]`
	`175`	`+letpos= ln.Start`
`175`	`176`	`minPos<-match minPoswith None-> Some pos\| Some oldPos-> Some(min oldPos pos)`
`176`		`- sourceText.WithChanges(TextChange(TextSpan(pos,0), lineStr+ Environment.NewLine))`
	`177`	`+`
	`178`	`+// find the line break characters on the previous line to use, Environment.NewLine should not be used`
	`179`	`+// as it makes assumptions on the line endings in the source.`
	`180`	`+letlineBreak= ln.Text.ToString(TextSpan(ln.End, ln.EndIncludingLineBreak- ln.End))`
	`181`	`+`
	`182`	`+ sourceText.WithChanges(TextChange(TextSpan(pos,0), lineStr+ lineBreak))`
`177`	`183`
`178`	`184`	`letgetLineStr line= sourceText.Lines.[line].ToString().Trim()`
`179`	`185`	`letpos= ParsedInput.adjustInsertionPoint getLineStr ctx`

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!

Commit08c0f88

File tree

1 file changed

1 file changed

`‎vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs‎`

0 commit comments