codemirror-rails 3.12 → 3.13

data/vendor/assets/javascripts/codemirror/modes/sql.js

@@ -51,7 +51,7 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
       return state.tokenize(stream, state);
     } else if (ch == ".") {
       // .1 for 0.1
-      if (stream.match(/^[0-9eE]+/) && support.zerolessFloat == true) {
+      if (support.zerolessFloat == true && stream.match(/^(?:\d+(?:e\d*)?|\d*e\d+)/i)) {
         return "number";
       }
       // .table_name (ODBC)
@@ -166,10 +166,9 @@ CodeMirror.defineMode("sql", function(config, parserConfig) {
 
   // `identifier`
   function hookIdentifier(stream) {
-    var escaped = false, ch;
+    var ch;
     while ((ch = stream.next()) != null) {
-      if (ch == "`" && !escaped) return "variable-2";
-      escaped = !escaped && ch == "`";
+      if (ch == "`" && !stream.eat("`")) return "variable-2";
     }
     return null;
   }

data/vendor/assets/javascripts/codemirror/modes/stex.js

@@ -95,7 +95,7 @@ CodeMirror.defineMode("stex", function() {
         }
 
         // white space control characters
-        if (source.match(/^\\[,;!\/]/)) {
+        if (source.match(/^\\[,;!\/\\]/)) {
           return "tag";
         }
 

data/vendor/assets/javascripts/codemirror/modes/xml.js

@@ -317,6 +317,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     },
 
     electricChars: "/",
+    blockCommentStart: "<!--",
+    blockCommentEnd: "-->",
 
     configuration: parserConfig.htmlMode ? "html" : "xml"
   };

data/vendor/assets/javascripts/codemirror/modes/yaml.js

@@ -9,7 +9,9 @@ CodeMirror.defineMode("yaml", function() {
       var esc = state.escaped;
       state.escaped = false;
       /* comments */
-      if (ch == "#") { stream.skipToEnd(); return "comment"; }
+      if (ch == "#" && (stream.pos == 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) {
+        stream.skipToEnd(); return "comment";
+      }
       if (state.literal && stream.indentation() > state.keyCol) {
         stream.skipToEnd(); return "string";
       } else if (state.literal) { state.literal = false; }

data/vendor/assets/stylesheets/codemirror.css

@@ -19,7 +19,7 @@
   padding: 0 4px; /* Horizontal padding of content */
 }
 
-.CodeMirror-scrollbar-filler {
+.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
   background-color: white; /* The little square between H and V scrollbars */
 }
 
@@ -28,6 +28,7 @@
 .CodeMirror-gutters {
   border-right: 1px solid #ddd;
   background-color: #f7f7f7;
+  white-space: nowrap;
 }
 .CodeMirror-linenumbers {}
 .CodeMirror-linenumber {
@@ -124,7 +125,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 /* The fake, visible scrollbars. Used to force redraw during scrolling
    before actuall scrolling happens, thus preventing shaking and
    flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler {
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
   position: absolute;
   z-index: 6;
   display: none;
@@ -141,16 +142,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 .CodeMirror-scrollbar-filler {
   right: 0; bottom: 0;
-  z-index: 6;
+}
+.CodeMirror-gutter-filler {
+  left: 0; bottom: 0;
 }
 
 .CodeMirror-gutters {
   position: absolute; left: 0; top: 0;
-  height: 100%;
   padding-bottom: 30px;
   z-index: 3;
 }
 .CodeMirror-gutter {
+  white-space: normal;
   height: 100%;
   padding-bottom: 30px;
   margin-bottom: -32px;

data/vendor/assets/stylesheets/codemirror/addons/lint/lint.css

@@ -24,18 +24,18 @@
   -ms-transition: opacity .4s;
 }
 
-.CodeMirror-lint-span-error, .CodeMirror-lint-span-warning {
+.CodeMirror-lint-mark-error, .CodeMirror-lint-mark-warning {
   background-position: left bottom;
   background-repeat: repeat-x;
 }
 
-.CodeMirror-lint-span-error {
+.CodeMirror-lint-mark-error {
   background-image:
   url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==")
   ;
 }
 
-.CodeMirror-lint-span-warning {
+.CodeMirror-lint-mark-warning {
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
 }
 

data/vendor/assets/stylesheets/codemirror/themes/rubyblue.css

@@ -1,4 +1,4 @@
-.cm-s-rubyblue { font:13px/1.4em Trebuchet, Verdana, sans-serif; }	/* - customized editor font - */
+.cm-s-rubyblue { font-family: Trebuchet, Verdana, sans-serif; }	/* - customized editor font - */
 
 .cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
 .cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: codemirror-rails
 version: !ruby/object:Gem::Version
-  version: '3.12'
+  version: '3.13'
 platform: ruby
 authors:
 - Nathan Fixler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +147,7 @@ files:
 - test/integration/codemirror_rails_integration_test.rb
 - test/test_helper.rb
 - vendor/assets/javascripts/codemirror.js
+- vendor/assets/javascripts/codemirror/addons/comment/comment.js
 - vendor/assets/javascripts/codemirror/addons/dialog/dialog.js
 - vendor/assets/javascripts/codemirror/addons/display/placeholder.js
 - vendor/assets/javascripts/codemirror/addons/edit/closebrackets.js
@@ -179,6 +186,7 @@ files:
 - vendor/assets/javascripts/codemirror/modes/asterisk.js
 - vendor/assets/javascripts/codemirror/modes/clike.js
 - vendor/assets/javascripts/codemirror/modes/clojure.js
+- vendor/assets/javascripts/codemirror/modes/cobol.js
 - vendor/assets/javascripts/codemirror/modes/coffeescript.js
 - vendor/assets/javascripts/codemirror/modes/commonlisp.js
 - vendor/assets/javascripts/codemirror/modes/css.js
@@ -190,6 +198,7 @@ files:
 - vendor/assets/javascripts/codemirror/modes/gfm.js
 - vendor/assets/javascripts/codemirror/modes/go.js
 - vendor/assets/javascripts/codemirror/modes/groovy.js
+- vendor/assets/javascripts/codemirror/modes/haml.js
 - vendor/assets/javascripts/codemirror/modes/haskell.js
 - vendor/assets/javascripts/codemirror/modes/haxe.js
 - vendor/assets/javascripts/codemirror/modes/htmlembedded.js
@@ -228,7 +237,6 @@ files:
 - vendor/assets/javascripts/codemirror/modes/sql.js
 - vendor/assets/javascripts/codemirror/modes/stex.js
 - vendor/assets/javascripts/codemirror/modes/tcl.js
-- vendor/assets/javascripts/codemirror/modes/test.js
 - vendor/assets/javascripts/codemirror/modes/tiddlywiki.js
 - vendor/assets/javascripts/codemirror/modes/tiki.js
 - vendor/assets/javascripts/codemirror/modes/turtle.js
@@ -285,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Use CodeMirror with Rails 3

data/vendor/assets/javascripts/codemirror/modes/test.js

@@ -1,64 +0,0 @@
-// Don't take these too seriously -- the expected results appear to be
-// based on the results of actual runs without any serious manual
-// verification. If a change you made causes them to fail, the test is
-// as likely to wrong as the code.
-
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "xquery");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("eviltest",
-     "[keyword xquery] [keyword version] [variable "1][keyword .][atom 0][keyword -][variable ml"][def&variable ;]      [comment (: this is       : a          \"comment\" :)]",
-     "      [keyword let] [variable $let] [keyword :=] [variable <x] [variable attr][keyword =][variable "value">"test"<func&gt][def&variable ;function]() [variable $var] {[keyword function]()} {[variable $var]}[variable <][keyword /][variable func><][keyword /][variable x>]",
-     "      [keyword let] [variable $joe][keyword :=][atom 1]",
-     "      [keyword return] [keyword element] [variable element] {",
-     "          [keyword attribute] [variable attribute] { [atom 1] },",
-     "          [keyword element] [variable test] { [variable 'a'] },           [keyword attribute] [variable foo] { [variable "bar"] },",
-     "          [def&variable fn:doc]()[[ [variable foo][keyword /][variable @bar] [keyword eq] [variable $let] ]],",
-     "          [keyword //][variable x] }                 [comment (: a more 'evil' test :)]",
-     "      [comment (: Modified Blakeley example (: with nested comment :) ... :)]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:declare]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:private]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:function]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:local]() {()}[variable ;]",
-     "      [keyword let] [variable $let] [keyword :=] [variable <let>let] [variable $let] [keyword :=] [variable "let"<][keyword /let][variable >]",
-     "      [keyword return] [keyword element] [variable element] {",
-     "          [keyword attribute] [variable attribute] { [keyword try] { [def&variable xdmp:version]() } [keyword catch]([variable $e]) { [def&variable xdmp:log]([variable $e]) } },",
-     "          [keyword attribute] [variable fn:doc] { [variable "bar"] [variable castable] [keyword as] [atom xs:string] },",
-     "          [keyword element] [variable text] { [keyword text] { [variable "text"] } },",
-     "          [def&variable fn:doc]()[[ [qualifier child::][variable eq][keyword /]([variable @bar] [keyword |] [qualifier attribute::][variable attribute]) [keyword eq] [variable $let] ]],",
-     "          [keyword //][variable fn:doc]",
-     "      }");
-
-  MT("testEmptySequenceKeyword",
-     "[string \"foo\"] [keyword instance] [keyword of] [keyword empty-sequence]()");
-
-  MT("testMultiAttr",
-     "[tag <p ][attribute a1]=[string \"foo\"] [attribute a2]=[string \"bar\"][tag >][variable hello] [variable world][tag </p>]");
-
-  MT("test namespaced variable",
-     "[keyword declare] [keyword namespace] [variable e] [keyword =] [string \"http://example.com/ANamespace\"][variable ;declare] [keyword variable] [variable $e:exampleComThisVarIsNotRecognized] [keyword as] [keyword element]([keyword *]) [variable external;]");
-
-  MT("test EQName variable",
-     "[keyword declare] [keyword variable] [variable $\"http://www.example.com/ns/my\":var] [keyword :=] [atom 12][variable ;]",
-     "[tag <out>]{[variable $\"http://www.example.com/ns/my\":var]}[tag </out>]");
-
-  MT("test EQName function",
-     "[keyword declare] [keyword function] [def&variable \"http://www.example.com/ns/my\":fn] ([variable $a] [keyword as] [atom xs:integer]) [keyword as] [atom xs:integer] {",
-     "   [variable $a] [keyword +] [atom 2]",
-     "}[variable ;]",
-     "[tag <out>]{[def&variable \"http://www.example.com/ns/my\":fn]([atom 12])}[tag </out>]");
-
-  MT("test EQName function with single quotes",
-     "[keyword declare] [keyword function] [def&variable 'http://www.example.com/ns/my':fn] ([variable $a] [keyword as] [atom xs:integer]) [keyword as] [atom xs:integer] {",
-     "   [variable $a] [keyword +] [atom 2]",
-     "}[variable ;]",
-     "[tag <out>]{[def&variable 'http://www.example.com/ns/my':fn]([atom 12])}[tag </out>]");
-
-  MT("testProcessingInstructions",
-     "[def&variable data]([comment&meta <?target content?>]) [keyword instance] [keyword of] [atom xs:string]");
-
-  MT("testQuoteEscapeDouble",
-     "[keyword let] [variable $rootfolder] [keyword :=] [string \"c:\\builds\\winnt\\HEAD\\qa\\scripts\\\"]",
-     "[keyword let] [variable $keysfolder] [keyword :=] [def&variable concat]([variable $rootfolder], [string \"keys\\\"])");
-})();