Merge pull request #7042 from adobe/nj/issue-7040

Use state of case sensitivity toggle even when find bar isn't open

Author: peterflynn

src/search/FindReplace.js

@@ -100,7 +100,7 @@ define(function (require, exports, module) {
 
     function getSearchCursor(cm, query, pos) {
         // Heuristic: if the query string is all lowercase, do a case insensitive search.
-        return cm.getSearchCursor(query, pos, !$("#find-case-sensitive").is(".active"));
+        return cm.getSearchCursor(query, pos, !PreferencesManager.getViewState("caseSensitive"));
     }
 
     function _updateSearchBarFromPrefs() {

test/spec/FindReplace-test.js

@@ -107,6 +107,16 @@ define(function (require, exports, module) {
             }
             expect(actualHighlights.length).toEqual(expectedDOMHighlightCount);
         }
+        function expectFindNextSelections(selections) {
+            var i;
+            for (i = 0; i < selections.length; i++) {
+                expectSelection(selections[i]);
+                twCommandManager.execute(Commands.EDIT_FIND_NEXT);
+            }
+
+            // next find should wraparound
+            expectSelection(selections[0]);
+        }
 
 
         function getSearchBar() {
@@ -407,6 +417,25 @@ define(function (require, exports, module) {
                 });
             });
 
+            it("should Find Next after search bar closed, remembering case sensitivity state", function () {
+                runs(function () {
+                    myEditor.setCursorPos(0, 0);
+                    
+                    twCommandManager.execute(Commands.EDIT_FIND);
+                    
+                    toggleCaseSensitive(true);
+                    enterSearchText("Foo");
+                    pressEscape();
+                    expectHighlightedMatches([]);
+                });
+                
+                waitsForSearchBarClose();
+                
+                runs(function () {
+                    expectFindNextSelections(capitalFooSelections);
+                });
+            });
+
             it("shouldn't Find Next after search bar reopened", function () {
                 runs(function () {
                     myEditor.setCursorPos(0, 0);
@@ -668,6 +697,37 @@ define(function (require, exports, module) {
                 expectSelection(expectedSelections[0]);
             });
 
+             
+            it("should Find Next after search bar closed, remembering last used regexp", function () {
+                var expectedSelections = [
+                    {start: {line: LINE_FIRST_REQUIRE + 1, ch: 8}, end: {line: LINE_FIRST_REQUIRE + 1, ch: 11}},
+                    {start: {line: LINE_FIRST_REQUIRE + 1, ch: 31}, end: {line: LINE_FIRST_REQUIRE + 1, ch: 34}},
+                    {start: {line: LINE_FIRST_REQUIRE + 2, ch: 8}, end: {line: LINE_FIRST_REQUIRE + 2, ch: 11}},
+                    {start: {line: LINE_FIRST_REQUIRE + 2, ch: 31}, end: {line: LINE_FIRST_REQUIRE + 2, ch: 34}}
+                ];
+
+                runs(function () {
+                    myEditor.setCursorPos(0, 0);
+                    
+                    twCommandManager.execute(Commands.EDIT_FIND);
+                    
+                    toggleRegexp(true);
+                    enterSearchText("Ba.");
+                    pressEscape();
+                    expectHighlightedMatches([]);
+                });
+                
+                waitsForSearchBarClose();
+                
+                runs(function () {
+                    expectFindNextSelections(expectedSelections);
+                    
+                    // explicitly clean up since we closed the search bar
+                    twCommandManager.execute(Commands.EDIT_FIND);
+                    toggleRegexp(false);
+                });
+            });
+
             it("toggling regexp option should update results immediately", function () {
                 myEditor.setCursorPos(0, 0);
 
@@ -718,7 +778,7 @@ define(function (require, exports, module) {
                 expectHighlightedMatches(expectedSelections);
                 expectSelection(expectedSelections[0]);
             });
-            
+
             it("shouldn't choke on invalid regexp", function () {
                 myEditor.setCursorPos(0, 0);