-
Notifications
You must be signed in to change notification settings - Fork 131
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.
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
Support '\r' and '\r\n' line endings, closes scala/bug#5669 #164
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,10 +34,14 @@ case class OffsetPosition(source: CharSequence, offset: Int) extends Position { | |
|
||
private def genIndex: Array[Int] = { | ||
val lineStarts = new ArrayBuffer[Int] | ||
lineStarts += 0 | ||
for (i <- 0 until source.length) | ||
if (source.charAt(i) == '\n') lineStarts += (i + 1) | ||
lineStarts += source.length | ||
lineStarts += 0 // first line | ||
for (i <- 0 until source.length) { | ||
if (i >= 1 && source.charAt(i - 1) == '\n') // \n or \r\n | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the majority of the time the last character won't be a |
||
lineStarts += i | ||
else if (i >= 1 && source.charAt(i - 1) == '\r' && source.charAt(i) != '\n') // \r but not \r\n | ||
lineStarts += i | ||
} | ||
lineStarts += source.length // eof | ||
lineStarts.toArray | ||
} | ||
|
||
|
@@ -63,11 +67,14 @@ case class OffsetPosition(source: CharSequence, offset: Int) extends Position { | |
def lineContents: String = { | ||
val lineStart = index(line - 1) | ||
val lineEnd = index(line) | ||
val endIndex = if ( lineStart < lineEnd && source.charAt(lineEnd - 1) == '\n') { | ||
lineEnd - 1 | ||
} else { | ||
lineEnd | ||
} | ||
val endIndex = | ||
if (lineStart < lineEnd - 1 && source.charAt(lineEnd - 2) == '\r' && source.charAt(lineEnd - 1) == '\n') { | ||
lineEnd - 2 | ||
} else if (lineStart < lineEnd && (source.charAt(lineEnd - 1) == '\r' || source.charAt(lineEnd - 1) == '\n')) { | ||
lineEnd - 1 | ||
} else { | ||
lineEnd | ||
} | ||
source.subSequence(lineStart, endIndex).toString | ||
} | ||
|
||
|
14 changes: 14 additions & 0 deletions
14
shared/src/test/scala/scala/util/parsing/combinator/t5669.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package scala.util.parsing.combinator | ||
|
||
import scala.util.parsing.input.OffsetPosition | ||
|
||
import org.junit.Test | ||
import org.junit.Assert.assertEquals | ||
|
||
class t5669 { | ||
@Test | ||
def test: Unit = { | ||
val op = new OffsetPosition("foo\rbar", 4) | ||
assertEquals(2, op.line) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
may as well use
for i <- 1 until source.length
and remove theif i>= 1
checks below