Bug 153529 – CodeMirror will strip out "\r" from files with "\r\n" as newlines causing our offsets into the file to be incorrect

• Status: RESOLVED
• Resolution: FIXED
• Component: Web Inspector

[Saam Barati]

I'm guessing this is parser related.

[Saam Barati]

Created attachment 269972 [details]
example file

[Saam Barati]

Created attachment 269973 [details]
image

what that file looks like in inspector

[Saam Barati]

This is a bug relating to how we use CodeMirror.

[Radar WebKit Bug Importer]

<rdar://problem/24376799>

[Radar WebKit Bug Importer]

<rdar://problem/24376840>

[Saam Barati]

Created attachment 270047 [details]
patch

[Blaze Burg]

Comment on attachment 270047 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=270047&action=review

> Source/WebInspectorUI/UserInterface/Views/CodeMirrorEditor.js:31
> +            options.lineSeparator = "\n";

Why does this make CodeMirror leave the \r alone?

[Saam Barati]

(In reply to comment #7)
> Comment on attachment 270047 [details]
> patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=270047&action=review
> 
> > Source/WebInspectorUI/UserInterface/Views/CodeMirrorEditor.js:31
> > +            options.lineSeparator = "\n";
> 
> Why does this make CodeMirror leave the \r alone?

It will trust us and use "\n" as the newline terminator
instead of its own default thing that takes into account
"\r"

[Timothy Hatcher]

Comment on attachment 270047 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=270047&action=review

>> Source/WebInspectorUI/UserInterface/Views/CodeMirrorEditor.js:31
>> +            options.lineSeparator = "\n";
> 
> Why does this make CodeMirror leave the \r alone?

I suspect the \r will be there in the editor on the end of the lines, but will be invisible.

[Timothy Hatcher]

Does CodeMirror render the \r? From the code it looks like it might:

 var txt = content.appendChild(elt("span", m[0] == "\r" ? "␍" : "␤", "cm-invalidchar"));
 txt.setAttribute("cm-text", m[0]);
 builder.col += 1;

[Saam Barati]

(In reply to comment #10)
> Does CodeMirror render the \r? From the code it looks like it might:
> 
>  var txt = content.appendChild(elt("span", m[0] == "\r" ? "␍" : "␤",
> "cm-invalidchar"));
>  txt.setAttribute("cm-text", m[0]);
>  builder.col += 1;

It does.

[WebKit Commit Bot]

Comment on attachment 270047 [details]
patch

Clearing flags on attachment: 270047

Committed r195723: <http://trac.webkit.org/changeset/195723>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.