review comment responses and the addition of two failing tests that

dangoor · dangoor · commit 57d262804728 · 2013-01-09T22:11:34.000-05:00
illustrate bugs found during review
diff --git a/src/search/QuickOpen.js b/src/search/QuickOpen.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, window, setTimeout, ArrayBuffer, Int8Array */
+/*global define, $, window, setTimeout */
 
 /*
  * Displays an auto suggest pop-up list of files to allow the user to quickly navigate to a file and lines
@@ -770,4 +770,10 @@ define(function (require, exports, module) {
     exports.beginSearch             = beginSearch;
     exports.addQuickOpenPlugin      = addQuickOpenPlugin;
     exports.highlightMatch          = highlightMatch;
+    
+    // accessing these from this module will ultimately be deprecated
+    exports.stringMatch             = StringMatch.stringMatch;
+    exports.SearchResult            = StringMatch.SearchResult;
+    exports.basicMatchSort          = StringMatch.basicMatchSort;
+    exports.multiFieldSort          = StringMatch.multiFieldSort;
 });
diff --git a/src/utils/StringMatch.js b/src/utils/StringMatch.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, window, setTimeout, ArrayBuffer, Int8Array */
+/*global define, $, window, setTimeout */
 /*unittests: StringMatch */
 
 define(function (require, exports, module) {
@@ -149,7 +149,7 @@ define(function (require, exports, module) {
      * @param {Array} specials list of special indexes in str (from findSpecialCharacters)
      * @param {int} startingSpecial index into specials array to start scanning with
      * @param {boolean} lastSegmentStart optional which character does the last segment start at
-     * @return {{ranges:Array.{text:string, matched:boolean, includesLastSegment:boolean}, matchGoodness:int, scoreDebug: Object}} matched ranges and score
+     * @return {{ranges:Array.<{text:string, matched:boolean, includesLastSegment:boolean}>, matchGoodness:int, scoreDebug: Object}} matched ranges and score
      */
     function getMatchRanges(query, str, compareStr, specials, startingSpecial, lastSegmentStart) {
         var ranges = [];
@@ -393,7 +393,7 @@ define(function (require, exports, module) {
      * @param {Array} specials list of special indexes in str (from findSpecialCharacters)
      * @param {int} startingSpecial index into specials array to start scanning with
      * @param {boolean} lastSegmentStart which character does the last segment start at
-     * @return {{ranges:Array.{text:string, matched:boolean, includesLastSegment:boolean}, remainder:string, matchGoodness:int, scoreDebug: Object}} matched ranges and score
+     * @return {{ranges:Array.<{text:string, matched:boolean, includesLastSegment:boolean}>, remainder:string, matchGoodness:int, scoreDebug: Object}} matched ranges and score
      */
     function _lastSegmentSearch(query, str, compareStr, specials, startingSpecial, lastSegmentStart) {
         var queryCounter, matchRanges;
@@ -436,7 +436,7 @@ define(function (require, exports, module) {
      * @param {string} str the original string to search
      * @param {Array} specials list of special indexes in str (from findSpecialCharacters)
      * @param {int} lastSegmentSpecialsIndex index into specials array to start scanning with
-     * @return {{ranges:Array.{text:string, matched:boolean, includesLastSegment:boolean}, matchGoodness:int, scoreDebug: Object}} matched ranges and score
+     * @return {{ranges:Array.<{text:string, matched:boolean, includesLastSegment:boolean}>, matchGoodness:int, scoreDebug: Object}} matched ranges and score
      */
     function _computeMatch(query, str, specials, lastSegmentSpecialsIndex) {
         // set up query as all lower case and make a lower case string to use for comparisons
diff --git a/test/spec/StringMatch-test.js b/test/spec/StringMatch-test.js
@@ -288,6 +288,16 @@ define(function (require, exports, module) {
                         { text: "pen.js", matched: false, includesLastSegment: true }
                     ]
                 });
+                
+                expect(stringMatch("MoonsunSum", "sun")).toEqual({
+                    matchGoodness: jasmine.any(Number),
+                    label: "MoonsunSum",
+                    stringRanges: [
+                        { text: "Moon", matched: false, includesLastSegment: true },
+                        { text: "sun", matched: true, includesLastSegment: true },
+                        { text: "Sum", matched: false, includesLastSegment: true }
+                    ]
+                });
             });
             
             it("should prefer special characters", function () {
@@ -417,7 +427,11 @@ define(function (require, exports, module) {
                 result = StringMatch.stringMatch("src/thirdparty/CodeMirror2/mode/ntriples/index.html", "codemirror");
                 expect(result.scoreDebug.notStartingOnSpecial).toEqual(0);
             });
-
+            
+            it("should try to prioritize points for the last segment", function () {
+                var result = StringMatch.stringMatch("abc/def/zzz/abc/def", "abc/def");
+                expect(result.scoreDebug.lastSegment).toBeGreaterThan(0);
+            });
         });
     });
 });
