Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Conversation

njx
Copy link

@njx njx commented Jan 9, 2014

@RaymondLim

This points the Brackets CM submodule SHA at the monkeypatch-sprint36 branch in the adobe/CodeMirror2 repo: https://github.com/adobe/CodeMirror2/tree/monkeypatch-sprint36. The only change in that branch from the SHA we'd previously merged (in #6268) is a commit that pulls in the latest xml mode from CodeMirror master. In addition to the fix for #6400, the latest xml mode fixes a bug in indentation after open tags that span multiple lines, and the changes looked reasonably harmless, so I thought it made sense to go ahead and just pull it in instead of monkeypatching just the fix for #6400.

This also re-enables the HTML code hints unit test that was failing. I ran all the unit tests (including this one) and they passed.

@ghost ghost assigned RaymondLim Jan 9, 2014
@RaymondLim
Copy link
Contributor

Looks good! Merging.

RaymondLim added a commit that referenced this pull request Jan 9, 2014
Monkeypatch CodeMirror for sprint 36 to include latest xml mode
@RaymondLim RaymondLim merged commit c2bd6ac into master Jan 9, 2014
@RaymondLim RaymondLim deleted the nj/cm-sprint36-monkeypatch branch January 9, 2014 23:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants