swagr 0.0.8 → 0.0.10

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

@@ -1,6 +1,7 @@
 CodeMirror.defineMode("clike", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
       statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
+      dontAlignCalls = parserConfig.dontAlignCalls,
       keywords = parserConfig.keywords || {},
       builtin = parserConfig.builtin || {},
       blockKeywords = parserConfig.blockKeywords || {},
@@ -149,6 +150,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
       var closing = firstChar == ctx.type;
       if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
+      else if (dontAlignCalls && ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit;
       else if (ctx.align) return ctx.column + (closing ? 0 : 1);
       else return ctx.indented + (closing ? 0 : indentUnit);
     },

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

@@ -5,7 +5,7 @@
     <title>CodeMirror: C-like 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="clike.js"></script>
     <link rel="stylesheet" href="../../doc/docs.css">
     <style>.CodeMirror {border: 2px inset #dee;}</style>

data/templates/static/js/codemirror/mode/clike/scala.html

@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <link rel="stylesheet" href="../../theme/ambiance.css">
     <script src="../../lib/codemirror.js"></script>
-    <script src="../../lib/util/matchbrackets.js"></script>
+    <script src="../../addon/edit/matchbrackets.js"></script>
     <script src="clike.js"></script>
     <link rel="stylesheet" href="../../doc/docs.css">
     <style>

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

@@ -142,7 +142,7 @@ CodeMirror.defineMode("clojure", function () {
                         returnType = COMMENT;
                     } else if (isNumber(ch,stream)){
                         returnType = NUMBER;
-                    } else if (ch == "(" || ch == "[") {
+                    } else if (ch == "(" || ch == "[" || ch == "{" ) {
                         var keyWord = '', indentTemp = stream.column(), letter;
                         /**
                         Either
@@ -172,9 +172,9 @@ CodeMirror.defineMode("clojure", function () {
                         stream.backUp(stream.current().length - 1); // undo all the eating
 
                         returnType = BRACKET;
-                    } else if (ch == ")" || ch == "]") {
+                    } else if (ch == ")" || ch == "]" || ch == "}") {
                         returnType = BRACKET;
-                        if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : "[")) {
+                        if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : (ch == "]" ? "[" :"{"))) {
                             popStack(state);
                         }
                     } else if ( ch == ":" ) {

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

@@ -222,14 +222,14 @@ CodeMirror.defineMode("css", function(config) {
         stream.eatWhile(/[\w.%]/);
         return ret("number", "unit");
       } else if (stream.match(/^[^-]+-/)) {
-        return ret("meta", type);
+        return ret("meta", "meta");
       }
     }
     else if (/[,+>*\/]/.test(ch)) {
       return ret(null, "select-op");
     }
     else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) {
-      return ret("qualifier", type);
+      return ret("qualifier", "qualifier");
     }
     else if (ch == ":") {
       return ret("operator", ch);

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

@@ -1,501 +1,106 @@
-// Initiate ModeTest and set defaults
-var MT = ModeTest;
-MT.modeName = 'css';
-MT.modeOptions = {};
+(function() {
+  var mode = CodeMirror.getMode({tabSize: 4}, "css");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 2)); }
 
-// Requires at least one media query
-MT.testMode(
-  'atMediaEmpty',
-  '@media { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'error', '{',
-    null, ' }'
-  ]
-);
+  // Requires at least one media query
+  MT("atMediaEmpty",
+     "[def @media] [error {] }");
 
-MT.testMode(
-  'atMediaMultiple',
-  '@media not screen and (color), not print and (color) { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'keyword', 'not',
-    null, ' ',
-    'attribute', 'screen',
-    null, ' ',
-    'operator', 'and',
-    null, ' (',
-    'property', 'color',
-    null, '), ',
-    'keyword', 'not',
-    null, ' ',
-    'attribute', 'print',
-    null, ' ',
-    'operator', 'and',
-    null, ' (',
-    'property', 'color',
-    null, ') { }'
-  ]
-);
+  MT("atMediaMultiple",
+     "[def @media] [keyword not] [attribute screen] [operator and] ([property color]), [keyword not] [attribute print] [operator and] ([property color]) { }");
 
-MT.testMode(
-  'atMediaCheckStack',
-  '@media screen { } foo { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'attribute', 'screen',
-    null, ' { } ',
-    'tag', 'foo',
-    null, ' { }'
-  ]
-);
+  MT("atMediaCheckStack",
+     "[def @media] [attribute screen] { } [tag foo] { }");
 
-MT.testMode(
-  'atMediaCheckStack',
-  '@media screen (color) { } foo { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'attribute', 'screen',
-    null, ' (',
-    'property', 'color',
-    null, ') { } ',
-    'tag', 'foo',
-    null, ' { }'
-  ]
-);
+  MT("atMediaCheckStack",
+     "[def @media] [attribute screen] ([property color]) { } [tag foo] { }");
 
-MT.testMode(
-  'atMediaCheckStackInvalidAttribute',
-  '@media foobarhello { } foo { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'attribute error', 'foobarhello',
-    null, ' { } ',
-    'tag', 'foo',
-    null, ' { }'
-  ]
-);
+  MT("atMediaCheckStackInvalidAttribute",
+     "[def @media] [attribute&error foobarhello] { } [tag foo] { }");
 
-// Error, because "and" is only allowed immediately preceding a media expression
-MT.testMode(
-  'atMediaInvalidAttribute',
-  '@media foobarhello { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'attribute error', 'foobarhello',
-    null, ' { }'
-  ]
-);
+  // Error, because "and" is only allowed immediately preceding a media expression
+  MT("atMediaInvalidAttribute",
+     "[def @media] [attribute&error foobarhello] { }");
 
-// Error, because "and" is only allowed immediately preceding a media expression
-MT.testMode(
-  'atMediaInvalidAnd',
-  '@media and screen { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'error', 'and',
-    null, ' ',
-    'attribute', 'screen',
-    null, ' { }'
-  ]
-);
+  // Error, because "and" is only allowed immediately preceding a media expression
+  MT("atMediaInvalidAnd",
+     "[def @media] [error and] [attribute screen] { }");
 
-// Error, because "not" is only allowed as the first item in each media query
-MT.testMode(
-  'atMediaInvalidNot',
-  '@media screen not (not) { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'attribute', 'screen',
-    null, ' ',
-    'error', 'not',
-    null, ' (',
-    'error', 'not',
-    null, ') { }'
-  ]
-);
+  // Error, because "not" is only allowed as the first item in each media query
+  MT("atMediaInvalidNot",
+     "[def @media] [attribute screen] [error not] ([error not]) { }");
 
-// Error, because "only" is only allowed as the first item in each media query
-MT.testMode(
-  'atMediaInvalidOnly',
-  '@media screen only (only) { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'attribute', 'screen',
-    null, ' ',
-    'error', 'only',
-    null, ' (',
-    'error', 'only',
-    null, ') { }'
-  ]
-);
+  // Error, because "only" is only allowed as the first item in each media query
+  MT("atMediaInvalidOnly",
+     "[def @media] [attribute screen] [error only] ([error only]) { }");
 
-// Error, because "foobarhello" is neither a known type or property, but
-// property was expected (after "and"), and it should be in parenthese.
-MT.testMode(
-  'atMediaUnknownType',
-  '@media screen and foobarhello { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'attribute', 'screen',
-    null, ' ',
-    'operator', 'and',
-    null, ' ',
-    'error', 'foobarhello',
-    null, ' { }'
-  ]
-);
+  // Error, because "foobarhello" is neither a known type or property, but
+  // property was expected (after "and"), and it should be in parenthese.
+  MT("atMediaUnknownType",
+     "[def @media] [attribute screen] [operator and] [error foobarhello] { }");
 
-// Error, because "color" is not a known type, but is a known property, and
-// should be in parentheses.
-MT.testMode(
-  'atMediaInvalidType',
-  '@media screen and color { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'attribute', 'screen',
-    null, ' ',
-    'operator', 'and',
-    null, ' ',
-    'error', 'color',
-    null, ' { }'
-  ]
-);
+  // Error, because "color" is not a known type, but is a known property, and
+  // should be in parentheses.
+  MT("atMediaInvalidType",
+     "[def @media] [attribute screen] [operator and] [error color] { }");
 
-// Error, because "print" is not a known property, but is a known type,
-// and should not be in parenthese.
-MT.testMode(
-  'atMediaInvalidProperty',
-  '@media screen and (print) { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'attribute', 'screen',
-    null, ' ',
-    'operator', 'and',
-    null, ' (',
-    'error', 'print',
-    null, ') { }'
-  ]
-);
+  // Error, because "print" is not a known property, but is a known type,
+  // and should not be in parenthese.
+  MT("atMediaInvalidProperty",
+     "[def @media] [attribute screen] [operator and] ([error print]) { }");
 
-// Soft error, because "foobarhello" is not a known property or type.
-MT.testMode(
-  'atMediaUnknownProperty',
-  '@media screen and (foobarhello) { }',
-  [
-    'def', '@media',
-    null, ' ',
-    'attribute', 'screen',
-    null, ' ',
-    'operator', 'and',
-    null, ' (',
-    'property error', 'foobarhello',
-    null, ') { }'
-  ]
-);
+  // Soft error, because "foobarhello" is not a known property or type.
+  MT("atMediaUnknownProperty",
+     "[def @media] [attribute screen] [operator and] ([property&error foobarhello]) { }");
 
-MT.testMode(
-  'tagSelector',
-  'foo { }',
-  [
-    'tag', 'foo',
-    null, ' { }'
-  ]
-);
+  MT("tagSelector",
+     "[tag foo] { }");
 
-MT.testMode(
-  'classSelector',
-  '.foo-bar_hello { }',
-  [
-    'qualifier', '.foo-bar_hello',
-    null, ' { }'
-  ]
-);
+  MT("classSelector",
+     "[qualifier .foo-bar_hello] { }");
 
-MT.testMode(
-  'idSelector',
-  '#foo { #foo }',
-  [
-    'builtin', '#foo',
-    null, ' { ',
-    'error', '#foo',
-    null, ' }'
-  ]
-);
+  MT("idSelector",
+     "[builtin #foo] { [error #foo] }");
 
-MT.testMode(
-  'tagSelectorUnclosed',
-  'foo { margin: 0 } bar { }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'margin',
-    'operator', ':',
-    null, ' ',
-    'number', '0',
-    null, ' } ',
-    'tag', 'bar',
-    null, ' { }'
-  ]
-);
+  MT("tagSelectorUnclosed",
+     "[tag foo] { [property margin][operator :] [number 0] } [tag bar] { }");
 
-MT.testMode(
-  'tagStringNoQuotes',
-  'foo { font-family: hello world; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'font-family',
-    'operator', ':',
-    null, ' ',
-    'variable-2', 'hello',
-    null, ' ',
-    'variable-2', 'world',
-    null, '; }'
-  ]
-);
+  MT("tagStringNoQuotes",
+     "[tag foo] { [property font-family][operator :] [variable-2 hello] [variable-2 world]; }");
 
-MT.testMode(
-  'tagStringDouble',
-  'foo { font-family: "hello world"; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'font-family',
-    'operator', ':',
-    null, ' ',
-    'string', '"hello world"',
-    null, '; }'
-  ]
-);
+  MT("tagStringDouble",
+     "[tag foo] { [property font-family][operator :] [string \"hello world\"]; }");
 
-MT.testMode(
-  'tagStringSingle',
-  'foo { font-family: \'hello world\'; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'font-family',
-    'operator', ':',
-    null, ' ',
-    'string', '\'hello world\'',
-    null, '; }'
-  ]
-);
+  MT("tagStringSingle",
+     "[tag foo] { [property font-family][operator :] [string 'hello world']; }");
 
-MT.testMode(
-  'tagColorKeyword',
-  'foo { color: black; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'color',
-    'operator', ':',
-    null, ' ',
-    'keyword', 'black',
-    null, '; }'
-  ]
-);
+  MT("tagColorKeyword",
+     "[tag foo] { [property color][operator :] [keyword black]; }");
 
-MT.testMode(
-  'tagColorHex3',
-  'foo { background: #fff; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'background',
-    'operator', ':',
-    null, ' ',
-    'atom', '#fff',
-    null, '; }'
-  ]
-);
+  MT("tagColorHex3",
+     "[tag foo] { [property background][operator :] [atom #fff]; }");
 
-MT.testMode(
-  'tagColorHex6',
-  'foo { background: #ffffff; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'background',
-    'operator', ':',
-    null, ' ',
-    'atom', '#ffffff',
-    null, '; }'
-  ]
-);
+  MT("tagColorHex6",
+     "[tag foo] { [property background][operator :] [atom #ffffff]; }");
 
-MT.testMode(
-  'tagColorHex4',
-  'foo { background: #ffff; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'background',
-    'operator', ':',
-    null, ' ',
-    'atom error', '#ffff',
-    null, '; }'
-  ]
-);
+  MT("tagColorHex4",
+     "[tag foo] { [property background][operator :] [atom&error #ffff]; }");
 
-MT.testMode(
-  'tagColorHexInvalid',
-  'foo { background: #ffg; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'background',
-    'operator', ':',
-    null, ' ',
-    'atom error', '#ffg',
-    null, '; }'
-  ]
-);
+  MT("tagColorHexInvalid",
+     "[tag foo] { [property background][operator :] [atom&error #ffg]; }");
 
-MT.testMode(
-  'tagNegativeNumber',
-  'foo { margin: -5px; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'margin',
-    'operator', ':',
-    null, ' ',
-    'number', '-5px',
-    null, '; }'
-  ]
-);
+  MT("tagNegativeNumber",
+     "[tag foo] { [property margin][operator :] [number -5px]; }");
 
-MT.testMode(
-  'tagPositiveNumber',
-  'foo { padding: 5px; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'padding',
-    'operator', ':',
-    null, ' ',
-    'number', '5px',
-    null, '; }'
-  ]
-);
+  MT("tagPositiveNumber",
+     "[tag foo] { [property padding][operator :] [number 5px]; }");
 
-MT.testMode(
-  'tagVendor',
-  'foo { -foo-box-sizing: -foo-border-box; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'meta', '-foo-',
-    'property', 'box-sizing',
-    'operator', ':',
-    null, ' ',
-    'meta', '-foo-',
-    'string-2', 'border-box',
-    null, '; }'
-  ]
-);
+  MT("tagVendor",
+     "[tag foo] { [meta -foo-][property box-sizing][operator :] [meta -foo-][string-2 border-box]; }");
 
-MT.testMode(
-  'tagBogusProperty',
-  'foo { barhelloworld: 0; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property error', 'barhelloworld',
-    'operator', ':',
-    null, ' ',
-    'number', '0',
-    null, '; }'
-  ]
-);
+  MT("tagBogusProperty",
+     "[tag foo] { [property&error barhelloworld][operator :] [number 0]; }");
 
-MT.testMode(
-  'tagTwoProperties',
-  'foo { margin: 0; padding: 0; }',
-  [
-    'tag', 'foo',
-    null, ' { ',
-    'property', 'margin',
-    'operator', ':',
-    null, ' ',
-    'number', '0',
-    null, '; ',
-    'property', 'padding',
-    'operator', ':',
-    null, ' ',
-    'number', '0',
-    null, '; }'
-  ]
-);
-//
-//MT.testMode(
-//  'tagClass',
-//  '@media only screen and (min-width: 500px), print {foo.bar#hello { color: black !important; background: #f00; margin: -5px; padding: 5px; -foo-box-sizing: border-box; } /* world */}',
-//  [
-//    'def', '@media',
-//    null, ' ',
-//    'keyword', 'only',
-//    null, ' ',
-//    'attribute', 'screen',
-//    null, ' ',
-//    'operator', 'and',
-//    null, ' ',
-//    'bracket', '(',
-//    'property', 'min-width',
-//    'operator', ':',
-//    null, ' ',
-//    'number', '500px',
-//    'bracket', ')',
-//    null, ', ',
-//    'attribute', 'print',
-//    null, ' {',
-//    'tag', 'foo',
-//    'qualifier', '.bar',
-//    'header', '#hello',
-//    null, ' { ',
-//    'property', 'color',
-//    'operator', ':',
-//    null, ' ',
-//    'keyword', 'black',
-//    null, ' ',
-//    'keyword', '!important',
-//    null, '; ',
-//    'property', 'background',
-//    'operator', ':',
-//    null, ' ',
-//    'atom', '#f00',
-//    null, '; ',
-//    'property', 'padding',
-//    'operator', ':',
-//    null, ' ',
-//    'number', '5px',
-//    null, '; ',
-//    'property', 'margin',
-//    'operator', ':',
-//    null, ' ',
-//    'number', '-5px',
-//    null, '; ',
-//    'meta', '-foo-',
-//    'property', 'box-sizing',
-//    'operator', ':',
-//    null, ' ',
-//    'string-2', 'border-box',
-//    null, '; } ',
-//    'comment', '/* world */',
-//    null, '}'
-//  ]
-//);
+  MT("tagTwoProperties",
+     "[tag foo] { [property margin][operator :] [number 0]; [property padding][operator :] [number 0]; }");
+})();