From b8ae727c1567cfb032e06e2330ba995e63114d26 Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Fri, 19 Sep 2014 15:52:23 +0200 Subject: [PATCH 01/83] Bump version number post-4.6 --- bower.json | 2 +- doc/manual.html | 2 +- lib/codemirror.js | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index 638b9d0016..c3fa181f72 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "codemirror", - "version":"4.6.0", + "version":"4.6.1", "main": ["lib/codemirror.js", "lib/codemirror.css"], "ignore": [ "**/.*", diff --git a/doc/manual.html b/doc/manual.html index 5520a738b5..e0378103f7 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -63,7 +63,7 @@

User manual and reference guide - version 4.6.0 + version 4.6.1

CodeMirror is a code-editor component that can be embedded in diff --git a/lib/codemirror.js b/lib/codemirror.js index 97f6668e73..4059e03d0a 100644 --- a/lib/codemirror.js +++ b/lib/codemirror.js @@ -7825,7 +7825,7 @@ // THE END - CodeMirror.version = "4.6.0"; + CodeMirror.version = "4.6.1"; return CodeMirror; }); diff --git a/package.json b/package.json index 924c076f2c..d0d76c0715 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codemirror", - "version":"4.6.0", + "version":"4.6.1", "main": "lib/codemirror.js", "description": "In-browser code editing made bearable", "licenses": [{"type": "MIT", From 56f9e5cc28afdc7884e2ac4be8e588f46f63aa8a Mon Sep 17 00:00:00 2001 From: Beni Cherniavsky-Paskin Date: Fri, 19 Sep 2014 02:26:11 +0300 Subject: [PATCH 02/83] [markdown mode] test case for #2813 after header immediately followed by a code block, GFM formatting is broken (SHA, #issue, URLs). overlay.codeBlock gets it wrong (false inside fenced block, true after). Not yet sure why. --- mode/gfm/test.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mode/gfm/test.js b/mode/gfm/test.js index 78ffff2d7b..b9af5e894c 100644 --- a/mode/gfm/test.js +++ b/mode/gfm/test.js @@ -150,4 +150,15 @@ "[comment `foo]", "", "[link http://www.example.com/]"); + + MT("headerCodeBlockGithub", + "[header&header-1 # heading]", + "", + "[comment ```]", + "[comment code]", + "[comment ```]", + "", + "Commit: [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2]", + "Issue: [link #1]", + "Link: [link http://www.example.com/]"); })(); From ed21e488b95fbbca656ae77410c1ce0b6f3eea31 Mon Sep 17 00:00:00 2001 From: Brandon Frohs Date: Sun, 21 Sep 2014 02:46:11 -0400 Subject: [PATCH 03/83] [markdown] Fix handling of forced blank lines (after headers) Closes #2813 --- mode/markdown/markdown.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js index 1bad78d65e..3eb7747e60 100644 --- a/mode/markdown/markdown.js +++ b/mode/markdown/markdown.js @@ -700,14 +700,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { state.formatting = false; if (stream.sol()) { - var forceBlankLine = stream.match(/^\s*$/, true) || state.header; + var forceBlankLine = !!state.header; // Reset state.header state.header = 0; - if (forceBlankLine) { + if (stream.match(/^\s*$/, true) || forceBlankLine) { state.prevLineHasContent = false; - return blankLine(state); + blankLine(state); + return forceBlankLine ? this.token(stream, state) : null; } else { state.prevLineHasContent = state.thisLineHasContent; state.thisLineHasContent = true; From 6120e8d64308573784919911fe3930acbee6acf1 Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Mon, 22 Sep 2014 13:01:15 +0200 Subject: [PATCH 04/83] [dylan mode] Remove executable flag on mode demo page Closes #2816 --- mode/dylan/index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 mode/dylan/index.html diff --git a/mode/dylan/index.html b/mode/dylan/index.html old mode 100755 new mode 100644 From 50cf44c40c339db5084d79b24b973771535e0cd8 Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Tue, 23 Sep 2014 15:55:09 +0200 Subject: [PATCH 05/83] Move to new github repository (under codemirror organization) --- CONTRIBUTING.md | 4 +-- README.md | 2 +- demo/activeline.html | 2 +- demo/anywordhint.html | 2 +- demo/bidi.html | 4 +-- demo/btree.html | 2 +- demo/buffers.html | 2 +- demo/changemode.html | 2 +- demo/closebrackets.html | 2 +- demo/closetag.html | 2 +- demo/complete.html | 2 +- demo/emacs.html | 2 +- demo/folding.html | 2 +- demo/fullscreen.html | 2 +- demo/hardwrap.html | 2 +- demo/html5complete.html | 2 +- demo/indentwrap.html | 2 +- demo/lint.html | 2 +- demo/loadmode.html | 2 +- demo/marker.html | 2 +- demo/markselection.html | 2 +- demo/matchhighlighter.html | 2 +- demo/matchtags.html | 2 +- demo/merge.html | 2 +- demo/multiplex.html | 2 +- demo/mustache.html | 2 +- demo/placeholder.html | 2 +- demo/preview.html | 2 +- demo/requirejs.html | 2 +- demo/resize.html | 2 +- demo/rulers.html | 2 +- demo/runmode.html | 2 +- demo/search.html | 2 +- demo/spanaffectswrapping_shim.html | 2 +- demo/sublime.html | 2 +- demo/tern.html | 2 +- demo/theme.html | 2 +- demo/trailingspace.html | 2 +- demo/variableheight.html | 2 +- demo/vim.html | 2 +- demo/visibletabs.html | 2 +- demo/widget.html | 2 +- demo/xmlcomplete.html | 2 +- doc/compress.html | 2 +- doc/internals.html | 2 +- doc/manual.html | 4 +-- doc/realworld.html | 4 +-- doc/releases.html | 66 +++++++++++++++++++------------------- doc/reporting.html | 2 +- doc/upgrade_v2.2.html | 2 +- doc/upgrade_v3.html | 2 +- doc/upgrade_v4.html | 2 +- index.html | 6 ++-- mode/apl/index.html | 2 +- mode/asterisk/index.html | 2 +- mode/clike/index.html | 2 +- mode/clike/scala.html | 2 +- mode/clojure/index.html | 2 +- mode/cobol/index.html | 2 +- mode/coffeescript/index.html | 2 +- mode/commonlisp/index.html | 2 +- mode/css/index.html | 2 +- mode/css/less.html | 2 +- mode/css/scss.html | 2 +- mode/cypher/index.html | 2 +- mode/d/index.html | 2 +- mode/diff/index.html | 2 +- mode/django/index.html | 2 +- mode/dtd/dtd.js | 2 +- mode/dtd/index.html | 2 +- mode/dylan/index.html | 2 +- mode/ecl/index.html | 2 +- mode/eiffel/index.html | 2 +- mode/erlang/index.html | 2 +- mode/fortran/index.html | 2 +- mode/gas/index.html | 2 +- mode/gfm/index.html | 2 +- mode/gherkin/gherkin.js | 2 +- mode/gherkin/index.html | 2 +- mode/go/index.html | 2 +- mode/groovy/index.html | 2 +- mode/haml/index.html | 2 +- mode/haskell/index.html | 2 +- mode/haxe/index.html | 2 +- mode/htmlembedded/index.html | 2 +- mode/htmlmixed/index.html | 2 +- mode/http/index.html | 2 +- mode/index.html | 2 +- mode/jade/index.html | 2 +- mode/javascript/index.html | 2 +- mode/javascript/json-ld.html | 2 +- mode/javascript/typescript.html | 2 +- mode/jinja2/index.html | 2 +- mode/julia/index.html | 2 +- mode/kotlin/index.html | 2 +- mode/livescript/index.html | 2 +- mode/lua/index.html | 2 +- mode/markdown/index.html | 2 +- mode/mirc/index.html | 2 +- mode/mllike/index.html | 2 +- mode/modelica/index.html | 2 +- mode/nginx/index.html | 2 +- mode/ntriples/index.html | 2 +- mode/octave/index.html | 2 +- mode/pascal/index.html | 2 +- mode/pegjs/index.html | 2 +- mode/perl/index.html | 2 +- mode/php/index.html | 2 +- mode/pig/index.html | 2 +- mode/properties/index.html | 2 +- mode/puppet/index.html | 2 +- mode/python/index.html | 2 +- mode/q/index.html | 2 +- mode/r/index.html | 2 +- mode/rpm/changes/index.html | 2 +- mode/rpm/index.html | 2 +- mode/rst/index.html | 2 +- mode/ruby/index.html | 2 +- mode/rust/index.html | 2 +- mode/sass/index.html | 2 +- mode/scheme/index.html | 2 +- mode/shell/index.html | 2 +- mode/sieve/index.html | 2 +- mode/slim/index.html | 2 +- mode/smalltalk/index.html | 2 +- mode/smarty/index.html | 2 +- mode/smartymixed/index.html | 2 +- mode/solr/index.html | 2 +- mode/sparql/index.html | 2 +- mode/sql/index.html | 2 +- mode/stex/index.html | 2 +- mode/tcl/index.html | 2 +- mode/tiddlywiki/index.html | 2 +- mode/tiki/index.html | 2 +- mode/toml/index.html | 2 +- mode/turtle/index.html | 2 +- mode/vb/index.html | 2 +- mode/vbscript/index.html | 2 +- mode/velocity/index.html | 2 +- mode/verilog/index.html | 2 +- mode/xml/index.html | 2 +- mode/xquery/index.html | 2 +- mode/yaml/index.html | 2 +- mode/z80/index.html | 2 +- package.json | 4 +-- test/index.html | 2 +- theme/mdn-like.css | 2 +- 147 files changed, 186 insertions(+), 186 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3624a39e2b..47006a17f4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ Community discussion, questions, and informal bug reporting is done on the ## Submitting bug reports The preferred way to report bugs is to use the -[GitHub issue tracker](http://github.com/marijnh/CodeMirror/issues). Before +[GitHub issue tracker](http://github.com/codemirror/CodeMirror/issues). Before reporting a bug, read these pointers. **Note:** The issue tracker is for *bugs*, not requests for help. Questions @@ -48,7 +48,7 @@ should be asked on the ## Contributing code - Make sure you have a [GitHub Account](https://github.com/signup/free) -- Fork [CodeMirror](https://github.com/marijnh/CodeMirror/) +- Fork [CodeMirror](https://github.com/codemirror/CodeMirror/) ([how to fork a repo](https://help.github.com/articles/fork-a-repo)) - Make your changes - If your changes are easy to test or likely to regress, add tests. diff --git a/README.md b/README.md index 6a0011b6be..be81882063 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,4 @@ in, it will color your code, and optionally help with indentation. The project page is http://codemirror.net The manual is at http://codemirror.net/doc/manual.html -The contributing guidelines are in [CONTRIBUTING.md](https://github.com/marijnh/CodeMirror/blob/master/CONTRIBUTING.md) +The contributing guidelines are in [CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md) diff --git a/demo/activeline.html b/demo/activeline.html index 14851c35e4..c1391ef27e 100644 --- a/demo/activeline.html +++ b/demo/activeline.html @@ -17,7 +17,7 @@

@@ -152,7 +152,7 @@
  • New addons: rulers, markdown-fold, yaml-lint.
  • New theme: mdn-like.
  • New mode: Solr.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 16-01-2014: Version 3.21:

    @@ -166,7 +166,7 @@
  • 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.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 21-11-2013: Version 3.20:

    @@ -177,7 +177,7 @@
  • Improved indentation for the CoffeeScript mode.
  • Make non-printable-character representation configurable.
  • Add ‘notification’ functionality to dialog addon.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 21-10-2013: Version 3.19:

    @@ -187,7 +187,7 @@
  • New addons: hardwrap, sql-hint.
  • New theme: MBO.
  • Add support for line-level styling from mode tokenizers.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 23-09-2013: Version 3.18:

    @@ -202,7 +202,7 @@
  • New modes: Fortran, Octave (Matlab), TOML, and DTD.
  • New addons: css-lint, css-hint.
  • Improve resilience to CSS 'frameworks' that globally mess up box-sizing.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 21-08-2013: Version 3.16:

    @@ -214,7 +214,7 @@
  • Improved interaction between themes and active-line/matchbrackets addons.
  • New folding function CodeMirror.fold.comment.
  • Added fullscreen addon.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 29-07-2013: Version 3.15:

    @@ -225,7 +225,7 @@
  • Introduced helper concept (context).
  • New method: getModeAt.
  • New themes: base16 dark/light, 3024 dark/light, tomorrow-night.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 20-06-2013: Version 3.14:

    @@ -252,7 +252,7 @@
  • Various improvements to Ruby, Smarty, SQL, and Vim modes.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 20-05-2013: Version 3.13:

    @@ -262,7 +262,7 @@
  • New options: cursorScrollMargin and coverGutterNextToScrollbar.
  • New addon: commenting.
  • More features added to the Vim keymap.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 19-04-2013: Version 3.12:

    @@ -276,7 +276,7 @@ option for markText.
  • Various fixes to JavaScript tokenization and indentation corner cases.
  • Further improvements to the vim mode.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 20-03-2013: Version 3.11:

    @@ -301,7 +301,7 @@ dialog addon.
  • Tweak behavior of by-word cursor motion.
  • Further improvements to the vim mode.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 21-02-2013: Version 3.1:

    @@ -337,7 +337,7 @@
  • New modes: Turtle and Q.
  • Further improvements to the vim mode.
    • -
  • Full list of patches.
    • +
  • Full list of patches.
    • @@ -363,7 +363,7 @@
  • Support showIfHidden option for line widgets.
  • Add simple Python hinter.
  • Bring back the fixedGutter option.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 10-12-2012: Version 3.0:

    @@ -377,7 +377,7 @@
  • Rewritten VIM mode.
  • Fix a few minor scrolling and sizing issues.
  • Work around Safari segfault when dragging.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 20-11-2012: Version 3.0, release candidate 2:

    @@ -389,7 +389,7 @@
  • Reduce gutter glitches during horiz. scrolling.
  • Add addKeyMap and removeKeyMap methods.
  • Rewrite formatting and closetag add-ons.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 20-11-2012: Version 3.0, release candidate 1:

    @@ -406,7 +406,7 @@
  • Add isClean/markClean methods.
  • Remove compoundChange method, use better undo-event-combining heuristic.
  • Improve scrolling performance smoothness.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 22-10-2012: Version 3.0, beta 2:

    @@ -422,7 +422,7 @@
  • Add flattenSpans option.
  • Many optimizations. Poor responsiveness should be fixed.
  • Initialization in hidden state works again.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 19-09-2012: Version 3.0, beta 1:

    @@ -454,7 +454,7 @@
  • New mode: SQL (will replace plsql and mysql modes).
  • Further work on the new VIM mode.
  • Fix Cmd/Ctrl keys on recent Operas on OS X.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 20-11-2012: Version 2.36:

    @@ -468,7 +468,7 @@
  • Various extensions to the vim keymap.
  • Make PHP mode build on mixed HTML mode.
  • Add comment-continuing add-on.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 22-10-2012: Version 2.35:

    @@ -479,7 +479,7 @@
  • Fix several bugs in markText/undo interaction.
  • Better indentation of JavaScript code without semicolons.
  • Add defineInitHook function.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 19-09-2012: Version 2.34:

    @@ -492,7 +492,7 @@
  • Add a CodeMirror.version property.
  • More robust handling of nested modes in formatting and closetag plug-ins.
  • Un/redo now preserves marked text and bookmarks.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 23-08-2012: Version 2.33:

    @@ -506,7 +506,7 @@
  • More tweaks to the scrolling model.
  • Expanded testsuite. Basic linter added.
  • Remove most uses of innerHTML. Remove CodeMirror.htmlEscape.
    • -
  • Full list of patches.
    • +
  • Full list of patches.

    • 23-07-2012: Version 2.32:

    @@ -524,7 +524,7 @@
  • Add getHistory and setHistory methods.
  • Allow custom line separator string in getValue and getRange.
  • Support double- and triple-click drag, double-clicking whitespace.
    • -
  • And more... (all patches)
    • +
  • And more... (all patches)

    • 22-06-2012: Version 2.3:

    @@ -536,7 +536,7 @@
  • Add mode-multiplexing utility script.
  • Fix bug where right-click paste works in read-only mode.
  • Add a getScrollInfo method.
    • -
  • Lots of other fixes.
    • +
  • Lots of other fixes.

    • 23-05-2012: Version 2.25:

    @@ -774,7 +774,7 @@ and this for more information.

    -

    22-02-2011: Version 2.0 beta 2:

    +

    22-02-2011: Version 2.0 beta 2:

    Somewhat more mature API, lots of bugs shaken out.

    17-02-2011: Version 0.94:

    diff --git a/doc/reporting.html b/doc/reporting.html index 84da6111d9..9a8a63fe81 100644 --- a/doc/reporting.html +++ b/doc/reporting.html @@ -10,7 +10,7 @@