swagr 0.0.8 → 0.0.10

data/templates/static/js/codemirror/mode/erlang/index.html

@@ -5,7 +5,7 @@
     <title>CodeMirror: Erlang mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
-    <script src="../../lib/util/matchbrackets.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
     <script src="erlang.js"></script>
     <link rel="stylesheet" href="../../theme/erlang-dark.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>

data/templates/static/js/codemirror/mode/gfm/gfm.js

@@ -75,9 +75,10 @@ CodeMirror.defineMode("gfm", function(config) {
           return "link";
         }
       }
-      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i)) {
+      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i)) {
         // URLs
         // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
+        // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine
         return "link";
       }
       stream.next();

data/templates/static/js/codemirror/mode/gfm/index.html

@@ -5,7 +5,7 @@
     <title>CodeMirror: GFM mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
-    <script src="../../lib/util/overlay.js"></script>
+    <script src="../../addon/mode/overlay.js"></script>
     <script src="../xml/xml.js"></script>
     <script src="../markdown/markdown.js"></script>
     <script src="gfm.js"></script>
@@ -16,7 +16,6 @@
     <script src="../htmlmixed/htmlmixed.js"></script>
     <script src="../clike/clike.js"></script>
     
-    <link rel="stylesheet" href="../markdown/markdown.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
     <link rel="stylesheet" href="../../doc/docs.css">
   </head>

data/templates/static/js/codemirror/mode/gfm/test.js

@@ -1,225 +1,84 @@
-// Initiate ModeTest and set defaults
-var MT = ModeTest;
-MT.modeName = 'gfm';
-MT.modeOptions = {};
-
-// Emphasis characters within a word
-MT.testMode(
-  'emInWordAsterisk',
-  'foo*bar*hello',
-  [
-    null, 'foo',
-    'em', '*bar*',
-    null, 'hello'
-  ]
-);
-MT.testMode(
-  'emInWordUnderscore',
-  'foo_bar_hello',
-  [
-    null, 'foo_bar_hello'
-  ]
-);
-MT.testMode(
-  'emStrongUnderscore',
-  '___foo___ bar',
-  [
-    'strong', '__',
-    'emstrong', '_foo__',
-    'em', '_',
-    null, ' bar'
-  ]
-);
-
-// Fenced code blocks
-MT.testMode(
-  'fencedCodeBlocks',
-  '```\nfoo\n\n```\nbar',
-  [
-    'comment', '```',
-    'comment', 'foo',
-    'comment', '```',
-    null, 'bar'
-  ]
-);
-// Fenced code block mode switching
-MT.testMode(
-  'fencedCodeBlockModeSwitching',
-  '```javascript\nfoo\n\n```\nbar',
-  [
-    'comment', '```javascript',
-    'variable', 'foo',
-    'comment', '```',
-    null, 'bar'
-  ]
-);
-
-// SHA
-MT.testMode(
-  'SHA',
-  'foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2 bar',
-  [
-    null, 'foo ',
-    'link', 'be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2',
-    null, ' bar'
-  ]
-);
-// GitHub highlights hashes 7-40 chars in length
-MT.testMode(
-  'shortSHA',
-  'foo be6a8cc bar',
-  [
-    null, 'foo ',
-    'link', 'be6a8cc',
-    null, ' bar'
-  ]
-);
-// Invalid SHAs
-// 
-// GitHub does not highlight hashes shorter than 7 chars
-MT.testMode(
-  'tooShortSHA',
-  'foo be6a8c bar',
-  [
-    null, 'foo be6a8c bar'
-  ]
-);
-// GitHub does not highlight hashes longer than 40 chars
-MT.testMode(
-  'longSHA',
-  'foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd22 bar',
-  [
-    null, 'foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd22 bar'
-  ]
-);
-MT.testMode(
-  'badSHA',
-  'foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cg2 bar',
-  [
-    null, 'foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cg2 bar'
-  ]
-);
-// User@SHA
-MT.testMode(
-  'userSHA',
-  'foo bar@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2 hello',
-  [
-    null, 'foo ',
-    'link', 'bar@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2',
-    null, ' hello'
-  ]
-);
-// User/Project@SHA
-MT.testMode(
-  'userProjectSHA',
-  'foo bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2 world',
-  [
-    null, 'foo ',
-    'link', 'bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2',
-    null, ' world'
-  ]
-);
-
-// #Num
-MT.testMode(
-  'num',
-  'foo #1 bar',
-  [
-    null, 'foo ',
-    'link', '#1',
-    null, ' bar'
-  ]
-);
-// bad #Num
-MT.testMode(
-  'badNum',
-  'foo #1bar hello',
-  [
-    null, 'foo #1bar hello'
-  ]
-);
-// User#Num
-MT.testMode(
-  'userNum',
-  'foo bar#1 hello',
-  [
-    null, 'foo ',
-    'link', 'bar#1',
-    null, ' hello'
-  ]
-);
-// User/Project#Num
-MT.testMode(
-  'userProjectNum',
-  'foo bar/hello#1 world',
-  [
-    null, 'foo ',
-    'link', 'bar/hello#1',
-    null, ' world'
-  ]
-);
-
-// Vanilla links
-MT.testMode(
-  'vanillaLink',
-  'foo http://www.example.com/ bar',
-  [
-    null, 'foo ',
-    'link', 'http://www.example.com/',
-    null, ' bar'
-  ]
-);
-MT.testMode(
-  'vanillaLinkPunctuation',
-  'foo http://www.example.com/. bar',
-  [
-    null, 'foo ',
-    'link', 'http://www.example.com/',
-    null, '. bar'
-  ]
-);
-MT.testMode(
-  'vanillaLinkExtension',
-  'foo http://www.example.com/index.html bar',
-  [
-    null, 'foo ',
-    'link', 'http://www.example.com/index.html',
-    null, ' bar'
-  ]
-);
-// Not a link
-MT.testMode(
-  'notALink',
-  '```css\nfoo {color:black;}\n```http://www.example.com/',
-  [
-    'comment', '```css',
-    'tag', 'foo',
-    null, ' {',
-    'property', 'color',
-    'operator', ':',
-    'keyword', 'black',
-    null, ';}',
-    'comment', '```',
-    'link', 'http://www.example.com/'
-  ]
-);
-// Not a link
-MT.testMode(
-  'notALink',
-  '``foo `bar` http://www.example.com/`` hello',
-  [
-    'comment', '``foo `bar` http://www.example.com/``',
-    null, ' hello'
-  ]
-);
-// Not a link
-MT.testMode(
-  'notALink',
-  '`foo\nhttp://www.example.com/\n`foo\n\nhttp://www.example.com/',
-  [
-    'comment', '`foo',
-    'link', 'http://www.example.com/',
-    'comment', '`foo',
-    'link', 'http://www.example.com/'
-  ]
-);
+(function() {
+  var mode = CodeMirror.getMode({tabSize: 4}, "gfm");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("emInWordAsterisk",
+     "foo[em *bar*]hello");
+
+  MT("emInWordUnderscore",
+     "foo_bar_hello");
+
+  MT("emStrongUnderscore",
+     "[strong __][emstrong _foo__][em _] bar");
+
+  MT("fencedCodeBlocks",
+     "[comment ```]",
+     "[comment foo]",
+     "",
+     "[comment ```]",
+     "bar");
+
+  MT("fencedCodeBlockModeSwitching",
+     "[comment ```javascript]",
+     "[variable foo]",
+     "",
+     "[comment ```]",
+     "bar");
+
+  MT("SHA",
+     "foo [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] bar");
+
+  MT("shortSHA",
+     "foo [link be6a8cc] bar");
+
+  MT("tooShortSHA",
+     "foo be6a8c bar");
+
+  MT("longSHA",
+     "foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd22 bar");
+
+  MT("badSHA",
+     "foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cg2 bar");
+
+  MT("userSHA",
+     "foo [link bar@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] hello");
+
+  MT("userProjectSHA",
+     "foo [link bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] world");
+
+  MT("num",
+     "foo [link #1] bar");
+
+  MT("badNum",
+     "foo #1bar hello");
+
+  MT("userNum",
+     "foo [link bar#1] hello");
+
+  MT("userProjectNum",
+     "foo [link bar/hello#1] world");
+
+  MT("vanillaLink",
+     "foo [link http://www.example.com/] bar");
+
+  MT("vanillaLinkPunctuation",
+     "foo [link http://www.example.com/]. bar");
+
+  MT("vanillaLinkExtension",
+     "foo [link http://www.example.com/index.html] bar");
+
+  MT("notALink",
+     "[comment ```css]",
+     "[tag foo] {[property color][operator :][keyword black];}",
+     "[comment ```][link http://www.example.com/]");
+
+  MT("notALink",
+     "[comment ``foo `bar` http://www.example.com/``] hello");
+
+  MT("notALink",
+     "[comment `foo]",
+     "[link http://www.example.com/]",
+     "[comment `foo]",
+     "",
+     "[link http://www.example.com/]");
+})();

data/templates/static/js/codemirror/mode/go/index.html

@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <link rel="stylesheet" href="../../theme/elegant.css">
     <script src="../../lib/codemirror.js"></script>
-    <script src="../../lib/util/matchbrackets.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
     <script src="go.js"></script>
     <link rel="stylesheet" href="../../doc/docs.css">
     <style>.CodeMirror {border:1px solid #999; background:#ffc}</style>

data/templates/static/js/codemirror/mode/groovy/index.html

@@ -5,7 +5,7 @@
     <title>CodeMirror: Groovy mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
-    <script src="../../lib/util/matchbrackets.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
     <script src="groovy.js"></script>
     <link rel="stylesheet" href="../../doc/docs.css">
     <style>.CodeMirror {border-top: 1px solid #500; border-bottom: 1px solid #500;}</style>

data/templates/static/js/codemirror/mode/haskell/index.html

@@ -5,7 +5,7 @@
     <title>CodeMirror: Haskell mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
-    <script src="../../lib/util/matchbrackets.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
     <script src="haskell.js"></script>
     <link rel="stylesheet" href="../../theme/elegant.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>

data/templates/static/js/codemirror/mode/javascript/index.html

@@ -5,8 +5,8 @@
     <title>CodeMirror: JavaScript mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
-    <script src="../../lib/util/matchbrackets.js"></script>
-    <script src="../../lib/util/continuecomment.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
+    <script src="../../addon/edit/continuecomment.js"></script>
     <script src="javascript.js"></script>
     <link rel="stylesheet" href="../../doc/docs.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>

data/templates/static/js/codemirror/mode/javascript/javascript.js

@@ -196,12 +196,19 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return true;
   }
   function register(varname) {
+    function inList(list) {
+      for (var v = list; v; v = v.next)
+        if (v.name == varname) return true;
+      return false;
+    }
     var state = cx.state;
     if (state.context) {
       cx.marked = "def";
-      for (var v = state.localVars; v; v = v.next)
-        if (v.name == varname) return;
+      if (inList(state.localVars)) return;
       state.localVars = {name: varname, next: state.localVars};
+    } else {
+      if (inList(state.globalVars)) return;
+      state.globalVars = {name: varname, next: state.globalVars};
     }
   }
 
@@ -364,6 +371,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         cc: [],
         lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
         localVars: parserConfig.localVars,
+        globalVars: parserConfig.globalVars,
         context: parserConfig.localVars && {vars: parserConfig.localVars},
         indented: 0
       };
@@ -406,6 +414,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 });
 
 CodeMirror.defineMIME("text/javascript", "javascript");
+CodeMirror.defineMIME("text/ecmascript", "javascript");
+CodeMirror.defineMIME("application/javascript", "javascript");
+CodeMirror.defineMIME("application/ecmascript", "javascript");
 CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
 CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
 CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });

data/templates/static/js/codemirror/mode/less/index.html

@@ -5,7 +5,7 @@
     <title>CodeMirror: LESS mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
-    <script src="../../lib/util/matchbrackets.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
     <script src="less.js"></script>
     <style>.CodeMirror {background: #f8f8f8; border: 1px solid #ddd; font-size:12px; height: 400px}</style>
     <link rel="stylesheet" href="../../doc/docs.css">

data/templates/static/js/codemirror/mode/lua/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>CodeMirror: Lua mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/util/matchbrackets.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
     <script src="../../lib/codemirror.js"></script>
     <script src="lua.js"></script>
     <link rel="stylesheet" href="../../theme/neat.css">