Merge branch 'refs/heads/Ninja-Master' into Document

1 files changed, 24 insertions, 5 deletions

diff --git a/imports/codemirror/mode/diff/diff.js b/imports/codemirror/mode/diff/diff.js
index 725bb2c7..3402f3b3 100644
--- a/imports/codemirror/mode/diff/diff.js
+++ b/imports/codemirror/mode/diff/diff.js
@@ -1,11 +1,30 @@
 CodeMirror.defineMode("diff", function() {
+
+  var TOKEN_NAMES = {
+    '+': 'tag',
+    '-': 'string',
+    '@': 'meta'
+  };
+
   return {
     token: function(stream) {
-      var ch = stream.next();
-      stream.skipToEnd();
-      if (ch == "+") return "plus";
-      if (ch == "-") return "minus";
-      if (ch == "@") return "rangeinfo";
+      var tw_pos = stream.string.search(/[\t ]+?$/);
+
+      if (!stream.sol() || tw_pos === 0) {
+        stream.skipToEnd();
+        return ("error " + (
+          TOKEN_NAMES[stream.string.charAt(0)] || '')).replace(/ $/, '');
+      }
+
+      var token_name = TOKEN_NAMES[stream.peek()] || stream.skipToEnd();
+
+      if (tw_pos === -1) {
+        stream.skipToEnd();
+      } else {
+        stream.pos = tw_pos;
+      }
+
+      return token_name;
     }
   };
 });