Clean up #10193 fix by sharing code with existing implementation in LiveDevelopment.js,

moving shared code to FileUtils with unit tests. Also...
- fixes an unhit edge case in getParentFolder() (now getParentDirectory())
that behaves differently across platforms
- removes duplicate copy of getFilenameWithoutExtension() in LiveDevelopment.js
(copy in FileUtils was identical)
- add/fix some unit tests for two existing FileUtils APIs

Author: peterflynn

src/LiveDevelopment/LiveDevMultiBrowser.js

@@ -417,7 +417,7 @@ define(function (require, exports, module) {
                 // We found no good match
                 if (i === -1) {
                     // traverse the directory tree up one level
-                    containingFolder = FileUtils.getDirectoryPath(FileUtils.stripTrailingSlash(containingFolder));
+                    containingFolder = FileUtils.getParentDirectory(containingFolder);
                     // Are we still inside the project?
                     if (containingFolder.indexOf(projectRoot) === -1) {
                         stillInProjectTree = false;

src/LiveDevelopment/LiveDevelopment.js

@@ -679,16 +679,6 @@ define(function LiveDevelopment(require, exports, module) {
             refPath,
             i;
 
-        // TODO: FileUtils.getParentFolder()
-        function getParentFolder(path) {
-            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;
@@ -715,14 +705,14 @@ define(function LiveDevelopment(require, exports, module) {
             }
 
             var filteredFiltered = allFiles.filter(function (item) {
-                var parent = getParentFolder(item.fullPath);
+                var parent = FileUtils.getParentDirectory(item.fullPath);
 
                 return (containingFolder.indexOf(parent) === 0);
             });
 
             var filterIndexFile = function (fileInfo) {
                 if (fileInfo.fullPath.indexOf(containingFolder) === 0) {
-                    if (getFilenameWithoutExtension(fileInfo.name) === "index") {
+                    if (FileUtils.getFilenameWithoutExtension(fileInfo.name) === "index") {
                         if (hasOwnServerForLiveDevelopment) {
                             if ((FileUtils.isServerHtmlFileExt(fileInfo.name)) ||
                                     (FileUtils.isStaticHtmlFileExt(fileInfo.name))) {
@@ -743,7 +733,7 @@ define(function LiveDevelopment(require, exports, module) {
                 // We found no good match
                 if (i === -1) {
                     // traverse the directory tree up one level
-                    containingFolder = getParentFolder(containingFolder);
+                    containingFolder = FileUtils.getParentDirectory(containingFolder);
                     // Are we still inside the project?
                     if (containingFolder.indexOf(projectRoot) === -1) {
                         stillInProjectTree = false;

src/file/FileUtils.js

@@ -453,8 +453,22 @@ define(function (require, exports, module) {
     }
 
     /**
-     * Get the file name without the extension.
-     * @param {string} filename File name of a file or directory
+     * Get the parent folder of the given file/folder path. (Note: if you already have a FileSystemEntry,
+     * it's faster to use entry.parentPath instead). Differs from getDirectoryPath() in the case that 'path'
+     * is a directory itself: returns its parent instead of the original path.
+     * @param {string} path full path to a file or directory
+     * @return {string} Path of containing folder, or "" if path was the root
+     */
+    function getParentDirectory(path) {
+        if (path === "/") {
+            return "";
+        }
+        return path.substring(0, path.lastIndexOf("/", path.length - 2) + 1);
+    }
+
+    /**
+     * Get the file name without the extension. Returns "" if name starts with "."
+     * @param {string} filename File name of a file or directory, without preceding path
      * @return {string} Returns the file name without the extension
      */
     function getFilenameWithoutExtension(filename) {
@@ -559,6 +573,7 @@ define(function (require, exports, module) {
     exports.isStaticHtmlFileExt            = isStaticHtmlFileExt;
     exports.isServerHtmlFileExt            = isServerHtmlFileExt;
     exports.getDirectoryPath               = getDirectoryPath;
+    exports.getParentDirectory             = getParentDirectory;
     exports.getBaseName                    = getBaseName;
     exports.getRelativeFilename            = getRelativeFilename;
     exports.getFilenameWithoutExtension    = getFilenameWithoutExtension;

test/spec/FileUtils-test.js

@@ -85,7 +85,30 @@ define(function (require, exports, module) {
             });
 
             it("should return the unchanged directory of a posix directory path", function () {
-                expect(FileUtils.getDirectoryPath("C:/foo/bar/")).toBe("C:/foo/bar/");
+                expect(FileUtils.getDirectoryPath("/foo/bar/")).toBe("/foo/bar/");
+            });
+            
+            it("should return the unchanged directory of a root path", function () {
+                expect(FileUtils.getDirectoryPath("C:/")).toBe("C:/");
+                expect(FileUtils.getDirectoryPath("/")).toBe("/");
+            });
+        });
+
+        describe("getParentFolder", function () {
+
+            it("should get the parent directory of a normalized file path", function () {
+                expect(FileUtils.getParentDirectory("C:/foo/bar/baz.txt")).toBe("C:/foo/bar/");
+                expect(FileUtils.getParentDirectory("/foo/bar/baz.txt")).toBe("/foo/bar/");
+            });
+
+            it("should return the parent directory of a normalized directory path", function () {
+                expect(FileUtils.getParentDirectory("C:/foo/bar/")).toBe("C:/foo/");
+                expect(FileUtils.getParentDirectory("/foo/bar/")).toBe("/foo/");
+            });
+
+            it("should return '' given a root path", function () {
+                expect(FileUtils.getParentDirectory("C:/")).toBe("");
+                expect(FileUtils.getParentDirectory("/")).toBe("");
             });
         });
 
@@ -142,6 +165,17 @@ define(function (require, exports, module) {
                 expect(FileUtils.getFileExtension("foo.bar.baz..jaz.txt")).toBe("txt");
             });
         });
+        
+        describe("getFilenameWithoutExtension", function () {
+
+            it("should remove last extension segment only", function () {
+                expect(FileUtils.getFilenameWithoutExtension("foo.txt")).toBe("foo");
+                expect(FileUtils.getFilenameWithoutExtension("foo.min.txt")).toBe("foo.min");
+                expect(FileUtils.getFilenameWithoutExtension("foo")).toBe("foo");
+                
+                expect(FileUtils.getFilenameWithoutExtension(".foo")).toBe("");
+            });
+        });
 
         describe("getSmartFileExtension", function () {