swagr 0.0.8 → 0.0.10

data/Rakefile

@@ -1 +1,21 @@
 require "bundler/gem_tasks"
+
+desc "Update the build date for the gem"
+task :update_build_date do
+  version_file = File.join(".", "lib", "swagr", "version.rb")
+  lines = File.readlines(version_file)
+  lines = lines.map do |line|
+    if line =~ /(\s*)GemBuildDate = "(.+)"/
+      timestamp = Time.new.strftime "%Y-%m-%d %H:%M.%S"
+      "#{$1}GemBuildDate = #{timestamp.inspect}\n"
+    else
+      line
+    end
+  end
+  File.open(version_file, "w") {|fh| fh.write lines.join()}
+end
+
+desc "Update build date then build and install gem"
+task :uinstall => [:update_build_date, :install] do
+  # Nothing to do! Work is done by the two other tasks...
+end

data/bin/swagr

@@ -14,6 +14,15 @@ SkeletonTarball = File.join(SkeletonDir, DefaultSkeletonTarball)
 StaticDir = PublicDir = "static"
 DefaultSubdirs = ["coffee", "views", StaticDir]
 
+def output_lines_from_running_command(command)
+  `#{command}`.split("\n")
+end
+
+def first_output_line_matching(command, regexp)
+  lines = output_lines_from_running_command command
+  lines.each {|line| return line if line =~ regexp}
+end
+
 class SwagrCommand < Thor
 
   include Thor::Actions
@@ -22,25 +31,44 @@ class SwagrCommand < Thor
     SwagrSourceRoot
   end
 
+  desc "version", "Print the current version of swagr"
+  def version
+    say "Swagr version #{Swagr::VERSION} built #{Swagr::GemBuildDate}"
+  end
+
   desc "upgrade", "Upgrade used libs by re-downloading the latest versions of needed libs. Might brake some of your code so use with caution."
   def upgrade
     inside File.join(SwagrSourceRoot, "templates", PublicDir, "js") do
       get "http://d3js.org/d3.v3.min.js"
       get "http://coffeescript.org/extras/coffee-script.js"
       get "http://code.jquery.com/jquery-latest.js"
+      get "https://raw.github.com/square/crossfilter/master/crossfilter.min.js"
 
-      # Now get the codemirror tarball, unpack it then copy just the files we want
+      # Now get the codemirror tarball and unpack it
       get "http://codemirror.net/codemirror.zip"
-      run "unzip -o codemirror.zip"
-      FileUtils.rm_rf "codemirror" # Delete old dir so we get a fresh start
-      empty_directory "codemirror"
-      directory "codemirror-3.0/lib", "codemirror/lib"
-      directory "codemirror-3.0/keymap", "codemirror/keymap"
-      directory "codemirror-3.0/mode", "codemirror/mode"
-      directory "codemirror-3.0/theme", "codemirror/theme"
+      # Find the name of the dir were files will be unpacked by "unzip -l" and parsing the lines until matches regexp
+      re = /\s*0.+(codemirror-\d+.\d+.?\d*)\//
+      line = first_output_line_matching "unzip -l codemirror.zip", re
+      if line
+        line =~ re
+        codemirror_dir = $1
+        say "Found codemirror unzipped to #{codemirror_dir}"
+  
+        run "unzip codemirror.zip"
+
+        # Now copy from unpacked codemirror dir to our template dir
+        FileUtils.rm_rf "codemirror" # Delete old dest dir so we get a fresh start
+        empty_directory "codemirror"
+        directory File.join(codemirror_dir, "lib"), "codemirror/lib"
+        directory File.join(codemirror_dir, "keymap"), "codemirror/keymap"
+        directory File.join(codemirror_dir, "mode"), "codemirror/mode"
+        directory File.join(codemirror_dir, "theme"), "codemirror/theme"
+      end
+
+      # Cleanup after codemirror download and unpack
       FileUtils.rm_rf "codemirror.zip"
       say "Removed tarball"
-      FileUtils.rm_rf "codemirror-3.0"
+      FileUtils.rm_rf codemirror_dir
       say "Removed unpacked codemirror dir"
     end
 

data/examples/examples01/app.rb

@@ -74,8 +74,12 @@ class SwagrGuiServerExample < Sinatra::Base
     slim :index
   end
 
+  get '/edit' do
+    slim :edit
+  end
+
   get '/about' do
-    slim :about, :layout => :layout_cm
+    slim :about
   end
 
   def copyright_holders

data/examples/examples01/views/edit.slim

@@ -0,0 +1,31 @@
+h1 Let's try in-browser code editing
+
+/! script src="js/coffee-script.js" type="text/javascript"
+div class="container" id="code"
+  textarea id="editor" cols="50" rows="10" style="width:30%"
+    | # Hello
+      # This looks ok. How very nice!
+      a = 1 + 2
+
+/! --------------------------------------------------------------
+/! -- Include files needed by CodeMirror (CM)
+/! --------------------------------------------------------------
+link rel="stylesheet" href="js/codemirror/lib/codemirror.css"
+script src="js/codemirror/lib/codemirror.js"
+
+/! CM utils that you use:
+script src="js/codemirror/lib/util/loadmode.js"
+
+/! CM modes that you use:
+script src="js/codemirror/mode/ruby/ruby.js"
+
+/! CM themes that you use:
+link rel="stylesheet" href="js/codemirror/theme/lesser-dark.css"
+
+
+script type="text/javascript"
+  | var editor = CodeMirror.fromTextArea(document.getElementById("editor"), {
+      lineNumbers: true,
+      mode: "ruby",
+      theme: "lesser-dark"
+    });

data/examples/examples01/views/footer.slim

@@ -1,2 +1,2 @@
-h3 Footer...
+/! h3 Footer...
 | Copyright © #{year} #{copyright_holders}

data/examples/examples01/views/layout.slim

@@ -2,20 +2,31 @@ doctype html
 html
   head
     meta charset="utf-8"
-    title Swagr web app template
+
     meta name="viewport" content="width=device-width, initial-scale=1.0"
     meta name="description" content=""
     meta name="author" content="FIXME: YOUR NAME"
-    link href="css/bootstrap.css" rel="stylesheet" /! media="screen"
-    link rel="stylesheet" href="css/codemirror.css"
+
+    title Swagr web app template
+
+    /! --------------------------------------------------------------
+    /! -- Files needed by Bootstrap
+    /! --------------------------------------------------------------
+    link href="css/bootstrap.css" rel="stylesheet"
+
+
+    /! --------------------------------------------------------------
+    /! -- Our own style file + custom changes inline
+    /! --------------------------------------------------------------
     link href="css/style.css" rel="stylesheet" /! media="screen"
     style
       | body {
           padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
         }
+
   body
 
-    div class="container"
+    div class="container" id="main_body_content"
       == slim :navbar
       == yield
 
@@ -24,4 +35,11 @@ html
         == slim :footer
 
     script src="js/jquery-latest.js"
-    script src="js/bootstrap.min.js"
+    script src="js/bootstrap.min.js"
+
+    /! Ensure the active class on the main navbar is updated if one of the nav links is clicked
+    script type="text/javascript"
+      | $('#top-navbar-ul li a').on('click', function() {
+          $(this).parent().parent().find('.active').removeClass('active');
+          $(this).parent().addClass('active').css('font-weight', 'bold');
+        });

data/examples/examples01/views/navbar.slim

@@ -1,16 +1,17 @@
-div class="navbar navbar-inverse navbar-fixed-top"
-  div class="navbar-inner"
-    div class="container"
-      a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"
-        span class="icon-bar"
-        span class="icon-bar"
-        span class="icon-bar"
-      a class="brand" href="/" SwagrApp
-      div class="nav-collapse collapse"
-        ul class="nav"
-          li class="active"
-            a href="/" Home
-          li 
-            a href="/about" About
-          li 
-            a href="/contact" Contact
+div id="#top-navbar"
+  div class="navbar navbar-inverse navbar-fixed-top"
+    div class="navbar-inner"
+      div class="container"
+        a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"
+          span class="icon-bar"
+          span class="icon-bar"
+          span class="icon-bar"
+        a class="brand" href="/" SwagrApp
+        div class="nav-collapse collapse"
+          ul class="nav" id="top-navbar-"
+            li class="active"
+              a href="/" Home
+            li 
+              a href="/edit" Edit
+            li 
+              a href="/about" About

data/lib/swagr/version.rb

@@ -1,3 +1,5 @@
 module Swagr
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
+  # Following line is automatically updated. DO NOT EDIT MANUALLY!
+  GemBuildDate = "2013-01-28 09:57.15"
 end

data/templates/app.rb

@@ -74,8 +74,12 @@ class SwagrGuiServerExample < Sinatra::Base
     slim :index
   end
 
+  get '/edit' do
+    slim :edit
+  end
+
   get '/about' do
-    slim :about, :layout => :layout_cm
+    slim :about
   end
 
   def copyright_holders

data/templates/static/js/codemirror/keymap/vim.js

@@ -115,6 +115,10 @@
         motion: 'moveByWords',
         motionArgs: { forward: false, wordEnd: true, bigWord: true,
             inclusive: true }},
+    { keys: ['{'], type: 'motion', motion: 'moveByParagraph',
+        motionArgs: { forward: false }},
+    { keys: ['}'], type: 'motion', motion: 'moveByParagraph',
+        motionArgs: { forward: true }},
     { keys: ['Ctrl-f'], type: 'motion',
         motion: 'moveByPage', motionArgs: { forward: true }},
     { keys: ['Ctrl-b'], type: 'motion',
@@ -247,7 +251,7 @@
     var specialKeys = ['Left', 'Right', 'Up', 'Down', 'Space', 'Backspace',
         'Esc', 'Home', 'End', 'PageUp', 'PageDown'];
     var validMarks = upperCaseAlphabet.concat(lowerCaseAlphabet).concat(
-        numbers);
+        numbers).concat(['<', '>']);
     var validRegisters = upperCaseAlphabet.concat(lowerCaseAlphabet).concat(
         numbers).concat('-\"'.split(''));
 
@@ -720,7 +724,11 @@
           // Handle user defined Ex to Ex mappings
           exCommandDispatcher.processCommand(cm, command.exArgs.input);
         } else {
-          showPrompt(cm, onPromptClose, ':');
+          if (vim.visualMode) {
+            showPrompt(cm, onPromptClose, ':', undefined, '\'<,\'>');
+          } else {
+            showPrompt(cm, onPromptClose, ':');
+          }
         }
       },
       evalInput: function(cm, vim) {
@@ -806,6 +814,12 @@
             // CodeMirror can't figure out that we changed directions...
             cm.setCursor(selectionStart);
             cm.setSelection(selectionStart, selectionEnd);
+            updateMark(cm, vim, '<',
+                cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
+                    : selectionEnd);
+            updateMark(cm, vim, '>',
+                cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
+                    : selectionStart);
           } else if (!operator) {
             curEnd = clipCursorToContent(cm, curEnd);
             cm.setCursor(curEnd.line, curEnd.ch);
@@ -923,6 +937,22 @@
         cm.setCursor(curStart);
         return curEnd;
       },
+      moveByParagraph: function(cm, motionArgs) {
+        var line = cm.getCursor().line;
+        var repeat = motionArgs.repeat;
+        var inc = motionArgs.forward ? 1 : -1;
+        for (var i = 0; i < repeat; i++) {
+          if ((!motionArgs.forward && line === 0) ||
+              (motionArgs.forward && line == cm.lineCount() - 1)) {
+            break;
+          }
+          line += inc;
+          while (line !== 0 && line != cm.lineCount - 1 && cm.getLine(line)) {
+            line += inc;
+          }
+        }
+        return { line: line, ch: 0 };
+      },
       moveByWords: function(cm, motionArgs) {
         return moveToWord(cm, motionArgs.repeat, !!motionArgs.forward,
             !!motionArgs.wordEnd, !!motionArgs.bigWord);
@@ -1119,21 +1149,29 @@
             cm.setSelection(curStart, curEnd);
           }
         } else {
+          curStart = cm.getCursor('anchor');
+          curEnd = cm.getCursor('head');
           if (!vim.visualLine && actionArgs.linewise) {
             // Shift-V pressed in characterwise visual mode. Switch to linewise
             // visual mode instead of exiting visual mode.
             vim.visualLine = true;
-            curStart = cm.getCursor('anchor');
-            curEnd = cm.getCursor('head');
             curStart.ch = cursorIsBefore(curStart, curEnd) ? 0 :
                 lineLength(cm, curStart.line);
             curEnd.ch = cursorIsBefore(curStart, curEnd) ?
                 lineLength(cm, curEnd.line) : 0;
             cm.setSelection(curStart, curEnd);
+          } else if (vim.visualLine && !actionArgs.linewise) {
+            // v pressed in linewise visual mode. Switch to characterwise visual
+            // mode instead of exiting visual mode.
+            vim.visualLine = false;
           } else {
             exitVisualMode(cm, vim);
           }
         }
+        updateMark(cm, vim, '<', cursorIsBefore(curStart, curEnd) ? curStart
+            : curEnd);
+        updateMark(cm, vim, '>', cursorIsBefore(curStart, curEnd) ? curEnd
+            : curStart);
       },
       joinLines: function(cm, actionArgs, vim) {
         var curStart, curEnd;
@@ -1232,13 +1270,7 @@
       },
       setMark: function(cm, actionArgs, vim) {
         var markName = actionArgs.selectedCharacter;
-        if (!inArray(markName, validMarks)) {
-          return;
-        }
-        if (vim.marks[markName]) {
-          vim.marks[markName].clear();
-        }
-        vim.marks[markName] = cm.setBookmark(cm.getCursor());
+        updateMark(cm, vim, markName, cm.getCursor());
       },
       replace: function(cm, actionArgs) {
         var replaceWith = actionArgs.selectedCharacter;
@@ -1636,6 +1668,16 @@
       return clipCursorToContent(cm, { line: line, ch: repeat - 1 });
     }
 
+    function updateMark(cm, vim, markName, pos) {
+      if (!inArray(markName, validMarks)) {
+        return;
+      }
+      if (vim.marks[markName]) {
+        vim.marks[markName].clear();
+      }
+      vim.marks[markName] = cm.setBookmark(pos);
+    }
+
     function charIdxInLine(start, line, character, forward, includeChar) {
       // Search for char in line.
       // motion_options: {forward, includeChar}
@@ -1804,6 +1846,12 @@
       setMarked: function(marked) {
         this.marked = marked;
       },
+      getOverlay: function() {
+        return this.searchOverlay;
+      },
+      setOverlay: function(overlay) {
+        this.searchOverlay = overlay;
+      },
       isReversed: function() {
         return getVimGlobalState().isReversed;
       },
@@ -1815,9 +1863,9 @@
       var vim = getVimState(cm);
       return vim.searchState_ || (vim.searchState_ = new SearchState());
     }
-    function dialog(cm, text, shortText, callback) {
+    function dialog(cm, text, shortText, callback, initialValue) {
       if (cm.openDialog) {
-        cm.openDialog(text, callback, {bottom: true});
+        cm.openDialog(text, callback, { bottom: true, value: initialValue });
       }
       else {
         callback(prompt(shortText, ""));
@@ -1899,9 +1947,10 @@
       return raw;
     }
     var searchPromptDesc = '(Javascript regexp)';
-    function showPrompt(cm, onPromptClose, prefix, desc) {
+    function showPrompt(cm, onPromptClose, prefix, desc, initialValue) {
       var shortText = (prefix || '') + ' ' + (desc || '');
-      dialog(cm, makePrompt(prefix, desc), shortText, onPromptClose);
+      dialog(cm, makePrompt(prefix, desc), shortText, onPromptClose,
+         initialValue);
     }
     function regexEqual(r1, r2) {
       if (r1 instanceof RegExp && r2 instanceof RegExp) {
@@ -1934,17 +1983,53 @@
         state.setQuery(query);
       });
     }
+    function searchOverlay(query) {
+      return {
+        token: function(stream) {
+          var match = stream.match(query, false);
+          if (match) {
+            if (!stream.sol()) {
+              // Backtrack 1 to match \b
+              stream.backUp(1);
+              if (!query.exec(stream.next() + match[0])) {
+                stream.next();
+                return null;
+              }
+            }
+            stream.match(query);
+            return "searching";
+          }
+          while (!stream.eol()) {
+            stream.next();
+            if (stream.match(query, false)) break;
+          }
+        },
+        query: query
+      };
+    }
     function highlightSearchMatches(cm, query) {
-      // TODO: Highlight only text inside the viewport. Highlighting everything
-      // is inefficient and expensive.
-      if (cm.lineCount() < 2000) { // This is too expensive on big documents.
-        var marked = [];
-        for (var cursor = cm.getSearchCursor(query);
-            cursor.findNext();) {
-          marked.push(cm.markText(cursor.from(), cursor.to(),
-              { className: 'CodeMirror-searching' }));
+      if (cm.addOverlay) {
+        var overlay = getSearchState(cm).getOverlay();
+        if (!overlay || query != overlay.query) {
+          if (overlay) {
+            cm.removeOverlay(overlay);
+          }
+          overlay = searchOverlay(query);
+          cm.addOverlay(overlay);
+          getSearchState(cm).setOverlay(overlay);
+        }
+      } else {
+        // TODO: Highlight only text inside the viewport. Highlighting everything
+        // is inefficient and expensive.
+        if (cm.lineCount() < 2000) { // This is too expensive on big documents.
+          var marked = [];
+          for (var cursor = cm.getSearchCursor(query);
+              cursor.findNext();) {
+            marked.push(cm.markText(cursor.from(), cursor.to(),
+                { className: 'cm-searching' }));
+          }
+          getSearchState(cm).setMarked(marked);
         }
-        getSearchState(cm).setMarked(marked);
       }
     }
     function findNext(cm, prev, repeat) {
@@ -1978,20 +2063,52 @@
         return cursor.from();
       });}
     function clearSearchHighlight(cm) {
-      cm.operation(function() {
-        var state = getSearchState(cm);
-        if (!state.getQuery()) {
-          return;
-        }
-        var marked = state.getMarked();
-        if (!marked) {
-          return;
-        }
-        for (var i = 0; i < marked.length; ++i) {
-          marked[i].clear();
+      if (cm.addOverlay) {
+        cm.removeOverlay(getSearchState(cm).getOverlay());
+        getSearchState(cm).setOverlay(null);
+      } else {
+        cm.operation(function() {
+          var state = getSearchState(cm);
+          if (!state.getQuery()) {
+            return;
+          }
+          var marked = state.getMarked();
+          if (!marked) {
+            return;
+          }
+          for (var i = 0; i < marked.length; ++i) {
+            marked[i].clear();
+          }
+          state.setMarked(null);
+        });
+      }
+    }
+    /**
+     * Check if pos is in the specified range, INCLUSIVE.
+     * Range can be specified with 1 or 2 arguments.
+     * If the first range argument is an array, treat it as an array of line
+     * numbers. Match pos against any of the lines.
+     * If the first range argument is a number,
+     *   if there is only 1 range argument, check if pos has the same line
+     *       number
+     *   if there are 2 range arguments, then check if pos is in between the two
+     *       range arguments.
+     */
+    function isInRange(pos, start, end) {
+      if (typeof pos != 'number') {
+        // Assume it is a cursor position. Get the line number.
+        pos = pos.line;
+      }
+      if (start instanceof Array) {
+        return inArray(pos, start);
+      } else {
+        if (end) {
+          return (pos >= start && pos <= end);
+        } else {
+          return pos == start;
         }
-        state.setMarked(null);
-      });}
+      }
+    }
 
     // Ex command handling
     // Care must be taken when adding to the default Ex command map. For any
@@ -2001,14 +2118,23 @@
       { name: 'map', type: 'builtIn' },
       { name: 'write', shortName: 'w', type: 'builtIn' },
       { name: 'undo', shortName: 'u', type: 'builtIn' },
-      { name: 'redo', shortName: 'red', type: 'builtIn' }
+      { name: 'redo', shortName: 'red', type: 'builtIn' },
+      { name: 'substitute', shortName: 's', type: 'builtIn'}
     ];
-    var ExCommandDispatcher = function() {
+    Vim.ExCommandDispatcher = function() {
       this.buildCommandMap_();
     };
-    ExCommandDispatcher.prototype = {
+    Vim.ExCommandDispatcher.prototype = {
       processCommand: function(cm, input) {
-        var params = this.parseInput_(input);
+        var inputStream = new CodeMirror.StringStream(input);
+        var params = {};
+        params.input = input;
+        try {
+          this.parseInput_(cm, inputStream, params);
+        } catch(e) {
+          showConfirm(cm, e);
+          return;
+        }
         var commandName;
         if (!params.commandName) {
           // If only a line range is defined, move to the line.
@@ -2019,6 +2145,7 @@
           var command = this.matchCommand_(params.commandName);
           if (command) {
             commandName = command.name;
+            this.parseCommandArgs_(inputStream, params, command);
             if (command.type == 'exToKey') {
               // Handle Ex to Key mapping.
               for (var i = 0; i < command.toKeys.length; i++) {
@@ -2038,37 +2165,63 @@
         }
         exCommands[commandName](cm, params);
       },
-      parseInput_: function(input) {
-        var result = {};
-        result.input = input;
-        var idx = 0;
-        // Trim preceding ':'.
-        var colons = (/^:+/).exec(input);
-        if (colons) {
-          idx += colons[0].length;
-        }
-
+      parseInput_: function(cm, inputStream, result) {
+        inputStream.eatWhile(':');
         // Parse range.
-        var numberMatch = (/^(\d+)/).exec(input.substring(idx));
-        if (numberMatch) {
-          result.line = parseInt(numberMatch[1], 10);
-          idx += numberMatch[0].length;
+        if (inputStream.eat('%')) {
+          result.line = 0;
+          result.lineEnd = cm.lineCount() - 1;
+        } else {
+          result.line = this.parseLineSpec_(cm, inputStream);
+          if (result.line !== undefined && inputStream.eat(',')) {
+            result.lineEnd = this.parseLineSpec_(cm, inputStream);
+          }
         }
 
         // Parse command name.
-        var commandMatch = (/^(\w+)/).exec(input.substring(idx));
+        var commandMatch = inputStream.match(/^(\w+)/);
         if (commandMatch) {
           result.commandName = commandMatch[1];
-          idx += commandMatch[1].length;
+        } else {
+          result.commandName = inputStream.match(/.*/)[0];
         }
 
+        return result;
+      },
+      parseLineSpec_: function(cm, inputStream) {
+        var numberMatch = inputStream.match(/^(\d+)/);
+        if (numberMatch) {
+          return parseInt(numberMatch[1], 10) - 1;
+        }
+        switch (inputStream.next()) {
+          case '.':
+            return cm.getCursor().line;
+          case '$':
+            return cm.lineCount() - 1;
+          case '\'':
+            var mark = getVimState(cm).marks[inputStream.next()];
+            if (mark && mark.find()) {
+              return mark.find().line;
+            } else {
+              throw "Mark not set";
+            }
+            break;
+          default:
+            inputStream.backUp(1);
+            return cm.getCursor().line;
+        }
+      },
+      parseCommandArgs_: function(inputStream, params, command) {
+        if (inputStream.eol()) {
+          return;
+        }
+        params.argString = inputStream.match(/.*/)[0];
         // Parse command-line arguments
-        var args = trim(input.substring(idx)).split(/\s+/);
+        var delim = command.argDelimiter || /\s+/;
+        var args = trim(params.argString).split(delim);
         if (args.length && args[0]) {
-          result.commandArgs = args;
+          params.args = args;
         }
-
-        return result;
       },
       matchCommand_: function(commandName) {
         // Return the command in the command map that matches the shortest
@@ -2095,9 +2248,9 @@
         }
       },
       map: function(lhs, rhs) {
-        if (lhs.charAt(0) == ':') {
+        if (lhs != ':' && lhs.charAt(0) == ':') {
           var commandName = lhs.substring(1);
-          if (rhs.charAt(0) == ':') {
+          if (rhs != ':' && rhs.charAt(0) == ':') {
             // Ex to Ex mapping
             this.commandMap_[commandName] = {
               name: commandName,
@@ -2113,7 +2266,7 @@
             };
           }
         } else {
-          if (rhs.charAt(0) == ':') {
+          if (rhs != ':' && rhs.charAt(0) == ':') {
             // Key to Ex mapping.
             defaultKeymap.unshift({
               keys: parseKeyString(lhs),
@@ -2172,7 +2325,7 @@
 
     var exCommands = {
       map: function(cm, params) {
-        var mapArgs = params.commandArgs;
+        var mapArgs = params.args;
         if (!mapArgs || mapArgs.length < 2) {
           if (cm) {
             showConfirm(cm, 'Invalid mapping: ' + params.input);
@@ -2187,6 +2340,66 @@
             motionArgs: { forward: false, explicitRepeat: true,
               linewise: true, repeat: params.line }});
       },
+      substitute: function(cm, params) {
+        var argString = params.argString;
+        var slashes = findUnescapedSlashes(argString);
+        if (slashes[0] !== 0) {
+          showConfirm(cm, 'Substitutions should be of the form ' +
+              ':s/pattern/replace/');
+          return;
+        }
+        var regexPart = argString.substring(slashes[0] + 1, slashes[1]);
+        var replacePart = '';
+        var flagsPart;
+        var count;
+        if (slashes[1]) {
+          replacePart = argString.substring(slashes[1] + 1, slashes[2]);
+        }
+        if (slashes[2]) {
+          // After the 3rd slash, we can have flags followed by a space followed
+          // by count.
+          var trailing = argString.substring(slashes[2] + 1).split(' ');
+          flagsPart = trailing[0];
+          count = parseInt(trailing[1]);
+        }
+        if (flagsPart) {
+          regexPart = regexPart + '/' + flagsPart;
+        }
+        if (regexPart) {
+          // If regex part is empty, then use the previous query. Otherwise use
+          // the regex part as the new query.
+          updateSearchQuery(cm, regexPart, true /** ignoreCase */,
+            true /** smartCase */);
+        }
+        var state = getSearchState(cm);
+        var query = state.getQuery();
+        var lineStart = params.line || 0;
+        var lineEnd = params.lineEnd || lineStart;
+        if (count) {
+          lineStart = lineEnd;
+          lineEnd = lineStart + count - 1;
+        }
+        var startPos = clipCursorToContent(cm, { line: lineStart, ch: 0 });
+        function doReplace() {
+          for (var cursor = cm.getSearchCursor(query, startPos);
+               cursor.findNext() &&
+                   isInRange(cursor.from(), lineStart, lineEnd);) {
+            var text = cm.getRange(cursor.from(), cursor.to());
+            var newText = text.replace(query, replacePart);
+            cursor.replace(newText);
+          }
+          var vim = getVimState(cm);
+          if (vim.visualMode) {
+            exitVisualMode(cm, vim);
+          }
+        }
+        if (cm.compoundChange) {
+          // Only exists in v2
+          cm.compoundChange(doReplace);
+        } else {
+          cm.operation(doReplace);
+        }
+      },
       redo: CodeMirror.commands.redo,
       undo: CodeMirror.commands.undo,
       write: function(cm) {
@@ -2200,7 +2413,7 @@
       }
     };
 
-    var exCommandDispatcher = new ExCommandDispatcher();
+    var exCommandDispatcher = new Vim.ExCommandDispatcher();
 
     // Register Vim with CodeMirror
     function buildVimKeyMap() {