.gitignore

@@ -4,3 +4,5 @@ test.html
 .tern-*
 *~
 *.swp
+.idea
+*.iml

AUTHORS

@@ -2,6 +2,7 @@ List of CodeMirror contributors. Updated before every release.
 
 4r2r
 Aaron Brooks
+Abdelouahab
 Abe Fettig
 Adam Ahmed
 Adam King
@@ -61,6 +62,7 @@ Billy Moon
 binny
 B Krishna Chaitanya
 Blaine G
+blukat29
 boomyjee
 borawjm
 Brandon Frohs
@@ -76,6 +78,7 @@ Chris Coyier
 Chris Granger
 Chris Houseknecht
 Chris Morgan
+Christian Oyarzun
 Christopher Brown
 ciaranj
 CodeAnimal
@@ -99,6 +102,7 @@ David Pathakjee
 deebugger
 Deep Thought
 dignifiedquire
+Dimage Sapelkin
 domagoj412
 Dominator008
 Domizio Demichelis
@@ -147,6 +151,7 @@ Hakan Tunc
 Hans Engel
 Hardest
 Hasan Karahan
+Herculano Campos
 Hiroyuki Makino
 hitsthings
 Hocdoc
@@ -190,6 +195,7 @@ John Van Der Loo
 Jonathan Malmaud
 jongalloway
 Jon Malmaud
+Jon Sangster
 Joost-Wim Boekesteijn
 Joseph Pecoraro
 Joshua Newman
@@ -199,6 +205,7 @@ jsoojeon
 Juan Benavides Romero
 Jucovschi Constantin
 Juho Vuori
+Justin Hileman
 jwallers@gmail.com
 kaniga
 Ken Newman
@@ -215,6 +222,7 @@ Lanny
 Laszlo Vidacs
 leaf corcoran
 Leonid Khachaturov
+Leon Sorokin
 Leonya Khachaturov
 Liam Newman
 LM
@@ -232,6 +240,7 @@ Marco Aurélio
 Marco Munizaga
 Marcus Bointon
 Marijn Haverbeke
+Mário Gonçalves
 Mario Pietsch
 Mark Lentczner
 Marko Bonaci
@@ -243,6 +252,7 @@ Mateusz Paprocki
 Mathias Bynens
 mats cronqvist
 Matthew Beale
+Matthias Bussonnier
 Matthias BUSSONNIER
 Matt McDonald
 Matt Pass
@@ -251,6 +261,7 @@ mauricio
 Maximilian Hils
 Maxim Kraev
 Max Kirsch
+Max Xiantu
 mbarkhau
 Metatheos
 Micah Dubinko
@@ -283,7 +294,9 @@ Nikita Beloglazov
 Nikita Vasilyev
 Nikolay Kostov
 nilp0inter
+Nisarg Jhaveri
 nlwillia
+Norman Rzepka
 pablo
 Page
 Panupong Pasupat
@@ -371,6 +384,7 @@ wenli
 Wesley Wiser
 William Jamieson
 William Stein
+Willy
 Wojtek Ptak
 Xavier Mendez
 YNH Webdev

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.

README.md

@@ -1,5 +1,5 @@
 # CodeMirror
-[![Build Status](https://travis-ci.org/marijnh/CodeMirror.svg)](https://travis-ci.org/marijnh/CodeMirror)
+[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
 [![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
 
 CodeMirror is a JavaScript component that provides a code editor in
@@ -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)

addon/comment/comment.js

@@ -109,7 +109,7 @@
   CodeMirror.defineExtension("uncomment", function(from, to, options) {
     if (!options) options = noOptions;
     var self = this, mode = self.getModeAt(from);
-    var end = Math.min(to.line, self.lastLine()), start = Math.min(from.line, end);
+    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
 
     // Try finding line comments
     var lineString = options.lineComment || mode.lineComment, lines = [];

addon/dialog/dialog.js

@@ -56,7 +56,10 @@
 
     var inp = dialog.getElementsByTagName("input")[0], button;
     if (inp) {
-      if (options.value) inp.value = options.value;
+      if (options.value) {
+        inp.value = options.value;
+        inp.select();
+      }
 
       if (options.onInput)
         CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});

addon/edit/closebrackets.js

@@ -78,24 +78,25 @@
         for (var i = 0; i < ranges.length; i++) {
           var range = ranges[i], cur = range.head, curType;
           var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
-          if (!range.empty())
+          if (!range.empty()) {
             curType = "surround";
-          else if (left == right && next == right) {
+          } else if (left == right && next == right) {
             if (cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == left + left + left)
               curType = "skipThree";
             else
               curType = "skip";
           } else if (left == right && cur.ch > 1 &&
                      cm.getRange(Pos(cur.line, cur.ch - 2), cur) == left + left &&
-                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left))
+                     (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != left)) {
             curType = "addFour";
-          else if (left == '"' || left == "'") {
+          } else if (left == '"' || left == "'") {
             if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, left)) curType = "both";
             else return CodeMirror.Pass;
-          } else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next))
+          } else if (cm.getLine(cur.line).length == cur.ch || closingBrackets.indexOf(next) >= 0 || SPACE_CHAR_REGEX.test(next)) {
             curType = "both";
-          else
+          } else {
             return CodeMirror.Pass;
+          }
           if (!type) type = curType;
           else if (type != curType) return CodeMirror.Pass;
         }

addon/edit/continuelist.js

@@ -11,26 +11,39 @@
 })(function(CodeMirror) {
   "use strict";
 
-  var listRE = /^(\s*)([*+-]|(\d+)\.)(\s+)/,
+  var listRE = /^(\s*)([> ]+|[*+-]|(\d+)\.)(\s+)/,
+      emptyListRE = /^(\s*)([> ]+|[*+-]|(\d+)\.)(\s*)$/,
       unorderedBullets = "*+-";
 
   CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
     if (cm.getOption("disableInput")) return CodeMirror.Pass;
     var ranges = cm.listSelections(), replacements = [];
     for (var i = 0; i < ranges.length; i++) {
       var pos = ranges[i].head, match;
-      var inList = cm.getStateAfter(pos.line).list !== false;
+      var eolState = cm.getStateAfter(pos.line);
+      var inList = eolState.list !== false;
+      var inQuote = eolState.quote !== false;
 
-      if (!ranges[i].empty() || !inList || !(match = cm.getLine(pos.line).match(listRE))) {
+      if (!ranges[i].empty() || (!inList && !inQuote) || !(match = cm.getLine(pos.line).match(listRE))) {
         cm.execCommand("newlineAndIndent");
         return;
       }
-      var indent = match[1], after = match[4];
-      var bullet = unorderedBullets.indexOf(match[2]) >= 0
-        ? match[2]
-        : (parseInt(match[3], 10) + 1) + ".";
+      if (cm.getLine(pos.line).match(emptyListRE)) {
+        cm.replaceRange("", {
+          line: pos.line, ch: 0
+        }, {
+          line: pos.line, ch: pos.ch + 1
+        });
+        replacements[i] = "\n";
 
-      replacements[i] = "\n" + indent + bullet + after;
+      } else {
+        var indent = match[1], after = match[4];
+        var bullet = unorderedBullets.indexOf(match[2]) >= 0 || match[2].indexOf(">") >= 0
+          ? match[2]
+          : (parseInt(match[3], 10) + 1) + ".";
+
+        replacements[i] = "\n" + indent + bullet + after;
+      }
     }
 
     cm.replaceSelections(replacements);

addon/hint/sql-hint.js

@@ -12,6 +12,7 @@
   "use strict";
 
   var tables;
+  var defaultTable;
   var keywords;
   var CONS = {
     QUERY_DIV: ";",
@@ -43,18 +44,55 @@
     }
   }
 
-  function columnCompletion(result, editor) {
+  function nameCompletion(result, editor) {
     var cur = editor.getCursor();
     var token = editor.getTokenAt(cur);
+    var useBacktick = (token.string.charAt(0) == "`");
     var string = token.string.substr(1);
-    var prevCur = Pos(cur.line, token.start);
-    var table = editor.getTokenAt(prevCur).string;
-    if (!tables.hasOwnProperty(table))
-      table = findTableByAlias(table, editor);
-    var columns = tables[table];
-    if (!columns) return;
-
-    addMatches(result, string, columns, function(w) {return "." + w;});
+    var prevToken = editor.getTokenAt(Pos(cur.line, token.start));
+    if (token.string.charAt(0) == "." || prevToken.string == "."){
+      //Suggest colunm names
+      if (prevToken.string == ".") {
+        var prevToken = editor.getTokenAt(Pos(cur.line, token.start - 1));
+      }
+      var table = prevToken.string;
+      //Check if backtick is used in table name. If yes, use it for columns too.
+      var useBacktickTable = false;
+      if (table.match(/`/g)) {
+        useBacktickTable = true;
+        table = table.replace(/`/g, "");
+      }
+      //Check if table is available. If not, find table by Alias
+      if (!tables.hasOwnProperty(table))
+        table = findTableByAlias(table, editor);
+      var columns = tables[table];
+      if (!columns) return;
+
+      if (useBacktick) {
+        addMatches(result, string, columns, function(w) {return "`" + w + "`";});
+      }
+      else if(useBacktickTable) {
+        addMatches(result, string, columns, function(w) {return ".`" + w + "`";});
+      }
+      else {
+        addMatches(result, string, columns, function(w) {return "." + w;});
+      }
+    }
+    else {
+      //Suggest table names or colums in defaultTable
+      while (token.start && string.charAt(0) == ".") {
+        token = editor.getTokenAt(Pos(cur.line, token.start - 1));
+        string = token.string + string;
+      }
+      if (useBacktick) {
+        addMatches(result, string, tables, function(w) {return "`" + w + "`";});
+        addMatches(result, string, defaultTable, function(w) {return "`" + w + "`";});
+      }
+      else {
+        addMatches(result, string, tables, function(w) {return w;});
+        addMatches(result, string, defaultTable, function(w) {return w;});
+      }
+    }
   }
 
   function eachWord(lineText, f) {
@@ -128,30 +166,26 @@
 
   CodeMirror.registerHelper("hint", "sql", function(editor, options) {
     tables = (options && options.tables) || {};
+    var defaultTableName = options && options.defaultTable;
+    defaultTable = (defaultTableName && tables[defaultTableName] || []);
     keywords = keywords || getKeywords(editor);
+
     var cur = editor.getCursor();
     var result = [];
     var token = editor.getTokenAt(cur), start, end, search;
-    if (token.string.match(/^[.\w@]\w*$/)) {
+    if (token.string.match(/^[.`\w@]\w*$/)) {
       search = token.string;
       start = token.start;
       end = token.end;
     } else {
       start = end = cur.ch;
       search = "";
     }
-    if (search.charAt(0) == ".") {
-      columnCompletion(result, editor);
-      if (!result.length) {
-        while (start && search.charAt(0) == ".") {
-          token = editor.getTokenAt(Pos(cur.line, token.start - 1));
-          start = token.start;
-          search = token.string + search;
-        }
-        addMatches(result, search, tables, function(w) {return w;});
-      }
+    if (search.charAt(0) == "." || search.charAt(0) == "`") {
+      nameCompletion(result, editor);
     } else {
       addMatches(result, search, tables, function(w) {return w;});
+      addMatches(result, search, defaultTable, function(w) {return w;});
       addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
     }
 

addon/lint/lint.js

@@ -118,10 +118,11 @@
 
   function startLinting(cm) {
     var state = cm.state.lint, options = state.options;
+    var passOptions = options.options || options; // Support deprecated passing of `options` property in options
     if (options.async)
-      options.getAnnotations(cm, updateLinting, options);
+      options.getAnnotations(cm.getValue(), updateLinting, passOptions, cm);
     else
-      updateLinting(cm, options.getAnnotations(cm.getValue(), options.options));
+      updateLinting(cm, options.getAnnotations(cm.getValue(), passOptions, cm));
   }
 
   function updateLinting(cm, annotationsNotSorted) {
@@ -170,20 +171,14 @@
     showTooltipFor(e, annotationTooltip(ann), target);
   }
 
-  // When the mouseover fires, the cursor might not actually be over
-  // the character itself yet. These pairs of x,y offsets are used to
-  // probe a few nearby points when no suitable marked range is found.
-  var nearby = [0, 0, 0, 5, 0, -5, 5, 0, -5, 0];
-
   function onMouseOver(cm, e) {
-    if (!/\bCodeMirror-lint-mark-/.test((e.target || e.srcElement).className)) return;
-    for (var i = 0; i < nearby.length; i += 2) {
-      var spans = cm.findMarksAt(cm.coordsChar({left: e.clientX + nearby[i],
-                                                top: e.clientY + nearby[i + 1]}, "client"));
-      for (var j = 0; j < spans.length; ++j) {
-        var span = spans[j], ann = span.__annotation;
-        if (ann) return popupSpanTooltip(ann, e);
-      }
+    var target = e.target || e.srcElement;
+    if (!/\bCodeMirror-lint-mark-/.test(target.className)) return;
+    var box = target.getBoundingClientRect(), x = (box.left + box.right) / 2, y = (box.top + box.bottom) / 2;
+    var spans = cm.findMarksAt(cm.coordsChar({left: x, top: y}, "client"));
+    for (var i = 0; i < spans.length; ++i) {
+      var ann = spans[i].__annotation;
+      if (ann) return popupSpanTooltip(ann, e);
     }
   }