734432 - Add Orion ProjectionTextModel to our package

Status: RESOLVED FIXED

(DevTools :: General, defect, P2)

Description

[Mihai Sucan [:msucan]]

In the debugger (with the annotations/overview rulers) the Source Editor Orion code throws errors like these:

JavaScript error: chrome://browser/content/orion.js, line 2676: invalid 'instanceof' operand mProjectionTextModel.ProjectionTextModel

This happens when you hover the rulers and wait a bit. This is because we do not include ProjectionTextModel from upstream. The code is unused, but there's an instanceof that fails.

The error is harmless (currently).

Comment 1

[Mihai Sucan [:msucan]]

Attachment: proposed patch

Add ProjectionTextModel to Orion. This code comes from the same commit hash as the current orion.js does. This piece of code goes unused - it is used for code folding which we did not yet enable...

Should be a quick review.

Comment 2

[Mihai Sucan [:msucan]]

Attachment: [in-fx-team] updated patch

Updated the patch to include some comment fixes based on questions from sheppy - to, hopefully, make things clearer.

I also included Mark in the contributors list for scratchpad.xul for Bug 730898 because he forgot to add himself (and I also forgot).

Note: I'm not trying to make this patch a "kitchen sink", but this patch is already about "stuff that we are missing and it's not very important". If you prefer I do this in a different way please let me know. Not sure if there's value in making smaller patches and bugs just for small comment fixes.

Thank you!

Comment 3

[Rob Campbell [:rc] (:robcee)]

Comment on attachment 604761 [details] [diff] [review]
[in-fx-team] updated patch

    -   Erik Vold <[e-mail]>
+   -   Mark Capella <[e-mail]>

OK.



+			for (i = rangeEnd; i < projections.length; i++) {
+				projection = projections[i];
+				projection.start += changeCount;
+				projection.end += changeCount;
+//				if (projection._lineIndex + changeLineCount !== model.getLineAtOffset(projection.start)) {
+//					log("here");
+//				}
+				projection._lineIndex = model.getLineAtOffset(projection.start);
+//				projection._lineIndex += changeLineCount;
+			}

:P

Comment 4

[Mihai Sucan [:msucan]]

Thanks for the r+!

Comment 5

[Mihai Sucan [:msucan]]

Comment on attachment 604761 [details] [diff] [review]
[in-fx-team] updated patch

Landed:
https://hg.mozilla.org/integration/fx-team/rev/6738581dc4d0

Thanks for the r+!

Comment 6

[Rob Campbell [:rc] (:robcee)]

https://hg.mozilla.org/mozilla-central/rev/6738581dc4d0