adobe
diff --git a/‎src/LiveDevelopment/LiveDevMultiBrowser.js
Copy file name to clipboard
+7-17Lines changed: 7 additions & 17 deletions b/‎src/LiveDevelopment/LiveDevMultiBrowser.js
Copy file name to clipboard
+7-17Lines changed: 7 additions & 17 deletions
diff --git a/‎src/LiveDevelopment/LiveDevelopment.js
Copy file name to clipboard
+10-13Lines changed: 10 additions & 13 deletions b/‎src/LiveDevelopment/LiveDevelopment.js
Copy file name to clipboard
+10-13Lines changed: 10 additions & 13 deletions
diff --git a/‎src/LiveDevelopment/LiveDevelopmentUtils.js
Copy file name to clipboard
+84Lines changed: 84 additions & 0 deletions b/‎src/LiveDevelopment/LiveDevelopmentUtils.js
Copy file name to clipboard
+84Lines changed: 84 additions & 0 deletions
diff --git a/‎src/LiveDevelopment/Servers/UserServer.js
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎src/LiveDevelopment/Servers/UserServer.js
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎src/document/DocumentCommandHandlers.js
Copy file name to clipboard
+22-2Lines changed: 22 additions & 2 deletions b/‎src/document/DocumentCommandHandlers.js
Copy file name to clipboard
+22-2Lines changed: 22 additions & 2 deletions
diff --git a/‎src/extensions/default/StaticServer/StaticServer.js
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/extensions/default/StaticServer/StaticServer.js
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
@@ -84,6 +84,7 @@ define(function (require, exports, module) {
         ProjectManager       = require("project/ProjectManager"),
         Strings              = require("strings"),
         _                    = require("thirdparty/lodash"),
+        LiveDevelopmentUtils = require("LiveDevelopment/LiveDevelopmentUtils"),
         LiveDevServerManager = require("LiveDevelopment/LiveDevServerManager"),
         NodeSocketTransport  = require("LiveDevelopment/MultiBrowserImpl/transports/NodeSocketTransport"),
         LiveDevProtocol      = require("LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol"),
@@ -120,17 +121,6 @@ define(function (require, exports, module) {
      * @type {BaseServer}
      */
     var _server;
-    
-    /**
-     * @private
-     * Returns true if we think the given extension is for an HTML file.
-     * @param {string} ext The extension to check.
-     * @return {boolean} true if this is an HTML extension
-     */
-    function _isHtmlFileExt(ext) {
-        return (FileUtils.isStaticHtmlFileExt(ext) ||
-                (ProjectManager.getBaseUrl() && FileUtils.isServerHtmlFileExt(ext)));
-    }
 
     /** 
      * @private
@@ -143,7 +133,7 @@ define(function (require, exports, module) {
             return LiveCSSDocument;
         }
 
-        if (_isHtmlFileExt(doc.file.fullPath)) {
+        if (LiveDevelopmentUtils.isHtmlFileExt(doc.file.fullPath)) {
             return LiveHTMLDocument;
         }
 
@@ -368,7 +358,7 @@ define(function (require, exports, module) {
         // Is the currently opened document already a file we can use for Live Development?
         if (doc) {
             refPath = doc.file.fullPath;
-            if (FileUtils.isStaticHtmlFileExt(refPath) || FileUtils.isServerHtmlFileExt(refPath)) {
+            if (LiveDevelopmentUtils.isStaticHtmlFileExt(refPath) || LiveDevelopmentUtils.isServerHtmlFileExt(refPath)) {
                 return new $.Deferred().resolve(doc);
             }
         }
@@ -400,11 +390,11 @@ define(function (require, exports, module) {
                 if (fileInfo.fullPath.indexOf(containingFolder) === 0) {
                     if (FileUtils.getFilenameWithoutExtension(fileInfo.name) === "index") {
                         if (hasOwnServerForLiveDevelopment) {
-                            if ((FileUtils.isServerHtmlFileExt(fileInfo.name)) ||
-                                    (FileUtils.isStaticHtmlFileExt(fileInfo.name))) {
+                            if ((LiveDevelopmentUtils.isServerHtmlFileExt(fileInfo.name)) ||
+                                    (LiveDevelopmentUtils.isStaticHtmlFileExt(fileInfo.name))) {
                                 return true;
                             }
-                        } else if (FileUtils.isStaticHtmlFileExt(fileInfo.name)) {
+                        } else if (LiveDevelopmentUtils.isStaticHtmlFileExt(fileInfo.name)) {
                             return true;
                         }
                     } else {
@@ -629,7 +619,7 @@ define(function (require, exports, module) {
 
         // Optionally prompt for a base URL if no server was found but the
         // file is a known server file extension
-        showBaseUrlPrompt = !_server && FileUtils.isServerHtmlFileExt(doc.file.fullPath);
+        showBaseUrlPrompt = !_server && LiveDevelopmentUtils.isServerHtmlFileExt(doc.file.fullPath);
 
         if (showBaseUrlPrompt) {
             // Prompt for a base URL
 
@@ -78,6 +78,7 @@ define(function LiveDevelopment(require, exports, module) {
     var STATUS_SYNC_ERROR     = exports.STATUS_SYNC_ERROR     =  5;
 
     var Async                = require("utils/Async"),
+        CSSUtils             = require("language/CSSUtils"),
         Dialogs              = require("widgets/Dialogs"),
         DefaultDialogs       = require("widgets/DefaultDialogs"),
         DocumentManager      = require("document/DocumentManager"),
@@ -86,6 +87,7 @@ define(function LiveDevelopment(require, exports, module) {
         FileServer           = require("LiveDevelopment/Servers/FileServer").FileServer,
         FileSystemError      = require("filesystem/FileSystemError"),
         FileUtils            = require("file/FileUtils"),
+        LiveDevelopmentUtils = require("LiveDevelopment/LiveDevelopmentUtils"),
         LiveDevServerManager = require("LiveDevelopment/LiveDevServerManager"),
         MainViewManager      = require("view/MainViewManager"),
         NativeApp            = require("utils/NativeApp"),
@@ -192,11 +194,6 @@ define(function LiveDevelopment(require, exports, module) {
     function _isPromisePending(promise) {
         return promise && promise.state() === "pending";
     }
-    
-    function _isHtmlFileExt(ext) {
-        return (FileUtils.isStaticHtmlFileExt(ext) ||
-                (ProjectManager.getBaseUrl() && FileUtils.isServerHtmlFileExt(ext)));
-    }
 
     /** Get the current document from the document manager
      * _adds extension, url and root to the document
@@ -219,7 +216,7 @@ define(function LiveDevelopment(require, exports, module) {
             return exports.config.experimental ? JSDocument : null;
         }
 
-        if (_isHtmlFileExt(doc.file.fullPath)) {
+        if (LiveDevelopmentUtils.isHtmlFileExt(doc.file.fullPath)) {
             return HTMLDocument;
         }
 
@@ -683,7 +680,7 @@ define(function LiveDevelopment(require, exports, module) {
         // Is the currently opened document already a file we can use for Live Development?
         if (doc) {
             refPath = doc.file.fullPath;
-            if (FileUtils.isStaticHtmlFileExt(refPath) || FileUtils.isServerHtmlFileExt(refPath)) {
+            if (LiveDevelopmentUtils.isStaticHtmlFileExt(refPath) || LiveDevelopmentUtils.isServerHtmlFileExt(refPath)) {
                 return new $.Deferred().resolve(doc);
             }
         }
@@ -715,11 +712,11 @@ define(function LiveDevelopment(require, exports, module) {
                 if (fileInfo.fullPath.indexOf(containingFolder) === 0) {
                     if (FileUtils.getFilenameWithoutExtension(fileInfo.name) === "index") {
                         if (hasOwnServerForLiveDevelopment) {
-                            if ((FileUtils.isServerHtmlFileExt(fileInfo.name)) ||
-                                    (FileUtils.isStaticHtmlFileExt(fileInfo.name))) {
+                            if ((LiveDevelopmentUtils.isServerHtmlFileExt(fileInfo.name)) ||
+                                    (LiveDevelopmentUtils.isStaticHtmlFileExt(fileInfo.name))) {
                                 return true;
                             }
-                        } else if (FileUtils.isStaticHtmlFileExt(fileInfo.name)) {
+                        } else if (LiveDevelopmentUtils.isStaticHtmlFileExt(fileInfo.name)) {
                             return true;
                         }
                     } else {
@@ -769,15 +766,15 @@ define(function LiveDevelopment(require, exports, module) {
      */
     function onActiveEditorChange(event, current, previous) {
         if (previous && previous.document &&
-                FileUtils.isCSSPreprocessorFile(previous.document.file.fullPath)) {
+                CSSUtils.isCSSPreprocessorFile(previous.document.file.fullPath)) {
             var prevDocUrl = _server && _server.pathToUrl(previous.document.file.fullPath);
 
             if (_relatedDocuments && _relatedDocuments[prevDocUrl]) {
                 _closeRelatedDocument(_relatedDocuments[prevDocUrl]);
             }
         }
         if (current && current.document &&
-                FileUtils.isCSSPreprocessorFile(current.document.file.fullPath)) {
+                CSSUtils.isCSSPreprocessorFile(current.document.file.fullPath)) {
             var docUrl = _server && _server.pathToUrl(current.document.file.fullPath);
             _styleSheetAdded(null, docUrl);
         }
@@ -1258,7 +1255,7 @@ define(function LiveDevelopment(require, exports, module) {
         // Optionally prompt for a base URL if no server was found but the
         // file is a known server file extension
         showBaseUrlPrompt = !exports.config.experimental && !_server &&
-            FileUtils.isServerHtmlFileExt(doc.file.fullPath);
+            LiveDevelopmentUtils.isServerHtmlFileExt(doc.file.fullPath);
 
         if (showBaseUrlPrompt) {
             // Prompt for a base URL
 
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2015 Adobe Systems Incorporated. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global define */
+
+/**
+ * Set of utilities for working with files and text content.
+ */
+define(function (require, exports, module) {
+    "use strict";
+
+    var LanguageManager = require("language/LanguageManager"),
+        ProjectManager  = require("project/ProjectManager");
+
+    /**
+     * File extensions - hard-coded for now, but may want to make these preferences
+     * @const {Array.<string>}
+     */
+    var _staticHtmlFileExts = ["htm", "html", "xhtml"],
+        _serverHtmlFileExts = ["php", "php3", "php4", "php5", "phtm", "phtml", "cfm", "cfml", "asp", "aspx", "jsp", "jspx", "shtm", "shtml"];
+
+    /**
+     * Determine if file extension is a static html 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(filePath) {
+        if (!filePath) {
+            return false;
+        }
+
+        return (_staticHtmlFileExts.indexOf(LanguageManager.getLanguageForPath(filePath).getId()) !== -1);
+    }
+
+    /**
+     * Determine if file extension is a server html 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(filePath) {
+        if (!filePath) {
+            return false;
+        }
+
+        return (_serverHtmlFileExts.indexOf(LanguageManager.getLanguageForPath(filePath).getId()) !== -1);
+    }
+
+    /**
+     * Returns true if we think the given extension is for an HTML file.
+     * @param {string} ext The extension to check.
+     * @return {boolean} true if this is an HTML extension.
+     */
+    function isHtmlFileExt(ext) {
+        return (isStaticHtmlFileExt(ext) ||
+                (ProjectManager.getBaseUrl() && isServerHtmlFileExt(ext)));
+    }
+
+    // Define public API
+    exports.isHtmlFileExt       = isHtmlFileExt;
+    exports.isStaticHtmlFileExt = isStaticHtmlFileExt;
+    exports.isServerHtmlFileExt = isServerHtmlFileExt;
+});
@@ -27,8 +27,8 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var BaseServer  = require("LiveDevelopment/Servers/BaseServer").BaseServer,
-        FileUtils   = require("file/FileUtils");
+    var BaseServer             = require("LiveDevelopment/Servers/BaseServer").BaseServer,
+        LiveDevelopmentUtils   = require("LiveDevelopment/LiveDevelopmentUtils");
 
     /**
      * Live preview server for user specified server as defined with Live Preview Base Url
@@ -68,8 +68,8 @@ define(function (require, exports, module) {
             return false;
         }
 
-        return FileUtils.isStaticHtmlFileExt(localPath) ||
-            FileUtils.isServerHtmlFileExt(localPath);
+        return LiveDevelopmentUtils.isStaticHtmlFileExt(localPath) ||
+            LiveDevelopmentUtils.isServerHtmlFileExt(localPath);
     };
 
     exports.UserServer = UserServer;
 
@@ -251,6 +251,23 @@ define(function (require, exports, module) {
             _updateTitle();
         }
     }
+    
+    /**
+     * Shows an error dialog indicating that the given file could not be opened due to the given error
+     * @param {!FileSystemError} name
+     * @return {!Dialog}
+     */
+    function showFileOpenError(name, path) {
+        return Dialogs.showModalDialog(
+            DefaultDialogs.DIALOG_ID_ERROR,
+            Strings.ERROR_OPENING_FILE_TITLE,
+            StringUtils.format(
+                Strings.ERROR_OPENING_FILE,
+                StringUtils.breakableUrl(path),
+                FileUtils.getFileErrorString(name)
+            )
+        );
+    }
 
     /**
      * @private
@@ -288,7 +305,7 @@ define(function (require, exports, module) {
             if (silent) {
                 _cleanup(fileError, fullFilePath);
             } else {
-                FileUtils.showFileOpenError(fileError, fullFilePath).done(function () {
+                showFileOpenError(fileError, fullFilePath).done(function () {
                     _cleanup(fileError, fullFilePath);
                 });
             }
@@ -803,7 +820,7 @@ define(function (require, exports, module) {
                 if (suppressError) {
                     result.resolve();
                 } else {
-                    FileUtils.showFileOpenError(error, doc.file.fullPath)
+                    showFileOpenError(error, doc.file.fullPath)
                         .done(function () {
                             result.reject(error);
                         });
@@ -1675,6 +1692,9 @@ define(function (require, exports, module) {
     } else if (brackets.platform === "mac") {
         showInOS    = Strings.CMD_SHOW_IN_FINDER;
     }
+    
+    // Define public API
+    exports.showFileOpenError = showFileOpenError;
 
     // Deprecated commands
     CommandManager.register(Strings.CMD_ADD_TO_WORKING_SET,          Commands.FILE_ADD_TO_WORKING_SET,        handleFileAddToWorkingSet);
 
@@ -30,7 +30,7 @@ define(function (require, exports, module) {
     "use strict";
 
     var BaseServer           = brackets.getModule("LiveDevelopment/Servers/BaseServer").BaseServer,
-        FileUtils            = brackets.getModule("file/FileUtils"),
+        LiveDevelopmentUtils = brackets.getModule("LiveDevelopment/LiveDevelopmentUtils"),
         PreferencesManager   = brackets.getModule("preferences/PreferencesManager");
 
 
@@ -87,7 +87,7 @@ define(function (require, exports, module) {
         }
 
         // FUTURE: do a MIME Type lookup on file extension
-        return FileUtils.isStaticHtmlFileExt(localPath);
+        return LiveDevelopmentUtils.isStaticHtmlFileExt(localPath);
     };
 
     /**