Upgrade CodeMirror to 3.21

RESOLVED FIXED in Firefox 29

Status

defect
P2
normal
RESOLVED FIXED
6 years ago
Last year

People

(Reporter: anton, Assigned: anton)

Tracking

Trunk
Firefox 29
x86
macOS
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

This update adds ES6 support and fixes some bugs we encountered.
Blocks: 959803
Posted patch WIP 1Splinter Review
CodeMirror 3.21 Release Notes:

* Auto-indenting a block will no longer add trailing whitespace to blank lines.
* Marking text has a new option clearWhenEmpty to control auto-removal.
* Several bugfixes in the handling of bidirectional text.
* The XML and CSS modes were largely rewritten. LESS support was
added to the CSS mode.
* The OCaml mode was moved to an mllike mode, F# support added.
* Make it possible to fetch multiple applicable helper values with
getHelpers, and to register helpers matched on predicates with
registerGlobalHelper.
* New theme pastel-on-dark.
* Better ECMAScript 6 support in JavaScript mode.

As for manual changes, I've updated the README to be more specific and reverted a fix from bug 865448 because it's not needed anymore and it was breaking stuff.

Try: https://tbpl.mozilla.org/?tree=Try&rev=e45cf561f8e3
Attachment #8361347 - Flags: review?(mihai.sucan)
Comment on attachment 8361347 [details] [diff] [review]
WIP 1

Review of attachment 8361347 [details] [diff] [review]:
-----------------------------------------------------------------

LGTM.

::: browser/devtools/sourceeditor/codemirror/README
@@ +25,5 @@
> +   co-exist with Mozilla's testing infrastructure.
> + * In cm_comment_test.js comment out fallbackToBlock and fallbackToLine
> +   tests.
> + * The search addon (search.js) was slightly modified to make search
> +   UI localizable.

How can we see what was changed? Do you have some patch files? If someone wants to update CM we should see what is patched in the current version.

::: browser/devtools/sourceeditor/codemirror/activeline.js
@@ -1,4 @@
> -/* vim:set ts=2 sw=2 sts=2 et tw=80:
> - * This Source Code Form is subject to the terms of the Mozilla Public
> - * License, v. 2.0. If a copy of the MPL was not distributed with this
> - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

Any reason why MPL license boilerplate was removed here?
Attachment #8361347 - Flags: review?(mihai.sucan) → review+
> How can we see what was changed? Do you have some patch files?

Good point, maybe add exact steps to the README? I personally just do a diff of our version against CodeMirror's.

> Any reason why MPL license boilerplate was removed here?

It was incorrectly there since activeline.js is taken from the CodeMirror distribution.
https://hg.mozilla.org/integration/fx-team/rev/be8955ab1b41

Once it is merged to m-c and this bug is marked as RESOLVED FIXED, I will go over all blocked bugs, verify that they are fixed and close them as well.
Whiteboard: [fixed-in-fx-team]
https://hg.mozilla.org/mozilla-central/rev/be8955ab1b41
Status: ASSIGNED → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Whiteboard: [fixed-in-fx-team]
Target Milestone: --- → Firefox 29
Product: Firefox → DevTools
You need to log in before you can comment on or make changes to this bug.