fixed some of the issues mentioned in the review

Author: ingorichter

src/LiveDevelopment/LiveDevelopment.js

@@ -655,6 +655,11 @@ define(function LiveDevelopment(require, exports, module) {
             return path.substring(0, path.lastIndexOf('/', path.length - 2) + 1);
         }
 
+        function getFilenameWithoutExtension(filename) {
+            var index = filename.lastIndexOf(".");
+            return index === -1 ? filename : filename.slice(0, index);
+        }
+
         // Is the currently opened document already a file we can use for Live Development?
         if (doc) {
             refPath = doc.file.fullPath;
@@ -668,34 +673,38 @@ define(function LiveDevelopment(require, exports, module) {
         var baseUrl = ProjectManager.getBaseUrl(),
             hasOwnServerForLiveDevelopment = (baseUrl && baseUrl.length);
 
-        // TODO: It would be better to reuse the list of file extensions from FileUtils
-        var staticIndexFiles = ["html", "htm"].map(function (extension) { return "index." + extension; });
-        var dynamicIndexFiles = ["php", "php3", "php4", "php5", "phtm", "phtml", "cfm", "cfml", "asp", "aspx", "jsp", "jspx", "shtm", "shtml"].map(function (extension) { return "index." + extension; });
-
         FileIndexManager.getFileInfoList("all").done(function (allFiles) {
             if (refPath) {
                 var projectRoot = ProjectManager.getProjectRoot().fullPath,
                     containingFolder = FileUtils.getDirectoryPath(refPath),
                     indexFileFound = false,
                     stillInProjectTree = true;
 
+                var filteredFiltered = allFiles.filter(function (item) {
+                    var parent = getParentFolder(item.fullPath);
+                    
+                    return (containingFolder.indexOf(parent) === 0);
+                });
+                
                 var filterIndexFile = function (fileInfo) {
                     if (fileInfo.fullPath.indexOf(containingFolder) === 0) {
-                        if (hasOwnServerForLiveDevelopment) {
-                            if ((dynamicIndexFiles.indexOf(fileInfo.name) !== -1) ||
-                                    (staticIndexFiles.indexOf(fileInfo.name) !== -1)) {
+                        if (getFilenameWithoutExtension(fileInfo.name) === "index") {
+                            if (hasOwnServerForLiveDevelopment) {
+                                if ((FileUtils.isServerHtmlFileExt(fileInfo.name)) ||
+                                        (FileUtils.isStaticHtmlFileExt(fileInfo.name))) {
+                                    return true;
+                                }
+                            } else if (FileUtils.isStaticHtmlFileExt(fileInfo.name)) {
                                 return true;
                             }
-                        } else if (staticIndexFiles.indexOf(fileInfo.name) !== -1) {
-                            return true;
+                        } else {
+                            return false;
                         }
-                    } else {
-                        return false;
                     }
                 };
 
                 while (!indexFileFound && stillInProjectTree) {
-                    i = CollectionUtils.indexOf(allFiles, filterIndexFile);
+                    i = CollectionUtils.indexOf(filteredFiltered, filterIndexFile);
 
                     // We found no good match
                     if (i === -1) {
@@ -711,7 +720,7 @@ define(function LiveDevelopment(require, exports, module) {
                 }
 
                 if (i !== -1) {
-                    DocumentManager.getDocumentForPath(allFiles[i].fullPath).then(result.resolve, result.resolve);
+                    DocumentManager.getDocumentForPath(filteredFiltered[i].fullPath).then(result.resolve, result.resolve);
                     return;
                 }
             }

src/file/FileUtils.js

@@ -365,28 +365,28 @@ define(function (require, exports, module) {
 
     /**
      * Determine if file extension is a static html file extension.
-     * @param {string} fileExt file name with extension or just a file extension
+     * @param {string} filePath could be a path, a file name or just a file extension
      * @return {boolean} Returns true if fileExt is in the list
      */
-    function isStaticHtmlFileExt(fileExt) {
-        if (!fileExt) {
+    function isStaticHtmlFileExt(filePath) {
+        if (!filePath) {
             return false;
         }
 
-        return (_staticHtmlFileExts.indexOf(getFileExtension(fileExt).toLowerCase()) !== -1);
+        return (_staticHtmlFileExts.indexOf(getFileExtension(filePath).toLowerCase()) !== -1);
     }
 
     /**
      * Determine if file extension is a server html file extension.
-     * @param {string} fileExt file name with extension or just a file extension
+     * @param {string} filePath could be a path, a file name or just a file extension
      * @return {boolean} Returns true if fileExt is in the list
      */
-    function isServerHtmlFileExt(fileExt) {
-        if (!fileExt) {
+    function isServerHtmlFileExt(filePath) {
+        if (!filePath) {
             return false;
         }
 
-        return (_serverHtmlFileExts.indexOf(getFileExtension(fileExt).toLowerCase()) !== -1);
+        return (_serverHtmlFileExts.indexOf(getFileExtension(filePath).toLowerCase()) !== -1);
     }
 
     /**

test/spec/LiveDevelopment-test-files/dynamic-project-6/top1/index.php

@@ -0,0 +1,2 @@
+<html>
+</html>

test/spec/LiveDevelopment-test-files/dynamic-project-6/top2/test.css

@@ -0,0 +1 @@
+body { background-color: red }

test/spec/LiveDevelopment-test-files/static-project-4/sub/sub2/index.html

@@ -1,2 +1,8 @@
 <html>
+    <head>
+        <link rel="stylesheet" href="test.css" />
+    </head>
+    
+    <body>
+    </body>
 </html>

test/spec/LiveDevelopment-test-files/static-project-6/top1/index.html

@@ -0,0 +1,2 @@
+<html>
+</html>

test/spec/LiveDevelopment-test-files/static-project-6/top2/test.css

@@ -0,0 +1 @@
+body { background-color: red }

test/spec/LiveDevelopment-test.js

@@ -1070,7 +1070,6 @@ define(function (require, exports, module) {
 
                 loadFileAndUpdateFileIndex(cssFile);
 
-                brackets.app.showDeveloperTools();
                 runs(function () {
                     promise = LiveDevelopment._getInitialDocFromCurrent();
 
@@ -1157,6 +1156,29 @@ define(function (require, exports, module) {
                     expect(document.file.fullPath).toBe(testPath + "/static-project-5/" + indexFile);
                 });
             });
+            
+            it("should not find any HTML page", function () {
+                var promise,
+                    document;
+                var cssFile = "top2/test.css";
+                
+                SpecRunnerUtils.loadProjectInTestWindow(testPath + "/static-project-6");
+                loadFileAndUpdateFileIndex(cssFile);
+                
+                runs(function () {
+                    promise = LiveDevelopment._getInitialDocFromCurrent();
+                
+                    promise.done(function (doc) {
+                        document = doc;
+                    });
+                    
+                    waitsForDone(promise);
+                });
+                
+                runs(function () {
+                    expect(document).toBe(null);
+                });
+            });
         });
 
         describe("Find dynamic page for Live Development", function () {