gollum 2.4.4 → 2.4.5

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/search.js

@@ -1,39 +1,30 @@
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
@@ -45,28 +36,29 @@ var oop = require("./lib/oop");
 var Range = require("./range").Range;
 
 /**
- * class Search
+ * @class Search
  *
  * A class designed to handle all sorts of text searches within a [[Document `Document`]].
  *
  **/
 
 /**
- * new Search()
+ * 
  *
  * Creates a new `Search` object. The following search options are avaliable:
  *
- * * needle: string or regular expression
- * * backwards: false
- * * wrap: false
- * * caseSensitive: false
- * * wholeWord: false
- * * range: Range or null for whole document
- * * regExp: false
- * * start: Range or position
- * * skipCurrent: false
- *
-**/
+ * - `needle`: The string or regular expression you're looking for
+ * - `backwards`: Whether to search backwards from where cursor currently is. Defaults to `false`.
+ * - `wrap`: Whether to wrap the search back to the beginning when it hits the end. Defaults to `false`.
+ * - `caseSensitive`: Whether the search ought to be case-sensitive. Defaults to `false`.
+ * - `wholeWord`: Whether the search matches only on whole words. Defaults to `false`.
+ * - `range`: The [[Range]] to search within. Set this to `null` for the whole document
+ * - `regExp`: Whether the search is a regular expression or not. Defaults to `false`.
+ * - `start`: The starting [[Range]] or cursor position to begin the search
+ * - `skipCurrent`: Whether or not to include the current line in the search. Default to `false`.
+ * 
+ * @constructor
+ **/
 
 var Search = function() {
     this.$options = {};
@@ -74,11 +66,12 @@ var Search = function() {
 
 (function() {
     /**
-     * Search.set(options) -> Search
-     * - options (Object): An object containing all the new search properties
-     *
      * Sets the search options via the `options` parameter.
+     * @param {Object} options An object containing all the new search properties
      *
+     * 
+     * @returns {Search}
+     * @chainable
     **/
     this.set = function(options) {
         oop.mixin(this.$options, options);
@@ -86,24 +79,27 @@ var Search = function() {
     };
 
     /**
-     * Search.getOptions() -> Object
-     *
      * [Returns an object containing all the search options.]{: #Search.getOptions}
-     *
+     * @returns {Object}
     **/
     this.getOptions = function() {
         return lang.copyObject(this.$options);
     };
-
+    
+    /**
+     * Sets the search options via the `options` parameter.
+     * @param {Object} An object containing all the search propertie
+     * @related Search.set
+    **/
     this.setOptions = function(options) {
         this.$options = options;
     };
     /**
-     * Search.find(session) -> Range
-     * - session (EditSession): The session to search with
-     *
      * Searches for `options.needle`. If found, this method returns the [[Range `Range`]] where the text first occurs. If `options.backwards` is `true`, the search goes backwards in the session.
+     * @param {EditSession} session The session to search with
      *
+     * 
+     * @returns {Range}
     **/
     this.find = function(session) {
         var iterator = this.$matchIterator(session, this.$options);
@@ -125,11 +121,11 @@ var Search = function() {
     };
 
     /**
-     * Search.findAll(session) -> [Range]
-     * - session (EditSession): The session to search with
-     *
      * Searches for all occurances `options.needle`. If found, this method returns an array of [[Range `Range`s]] where the text first occurs. If `options.backwards` is `true`, the search goes backwards in the session.
+     * @param {EditSession} session The session to search with
      *
+     * 
+     * @returns [Range]
     **/
     this.findAll = function(session) {
         var options = this.$options;
@@ -137,23 +133,24 @@ var Search = function() {
             return [];
         this.$assembleRegExp(options);
 
-        if (options.range) {
-            var range = options.range;
-            var lines = session.getLines(range.start.row, range.end.row);
-        } else
-            var lines = session.doc.getAllLines();
+        var range = options.range;
+        var lines = range
+            ? session.getLines(range.start.row, range.end.row)
+            : session.doc.getAllLines();
 
         var ranges = [];
         var re = options.re;
         if (options.$isMultiLine) {
             var len = re.length;
             var maxRow = lines.length - len;
-            for (var row = re.offset || 0; row < maxRow; row++) {
-                for (var j = 0; j < re.length; j++)
+            for (var row = re.offset || 0; row <= maxRow; row++) {
+                for (var j = 0; j < len; j++)
                     if (lines[row + j].search(re[j]) == -1)
                         break;
-
-                var startIndex = lines[row + j].match(re[0])[0].length;
+                
+                var startLine = lines[row];
+                var line = lines[row + len - 1];
+                var startIndex = startLine.match(re[0])[0].length;
                 var endIndex = line.match(re[len - 1])[0].length;
 
                 ranges.push(new Range(
@@ -167,11 +164,11 @@ var Search = function() {
                 for (var j = 0; j < matches.length; j++) {
                     var match = matches[j];
                     ranges.push(new Range(i, match.offset, i, match.offset + match.length));
-                };
+                }
             }
         }
 
-        if (options.range) {
+        if (range) {
             var startColumn = range.start.column;
             var endColumn = range.start.column;
             var i = 0, j = ranges.length - 1;
@@ -187,14 +184,14 @@ var Search = function() {
     };
 
     /**
-     * Search.replace(input, replacement) -> String
-     * - input (String): The text to search in
-     * - replacement (String): The replacing text
+     * Searches for `options.needle` in `input`, and, if found, replaces it with `replacement`.
+     * @param {String} input The text to search in
+     * @param {String} replacement The replacing text
      * + (String): If `options.regExp` is `true`, this function returns `input` with the replacement already made. Otherwise, this function just returns `replacement`.<br/>
      * If `options.needle` was not found, this function returns `null`.
      *
-     * Searches for `options.needle` in `input`, and, if found, replaces it with `replacement`.
-     *
+     * 
+     * @returns {String}
     **/
     this.replace = function(input, replacement) {
         var options = this.$options;
@@ -210,7 +207,7 @@ var Search = function() {
         if (!match || match[0].length != input.length)
             return null;
         
-        replacement = input.replace(re, replacement)
+        replacement = input.replace(re, replacement);
         if (options.preserveCase) {
             replacement = replacement.split("");
             for (var i = Math.min(input.length, input.length); i--; ) {
@@ -226,11 +223,6 @@ var Search = function() {
         return replacement;
     };
 
-    /** internal, hide
-     * Search.$matchIterator(session) -> String | Boolean
-     * - session (EditSession): The session to search with
-     *
-    **/
     this.$matchIterator = function(session, options) {
         var re = this.$assembleRegExp(options);
         if (!re)
@@ -261,21 +253,21 @@ var Search = function() {
 
                 if (callback(range))
                     return true;
-            }
+            };
         } else if (backwards) {
             var matchIterator = function(line, row, startIndex) {
                 var matches = lang.getMatchOffsets(line, re);
                 for (var i = matches.length-1; i >= 0; i--)
                     if (callback(matches[i], row, startIndex))
                         return true;
-            }
+            };
         } else {
             var matchIterator = function(line, row, startIndex) {
                 var matches = lang.getMatchOffsets(line, re);
                 for (var i = 0; i < matches.length; i++)
                     if (callback(matches[i], row, startIndex))
                         return true;
-            }
+            };
         }
 
         return {
@@ -310,7 +302,7 @@ var Search = function() {
         try {
             var re = new RegExp(needle, modifier);
         } catch(e) {
-            var re = false;
+            re = false;
         }
         return options.re = re;
     };
@@ -333,7 +325,6 @@ var Search = function() {
     };
 
     this.$lineIterator = function(session, options) {
-        var range = options.range;
         var backwards = options.backwards == true;
         var skipCurrent = options.skipCurrent != false;
 
@@ -346,49 +337,44 @@ var Search = function() {
             start = start[skipCurrent != backwards ? "end" : "start"];
 
         var firstRow = range ? range.start.row : 0;
-        var firstColumn = range ? range.start.column : 0;
         var lastRow = range ? range.end.row : session.getLength() - 1;
 
-        if (!backwards) {
-            var forEach = function(callback) {
+        var forEach = backwards ? function(callback) {
                 var row = start.row;
 
-                var line = session.getLine(row).substr(start.column);
-                if (callback(line, row, start.column))
+                var line = session.getLine(row).substring(0, start.column);
+                if (callback(line, row))
                     return;
 
-                for (row = row+1; row <= lastRow; row++)
+                for (row--; row >= firstRow; row--)
                     if (callback(session.getLine(row), row))
                         return;
 
                 if (options.wrap == false)
                     return;
 
-                for (row = firstRow, lastRow = start.row; row <= lastRow; row++)
+                for (row = lastRow, firstRow = start.row; row >= firstRow; row--)
                     if (callback(session.getLine(row), row))
                         return;
-            }
-        } else {
-            var forEach = function(callback) {
+            } : function(callback) {
                 var row = start.row;
 
-                var line = session.getLine(row).substring(0, start.column);
-                if (callback(line, row))
+                var line = session.getLine(row).substr(start.column);
+                if (callback(line, row, start.column))
                     return;
 
-                for (row--; row >= firstRow; row--)
+                for (row = row+1; row <= lastRow; row++)
                     if (callback(session.getLine(row), row))
                         return;
 
                 if (options.wrap == false)
                     return;
 
-                for (row = lastRow, firstRow = start.row; row >= firstRow; row--)
+                for (row = firstRow, lastRow = start.row; row <= lastRow; row++)
                     if (callback(session.getLine(row), row))
                         return;
-            }
-        }
-
+            };
+        
         return {forEach: forEach};
     };
 

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/search_highlight.js

@@ -1,38 +1,30 @@
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Harutyun Amirjanyan <harutyun@c9.io>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
@@ -50,6 +42,9 @@ var SearchHighlight = function(regExp, clazz, type) {
 };
 
 (function() {
+    // needed to prevent long lines from freezing the browser
+    this.MAX_RANGES = 500;
+    
     this.setRegexp = function(regExp) {
         if (this.regExp+"" == regExp+"")
             return;
@@ -66,6 +61,8 @@ var SearchHighlight = function(regExp, clazz, type) {
             var ranges = this.cache[i];
             if (ranges == null) {
                 ranges = lang.getMatchOffsets(session.getLine(i), this.regExp);
+                if (ranges.length > this.MAX_RANGES)
+                    ranges = ranges.slice(0, this.MAX_RANGES);
                 ranges = ranges.map(function(match) {
                     return new Range(i, match.offset, i, match.offset + match.length);
                 });

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/search_test.js

@@ -1,38 +1,30 @@
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ * Distributed under the BSD license:
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
@@ -51,7 +43,7 @@ module.exports = {
     "test: configure the search object" : function() {
         var search = new Search();
         search.set({
-            needle: "juhu",
+            needle: "juhu"
         });
     },
 
@@ -339,6 +331,24 @@ module.exports = {
         assert.position(ranges[1].start, 2, 1);
         assert.position(ranges[1].end, 2, 3);
     },
+    
+    
+    "test: find all multiline matches" : function() {
+        var session = new EditSession(["juhu", "juhu", "juhu", "juhu"]);
+
+        var search = new Search().set({
+            needle: "hu\nju",
+            wrap: true
+        });
+
+        var ranges = search.findAll(session);
+
+        assert.equal(ranges.length, 3);
+        assert.position(ranges[0].start, 0, 2);
+        assert.position(ranges[0].end, 1, 2);
+        assert.position(ranges[1].start, 1, 2);
+        assert.position(ranges[1].end, 2, 2);
+    },
 
     "test: replace() should return the replacement if the input matches the needle" : function() {
         var search = new Search().set({
@@ -387,7 +397,7 @@ module.exports = {
         var search = new Search().set({
             needle: "[ ]+$",
             regExp: true,
-            wrap: true,
+            wrap: true
         });
 
         session.getSelection().moveCursorTo(1, 2);
@@ -404,7 +414,7 @@ module.exports = {
         var search = new Search().set({
             needle: "foo",
             wrap: true,
-            wholeWord: true,
+            wholeWord: true
         });
 
         session.getSelection().moveCursorTo(0, 4);
@@ -427,7 +437,7 @@ module.exports = {
             needle: "foo",
             wrap: true,
             wholeWord: true,
-            backwards: true,
+            backwards: true
         });
 
         session.getSelection().moveCursorTo(0, 13);