From fb2335d13d62bacc4d908e0c4f9ec34c56a32360 Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Wed, 21 Aug 2013 14:38:17 -0700
Subject: [PATCH 01/19] first tests passing

---
 src/language/CSSUtils.js   | 12 ++++++++++++
 test/spec/CSSUtils-test.js | 14 +++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index a331e798008..7001c36c192 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1115,9 +1115,21 @@ define(function (require, exports, module) {
         return _stripAtRules(selector);
     }
     
+    function extractAllNamedFlows(text) {
+        var namedFlowRegEx = /(?:flow\-into\: *)([a-zA-Z0-9_\-]+)(?: *;)/gi,
+            matches;
+        
+        matches = namedFlowRegEx.exec(text);
+        if (matches && matches.length > 1) {
+            return matches.slice(1);
+        }
+        return [];
+    }
+    
     exports._findAllMatchingSelectorsInText = _findAllMatchingSelectorsInText; // For testing only
     exports.findMatchingRules = findMatchingRules;
     exports.extractAllSelectors = extractAllSelectors;
+    exports.extractAllNamedFlows = extractAllNamedFlows;
     exports.findSelectorAtDocumentPos = findSelectorAtDocumentPos;
 
     exports.SELECTOR = SELECTOR;
diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js
index f8df31facfc..a04f6f081bd 100644
--- a/test/spec/CSSUtils-test.js
+++ b/test/spec/CSSUtils-test.js
@@ -41,7 +41,8 @@ define(function (require, exports, module) {
         offsetsCssFileEntry        = new NativeFileSystem.FileEntry(testPath + "/offsets.css"),
         bootstrapCssFileEntry      = new NativeFileSystem.FileEntry(testPath + "/bootstrap.css"),
         escapesCssFileEntry        = new NativeFileSystem.FileEntry(testPath + "/escaped-identifiers.css"),
-        embeddedHtmlFileEntry      = new NativeFileSystem.FileEntry(testPath + "/embedded.html");
+        embeddedHtmlFileEntry      = new NativeFileSystem.FileEntry(testPath + "/embedded.html"),
+        cssRegionsFileEntry        = new NativeFileSystem.FileEntry(testPath + "/regions.css");
     
     var contextTestCss             = require("text!spec/CSSUtils-test-files/contexts.css"),
         selectorPositionsTestCss   = require("text!spec/CSSUtils-test-files/selector-positions.css");
@@ -1922,4 +1923,15 @@ define(function (require, exports, module) {
             });
         });
     });
+    
+    describe("CSS Regions", function () {
+        beforeEach(function () {
+            init(this, cssRegionsFileEntry);
+        });
+        
+        it("should find named flows", function () {
+            expect(CSSUtils.extractAllNamedFlows(this.fileContent).length).toNotBe(0);
+        });
+        
+    });
 });

From e10a0b1c3e5dd782c3193e6ebc5c05fbce5c3820 Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Wed, 21 Aug 2013 14:42:15 -0700
Subject: [PATCH 02/19] add another test

---
 test/spec/CSSUtils-test-files/regions.css | 7 +++++++
 test/spec/CSSUtils-test.js                | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 test/spec/CSSUtils-test-files/regions.css

diff --git a/test/spec/CSSUtils-test-files/regions.css b/test/spec/CSSUtils-test-files/regions.css
new file mode 100644
index 00000000000..f7668803bc5
--- /dev/null
+++ b/test/spec/CSSUtils-test-files/regions.css
@@ -0,0 +1,7 @@
+article.content {
+    flow-into: main;
+}
+
+section.layout > div {
+    flow-from: main;
+}
diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js
index a04f6f081bd..5261ee5942b 100644
--- a/test/spec/CSSUtils-test.js
+++ b/test/spec/CSSUtils-test.js
@@ -1930,7 +1930,9 @@ define(function (require, exports, module) {
         });
         
         it("should find named flows", function () {
-            expect(CSSUtils.extractAllNamedFlows(this.fileContent).length).toNotBe(0);
+            var namedFlows = CSSUtils.extractAllNamedFlows(this.fileContent);
+            expect(namedFlows.length).toBe(1);
+            expect(namedFlows[0]).toBe("main");
         });
         
     });

From 941b8a5522fef0bf84c817f98d2ec764bc92f8dc Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Wed, 21 Aug 2013 15:25:53 -0700
Subject: [PATCH 03/19] multiple named-flows

---
 src/language/CSSUtils.js                  | 17 ++++++++++++-----
 test/spec/CSSUtils-test-files/regions.css |  9 +++++++++
 test/spec/CSSUtils-test.js                |  3 ++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 7001c36c192..99f6ce54a7d 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1117,13 +1117,20 @@ define(function (require, exports, module) {
     
     function extractAllNamedFlows(text) {
         var namedFlowRegEx = /(?:flow\-into\: *)([a-zA-Z0-9_\-]+)(?: *;)/gi,
+            result = [],
             matches;
         
-        matches = namedFlowRegEx.exec(text);
-        if (matches && matches.length > 1) {
-            return matches.slice(1);
-        }
-        return [];
+        matches = text.match(namedFlowRegEx) || [];
+        
+        matches.forEach(function (match) {
+            var nameRegEx = /(?:flow\-into\: *)([a-zA-Z0-9_\-]+)(?: *;)/i,
+                thisMatch = nameRegEx.exec(match);
+            if (thisMatch && thisMatch.length === 2) {
+                result.push(thisMatch[1]);
+            }
+        });
+        
+        return result;
     }
     
     exports._findAllMatchingSelectorsInText = _findAllMatchingSelectorsInText; // For testing only
diff --git a/test/spec/CSSUtils-test-files/regions.css b/test/spec/CSSUtils-test-files/regions.css
index f7668803bc5..6e380c51e1b 100644
--- a/test/spec/CSSUtils-test-files/regions.css
+++ b/test/spec/CSSUtils-test-files/regions.css
@@ -5,3 +5,12 @@ article.content {
 section.layout > div {
     flow-from: main;
 }
+
+
+#jeff.content {
+    flow-into: jeff;
+}
+
+#jeff.layout > div {
+    flow-from: jeff;
+}
diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js
index 5261ee5942b..3c1bcce6e69 100644
--- a/test/spec/CSSUtils-test.js
+++ b/test/spec/CSSUtils-test.js
@@ -1931,8 +1931,9 @@ define(function (require, exports, module) {
         
         it("should find named flows", function () {
             var namedFlows = CSSUtils.extractAllNamedFlows(this.fileContent);
-            expect(namedFlows.length).toBe(1);
+            expect(namedFlows.length).toBe(2);
             expect(namedFlows[0]).toBe("main");
+            expect(namedFlows[1]).toBe("jeff");
         });
         
     });

From e4ab107d3ae2a3343019eb6fe36926029d2722f8 Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Wed, 21 Aug 2013 15:58:21 -0700
Subject: [PATCH 04/19] exclude strings and comments from results

---
 src/language/CSSUtils.js                  | 21 ++++++++++++++++++++
 test/spec/CSSUtils-test-files/regions.css | 24 +++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 99f6ce54a7d..a0b9d28be3f 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1115,13 +1115,34 @@ define(function (require, exports, module) {
         return _stripAtRules(selector);
     }
     
+    // From http://stackoverflow.com/questions/4402220/regex-to-minimize-css
+    function _minimize(_content) {
+        var content = _content;
+        content = content.replace(/\/\*(?:(?!\*\/)[\s\S])*\*\/|[\r\n\t]+/g, '');
+        // now all comments, newlines and tabs have been removed
+        content = content.replace(/ {2,}/g, ' ');
+        // now there are no more than single adjacent spaces left
+        // now unnecessary: content = content.replace( /(\s)+\./g, ' .' );
+        content = content.replace(/ ([{:}]) /g, '$1');
+        content = content.replace(/([;,]) /g, '$1');
+        content = content.replace(/ !/g, '!');
+        return content;
+    }
+    
     function extractAllNamedFlows(text) {
         var namedFlowRegEx = /(?:flow\-into\: *)([a-zA-Z0-9_\-]+)(?: *;)/gi,
             result = [],
             matches;
         
+        // Minimize the CSS so that strings and comments
+        //  do not match results
+        text = _minimize(text);
+        
+        // Find the lines that match.  This will return an array of 
+        //  matched css properties (flow-into: junk;)
         matches = text.match(namedFlowRegEx) || [];
         
+        // Parse the matches to extract the name of the flow
         matches.forEach(function (match) {
             var nameRegEx = /(?:flow\-into\: *)([a-zA-Z0-9_\-]+)(?: *;)/i,
                 thisMatch = nameRegEx.exec(match);
diff --git a/test/spec/CSSUtils-test-files/regions.css b/test/spec/CSSUtils-test-files/regions.css
index 6e380c51e1b..552b2907860 100644
--- a/test/spec/CSSUtils-test-files/regions.css
+++ b/test/spec/CSSUtils-test-files/regions.css
@@ -14,3 +14,27 @@ section.layout > div {
 #jeff.layout > div {
     flow-from: jeff;
 }
+
+/*
+p.content {
+    flow-into: carter;
+}
+
+p.layout > div {
+    flow-from: carter;
+}
+*/
+
+div {
+    content: "/* p.content { flow-into: carter; } p.layout > div { flow-from: carter; } */"
+}
+
+/*
+div.content {
+    content: "flow-into: martin;"
+}
+
+div.layout > div {
+    content: "flow-from: martin;"
+}
+*/

From 47cced39f1cbf7a3359ffe7b413866c7c0192092 Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Wed, 21 Aug 2013 16:52:04 -0700
Subject: [PATCH 05/19] exclude strings, previous commit handled everything
 except strings

---
 src/language/CSSUtils.js                  | 17 ++++++++++++++++-
 test/spec/CSSUtils-test-files/regions.css | 10 +++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index a0b9d28be3f..f058100a38e 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1115,6 +1115,7 @@ define(function (require, exports, module) {
         return _stripAtRules(selector);
     }
     
+    // Essentially minifies CSS by removing all newlines, tabs and comments 
     // From http://stackoverflow.com/questions/4402220/regex-to-minimize-css
     function _minimize(_content) {
         var content = _content;
@@ -1129,6 +1130,20 @@ define(function (require, exports, module) {
         return content;
     }
     
+    // Essentially minifies CSS by removing all newlines, tabs and comments 
+    // From http://stackoverflow.com/questions/4402220/regex-to-minimize-css
+    function _reduceStrings(_content) {
+        return _content.replace(/[^\\]\"(.*)[^\\]\"|[^\\]\'(.*)[^\\]\'+/g, '');
+    }
+    
+    /**
+     * Extracts all nemd flow instances
+     * @param {!String} text to extract from
+     * @param {?Document} htmlDocument An HTML file for context (so we can search <style> blocks)
+     * @return {$.Promise} that will be resolved with an Array of objects containing the
+     *      source document, start line, and end line (0-based, inclusive range) for each matching declaration list.
+     *      Does not addRef() the documents returned in the array.
+     */
     function extractAllNamedFlows(text) {
         var namedFlowRegEx = /(?:flow\-into\: *)([a-zA-Z0-9_\-]+)(?: *;)/gi,
             result = [],
@@ -1136,7 +1151,7 @@ define(function (require, exports, module) {
         
         // Minimize the CSS so that strings and comments
         //  do not match results
-        text = _minimize(text);
+        text = _reduceStrings(_minimize(text));
         
         // Find the lines that match.  This will return an array of 
         //  matched css properties (flow-into: junk;)
diff --git a/test/spec/CSSUtils-test-files/regions.css b/test/spec/CSSUtils-test-files/regions.css
index 552b2907860..745c11d5952 100644
--- a/test/spec/CSSUtils-test-files/regions.css
+++ b/test/spec/CSSUtils-test-files/regions.css
@@ -26,15 +26,19 @@ p.layout > div {
 */
 
 div {
-    content: "/* p.content { flow-into: carter; } p.layout > div { flow-from: carter; } */"
+    content: "/* p.content { flow-into: carter; } p.layout > div { flow-from: carter; } */";
+}
+
+div {
+    content: "html.content { flow-into: dexter; } html.layout > div { flow-from: dexter; }";
 }
 
 /*
 div.content {
-    content: "flow-into: martin;"
+    content: "flow-into: martin;";
 }
 
 div.layout > div {
-    content: "flow-from: martin;"
+    content: "flow-from: martin;";
 }
 */

From 1e6b5462ca23344e25fbc8e2046aa2471e6c49c4 Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Wed, 21 Aug 2013 17:11:13 -0700
Subject: [PATCH 06/19] turn off regex insecure warning

---
 src/language/CSSUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index f058100a38e..67293d0d62d 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -22,7 +22,7 @@
  */
 
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp: true */
 /*global define, $, CodeMirror, _parseRuleList: true */
 
 // JSLint Note: _parseRuleList() is cyclical dependency, not a global function.

From 4954ffbbfd4b79413575b0d5ee936c4ed21a43dd Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Wed, 21 Aug 2013 17:12:37 -0700
Subject: [PATCH 07/19] fix comment

---
 src/language/CSSUtils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 67293d0d62d..a4b2bc3ab02 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1130,8 +1130,7 @@ define(function (require, exports, module) {
         return content;
     }
     
-    // Essentially minifies CSS by removing all newlines, tabs and comments 
-    // From http://stackoverflow.com/questions/4402220/regex-to-minimize-css
+    // removes strings from the content 
     function _reduceStrings(_content) {
         return _content.replace(/[^\\]\"(.*)[^\\]\"|[^\\]\'(.*)[^\\]\'+/g, '');
     }

From 1186c2c234e585c40ca503310b8875dc91ebe03a Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 10:43:30 -0700
Subject: [PATCH 08/19] add another test case

---
 test/spec/CSSUtils-test-files/regions.css | 10 ++++++++++
 test/spec/CSSUtils-test.js                |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/test/spec/CSSUtils-test-files/regions.css b/test/spec/CSSUtils-test-files/regions.css
index 745c11d5952..174910bde2b 100644
--- a/test/spec/CSSUtils-test-files/regions.css
+++ b/test/spec/CSSUtils-test-files/regions.css
@@ -42,3 +42,13 @@ div.layout > div {
     content: "flow-from: martin;";
 }
 */
+
+#randy.content {
+    flow-into:   
+        randy
+        ;
+}
+
+#randy.layout > div {
+    flow-from:  randy;
+}
diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js
index 3c1bcce6e69..7b6afc7effa 100644
--- a/test/spec/CSSUtils-test.js
+++ b/test/spec/CSSUtils-test.js
@@ -1931,9 +1931,10 @@ define(function (require, exports, module) {
         
         it("should find named flows", function () {
             var namedFlows = CSSUtils.extractAllNamedFlows(this.fileContent);
-            expect(namedFlows.length).toBe(2);
+            expect(namedFlows.length).toBe(3);
             expect(namedFlows[0]).toBe("main");
             expect(namedFlows[1]).toBe("jeff");
+            expect(namedFlows[2]).toBe("randy");
         });
         
     });

From e5aad2c8f9bb5f38aa99f9ab29776dfb2dba687d Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 13:34:04 -0700
Subject: [PATCH 09/19] remove upper case constraint since regex is case
 insensitive

---
 src/language/CSSUtils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index a4b2bc3ab02..1f868ebaa2e 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1144,7 +1144,7 @@ define(function (require, exports, module) {
      *      Does not addRef() the documents returned in the array.
      */
     function extractAllNamedFlows(text) {
-        var namedFlowRegEx = /(?:flow\-into\: *)([a-zA-Z0-9_\-]+)(?: *;)/gi,
+        var namedFlowRegEx = /(?:flow\-into\: *)([a-z0-9_\-]+)(?: *;)/gi,
             result = [],
             matches;
         
@@ -1158,7 +1158,7 @@ define(function (require, exports, module) {
         
         // Parse the matches to extract the name of the flow
         matches.forEach(function (match) {
-            var nameRegEx = /(?:flow\-into\: *)([a-zA-Z0-9_\-]+)(?: *;)/i,
+            var nameRegEx = /(?:flow\-into\: *)([a-z0-9_\-]+)(?: *;)/i,
                 thisMatch = nameRegEx.exec(match);
             if (thisMatch && thisMatch.length === 2) {
                 result.push(thisMatch[1]);

From 9af20b7a2f018c5a4c4c8a2466965044528dbff3 Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 13:40:21 -0700
Subject: [PATCH 10/19] move whitespace to regex

---
 src/language/CSSUtils.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 1f868ebaa2e..5b0708da1b0 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1119,9 +1119,7 @@ define(function (require, exports, module) {
     // From http://stackoverflow.com/questions/4402220/regex-to-minimize-css
     function _minimize(_content) {
         var content = _content;
-        content = content.replace(/\/\*(?:(?!\*\/)[\s\S])*\*\/|[\r\n\t]+/g, '');
-        // now all comments, newlines and tabs have been removed
-        content = content.replace(/ {2,}/g, ' ');
+        content = content.replace(/\/\*(?:(?!\*\/)[\s\S])*\*\//g, '');
         // now there are no more than single adjacent spaces left
         // now unnecessary: content = content.replace( /(\s)+\./g, ' .' );
         content = content.replace(/ ([{:}]) /g, '$1');
@@ -1144,7 +1142,7 @@ define(function (require, exports, module) {
      *      Does not addRef() the documents returned in the array.
      */
     function extractAllNamedFlows(text) {
-        var namedFlowRegEx = /(?:flow\-into\: *)([a-z0-9_\-]+)(?: *;)/gi,
+        var namedFlowRegEx = /(?:flow\-into\:[ \t\n\r]*)([a-z0-9_\-]+)(?:[ \t\n\r]*;)/gi,
             result = [],
             matches;
         
@@ -1158,7 +1156,7 @@ define(function (require, exports, module) {
         
         // Parse the matches to extract the name of the flow
         matches.forEach(function (match) {
-            var nameRegEx = /(?:flow\-into\: *)([a-z0-9_\-]+)(?: *;)/i,
+            var nameRegEx = /(?:flow\-into\:[ \t\n\r]*)([a-z0-9_\-]+)(?:[ \t\n\r]*;)/i,
                 thisMatch = nameRegEx.exec(match);
             if (thisMatch && thisMatch.length === 2) {
                 result.push(thisMatch[1]);

From e216b3adac0845a3f003cb41a809265a1dcc75d1 Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 13:51:59 -0700
Subject: [PATCH 11/19] rework function to remove comments

---
 src/language/CSSUtils.js | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 5b0708da1b0..5adb99c60ef 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1117,19 +1117,12 @@ define(function (require, exports, module) {
     
     // Essentially minifies CSS by removing all newlines, tabs and comments 
     // From http://stackoverflow.com/questions/4402220/regex-to-minimize-css
-    function _minimize(_content) {
-        var content = _content;
-        content = content.replace(/\/\*(?:(?!\*\/)[\s\S])*\*\//g, '');
-        // now there are no more than single adjacent spaces left
-        // now unnecessary: content = content.replace( /(\s)+\./g, ' .' );
-        content = content.replace(/ ([{:}]) /g, '$1');
-        content = content.replace(/([;,]) /g, '$1');
-        content = content.replace(/ !/g, '!');
-        return content;
+    function _removeComments(_content) {
+        return _content.replace(/\/\*(?:(?!\*\/)[\s\S])*\*\//g, '');
     }
     
     // removes strings from the content 
-    function _reduceStrings(_content) {
+    function _removeStrings(_content) {
         return _content.replace(/[^\\]\"(.*)[^\\]\"|[^\\]\'(.*)[^\\]\'+/g, '');
     }
     
@@ -1148,7 +1141,7 @@ define(function (require, exports, module) {
         
         // Minimize the CSS so that strings and comments
         //  do not match results
-        text = _reduceStrings(_minimize(text));
+        text = _removeStrings(_removeComments(text));
         
         // Find the lines that match.  This will return an array of 
         //  matched css properties (flow-into: junk;)

From c103acea7289500ec83a72426cae88b59a3b7ece Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 14:16:27 -0700
Subject: [PATCH 12/19] optimize parser

---
 src/language/CSSUtils.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 5adb99c60ef..dd49a8e6f87 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1126,6 +1126,11 @@ define(function (require, exports, module) {
         return _content.replace(/[^\\]\"(.*)[^\\]\"|[^\\]\'(.*)[^\\]\'+/g, '');
     }
     
+    // removes strings and comments
+    function _reduceContent(_content) {
+        return _removeStrings(_removeComments(_content));
+    }
+    
     /**
      * Extracts all nemd flow instances
      * @param {!String} text to extract from
@@ -1137,24 +1142,20 @@ define(function (require, exports, module) {
     function extractAllNamedFlows(text) {
         var namedFlowRegEx = /(?:flow\-into\:[ \t\n\r]*)([a-z0-9_\-]+)(?:[ \t\n\r]*;)/gi,
             result = [],
-            matches;
+            thisMatch;
         
-        // Minimize the CSS so that strings and comments
-        //  do not match results
-        text = _removeStrings(_removeComments(text));
-        
-        // Find the lines that match.  This will return an array of 
-        //  matched css properties (flow-into: junk;)
-        matches = text.match(namedFlowRegEx) || [];
+        // Reduce the content so that matches 
+        //  inside strings and comments are ignored 
+        text = _reduceContent(text);
+
+        // Find the first match
+        thisMatch = namedFlowRegEx.exec(text);
         
-        // Parse the matches to extract the name of the flow
-        matches.forEach(function (match) {
-            var nameRegEx = /(?:flow\-into\:[ \t\n\r]*)([a-z0-9_\-]+)(?:[ \t\n\r]*;)/i,
-                thisMatch = nameRegEx.exec(match);
-            if (thisMatch && thisMatch.length === 2) {
-                result.push(thisMatch[1]);
-            }
-        });
+        // Iterate over the matches and add them to result
+        while (thisMatch) {
+            result.push(thisMatch[1]);
+            thisMatch = namedFlowRegEx.exec(text);
+        }
         
         return result;
     }

From 5bfa210b2fd0796a2e3c4be770029f987e642e2c Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 14:19:10 -0700
Subject: [PATCH 13/19] update comment

---
 src/language/CSSUtils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index dd49a8e6f87..099693a82dd 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1115,8 +1115,7 @@ define(function (require, exports, module) {
         return _stripAtRules(selector);
     }
     
-    // Essentially minifies CSS by removing all newlines, tabs and comments 
-    // From http://stackoverflow.com/questions/4402220/regex-to-minimize-css
+    // removes css comments from the content
     function _removeComments(_content) {
         return _content.replace(/\/\*(?:(?!\*\/)[\s\S])*\*\//g, '');
     }

From b0e66feaf86b52cfd4881877542f33a2ead94d1b Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 14:26:56 -0700
Subject: [PATCH 14/19] add comments

---
 test/spec/CSSUtils-test-files/regions.css | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/spec/CSSUtils-test-files/regions.css b/test/spec/CSSUtils-test-files/regions.css
index 174910bde2b..df1e14daf80 100644
--- a/test/spec/CSSUtils-test-files/regions.css
+++ b/test/spec/CSSUtils-test-files/regions.css
@@ -1,3 +1,4 @@
+/* basic tests */
 article.content {
     flow-into: main;
 }
@@ -15,6 +16,8 @@ section.layout > div {
     flow-from: jeff;
 }
 
+/* exclude matches inside comments tests */
+
 /*
 p.content {
     flow-into: carter;
@@ -25,14 +28,18 @@ p.layout > div {
 }
 */
 
+/* exclude matches inside strings tests */
+
 div {
     content: "/* p.content { flow-into: carter; } p.layout > div { flow-from: carter; } */";
 }
 
+
 div {
     content: "html.content { flow-into: dexter; } html.layout > div { flow-from: dexter; }";
 }
 
+
 /*
 div.content {
     content: "flow-into: martin;";
@@ -43,6 +50,8 @@ div.layout > div {
 }
 */
 
+/* multi-line property tests */
+
 #randy.content {
     flow-into:   
         randy

From bf62d5984d6da049d11d1f2d51a2e34baa48d3fd Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 14:56:20 -0700
Subject: [PATCH 15/19] test for duplicates

---
 src/language/CSSUtils.js                  | 6 +++++-
 test/spec/CSSUtils-test-files/regions.css | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 099693a82dd..269c3c05dda 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1141,6 +1141,7 @@ define(function (require, exports, module) {
     function extractAllNamedFlows(text) {
         var namedFlowRegEx = /(?:flow\-into\:[ \t\n\r]*)([a-z0-9_\-]+)(?:[ \t\n\r]*;)/gi,
             result = [],
+            names = {},
             thisMatch;
         
         // Reduce the content so that matches 
@@ -1152,7 +1153,10 @@ define(function (require, exports, module) {
         
         // Iterate over the matches and add them to result
         while (thisMatch) {
-            result.push(thisMatch[1]);
+            var thisName = thisMatch[1];
+            if (!names.hasOwnProperty(thisName)) {
+                names[thisName] = result.push(thisName);
+            }
             thisMatch = namedFlowRegEx.exec(text);
         }
         
diff --git a/test/spec/CSSUtils-test-files/regions.css b/test/spec/CSSUtils-test-files/regions.css
index df1e14daf80..6116010b573 100644
--- a/test/spec/CSSUtils-test-files/regions.css
+++ b/test/spec/CSSUtils-test-files/regions.css
@@ -61,3 +61,12 @@ div.layout > div {
 #randy.layout > div {
     flow-from:  randy;
 }
+
+/* test to exclude duplicates */
+#yin.content { 
+    flow-into: jeff;
+}
+
+#yin.layout > div {
+    flow-from: jeff;
+}

From a99566cf3091291dddb8c0c2bbe396092607ce9c Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 15:07:32 -0700
Subject: [PATCH 16/19] collect flow-from names

---
 src/language/CSSUtils.js                  | 4 ++--
 test/spec/CSSUtils-test-files/regions.css | 5 +++++
 test/spec/CSSUtils-test.js                | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 269c3c05dda..810c3d80c02 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1139,7 +1139,7 @@ define(function (require, exports, module) {
      *      Does not addRef() the documents returned in the array.
      */
     function extractAllNamedFlows(text) {
-        var namedFlowRegEx = /(?:flow\-into\:[ \t\n\r]*)([a-z0-9_\-]+)(?:[ \t\n\r]*;)/gi,
+        var namedFlowRegEx = /(?:flow\-(into|from)\:[ \t\n\r]*)([a-z0-9_\-]+)(?:[ \t\n\r]*;)/gi,
             result = [],
             names = {},
             thisMatch;
@@ -1153,7 +1153,7 @@ define(function (require, exports, module) {
         
         // Iterate over the matches and add them to result
         while (thisMatch) {
-            var thisName = thisMatch[1];
+            var thisName = thisMatch[2];
             if (!names.hasOwnProperty(thisName)) {
                 names[thisName] = result.push(thisName);
             }
diff --git a/test/spec/CSSUtils-test-files/regions.css b/test/spec/CSSUtils-test-files/regions.css
index 6116010b573..7c07a9fd64e 100644
--- a/test/spec/CSSUtils-test-files/regions.css
+++ b/test/spec/CSSUtils-test-files/regions.css
@@ -70,3 +70,8 @@ div.layout > div {
 #yin.layout > div {
     flow-from: jeff;
 }
+
+/* flow-from only tests */
+#raymond.layout > div {
+    flow-from: lim;
+}
diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js
index 7b6afc7effa..d88859ff995 100644
--- a/test/spec/CSSUtils-test.js
+++ b/test/spec/CSSUtils-test.js
@@ -1931,10 +1931,11 @@ define(function (require, exports, module) {
         
         it("should find named flows", function () {
             var namedFlows = CSSUtils.extractAllNamedFlows(this.fileContent);
-            expect(namedFlows.length).toBe(3);
+            expect(namedFlows.length).toBe(4);
             expect(namedFlows[0]).toBe("main");
             expect(namedFlows[1]).toBe("jeff");
             expect(namedFlows[2]).toBe("randy");
+            expect(namedFlows[3]).toBe("lim");
         });
         
     });

From feb3097b3fba9cd338e5e06f2a64ae636e86b665 Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 15:40:30 -0700
Subject: [PATCH 17/19] docco and spelling

---
 src/language/CSSUtils.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 810c3d80c02..720a052b9ca 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1131,12 +1131,9 @@ define(function (require, exports, module) {
     }
     
     /**
-     * Extracts all nemd flow instances
+     * Extracts all named flow instances
      * @param {!String} text to extract from
-     * @param {?Document} htmlDocument An HTML file for context (so we can search <style> blocks)
-     * @return {$.Promise} that will be resolved with an Array of objects containing the
-     *      source document, start line, and end line (0-based, inclusive range) for each matching declaration list.
-     *      Does not addRef() the documents returned in the array.
+     * @return {?Array.<string>} array of unique flow names 
      */
     function extractAllNamedFlows(text) {
         var namedFlowRegEx = /(?:flow\-(into|from)\:[ \t\n\r]*)([a-z0-9_\-]+)(?:[ \t\n\r]*;)/gi,

From dd76ce485a0097f90ffcdf82ca77b6e86a774897 Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 17:27:41 -0700
Subject: [PATCH 18/19] RTC: @TomMalbran -- refactor code for reuse

---
 src/language/CSSUtils.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 720a052b9ca..64cbea557be 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1125,9 +1125,14 @@ define(function (require, exports, module) {
         return _content.replace(/[^\\]\"(.*)[^\\]\"|[^\\]\'(.*)[^\\]\'+/g, '');
     }
     
-    // removes strings and comments
-    function _reduceContent(_content) {
-        return _removeStrings(_removeComments(_content));
+    /**
+     * Reduces the style sheet by removing comments and strings 
+     *  so that the  content can be parsed using a regular expression
+     * @param {!String} content to reduce
+     * @return {String} reduced content 
+     */
+    function reduceStyleSheetForRegExParsing(content) {
+        return _removeStrings(_removeComments(content));
     }
     
     /**
@@ -1143,7 +1148,7 @@ define(function (require, exports, module) {
         
         // Reduce the content so that matches 
         //  inside strings and comments are ignored 
-        text = _reduceContent(text);
+        text = reduceStyleSheetForRegExParsing(text);
 
         // Find the first match
         thisMatch = namedFlowRegEx.exec(text);

From 32273870edc6089b7ea17336351901932623cf98 Mon Sep 17 00:00:00 2001
From: Jeff Booher <jsbooher@adobe.com>
Date: Thu, 22 Aug 2013 17:31:44 -0700
Subject: [PATCH 19/19] export the function this time

---
 src/language/CSSUtils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/language/CSSUtils.js b/src/language/CSSUtils.js
index 64cbea557be..e94349c5036 100644
--- a/src/language/CSSUtils.js
+++ b/src/language/CSSUtils.js
@@ -1170,6 +1170,7 @@ define(function (require, exports, module) {
     exports.extractAllSelectors = extractAllSelectors;
     exports.extractAllNamedFlows = extractAllNamedFlows;
     exports.findSelectorAtDocumentPos = findSelectorAtDocumentPos;
+    exports.reduceStyleSheetForRegExParsing = reduceStyleSheetForRegExParsing;
 
     exports.SELECTOR = SELECTOR;
     exports.PROP_NAME = PROP_NAME;