Merge pull request #4379 from busykai/master

RaymondLim · RaymondLim · commit d0ddf4dee868 · 2013-07-15T21:49:25.000-07:00
Fix #4333 (Files incorrectly identified as plain text if folder's name has got the "#" char)
diff --git a/src/brackets.js b/src/brackets.js
@@ -23,7 +23,7 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global require, define, brackets: true, $, PathUtils, window, navigator, Mustache */
+/*global require, define, brackets: true, $, window, navigator, Mustache */
 
 require.config({
     paths: {
diff --git a/src/document/Document.js b/src/document/Document.js
@@ -23,7 +23,7 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, PathUtils */
+/*global define, $ */
 
 define(function (require, exports, module) {
     "use strict";
diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -23,13 +23,11 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp: true */
-/*global define, $, brackets, PathUtils, window */
+/*global define, $, brackets, window */
 
 define(function (require, exports, module) {
     "use strict";
     
-    require("thirdparty/path-utils/path-utils.min");
-    
     // Load dependent modules
     var AppInit             = require("utils/AppInit"),
         CommandManager      = require("command/CommandManager"),
@@ -246,9 +244,7 @@ define(function (require, exports, module) {
                         
                         doOpen(paths[paths.length - 1], silent)
                             .done(function (doc) {
-                                var url = PathUtils.parseUrl(doc.file.fullPath);
-                                //reconstruct the url but use the directory and stop there
-                                _defaultOpenDialogFullPath = url.protocol + url.doubleSlash + url.authority + url.directory;
+                                _defaultOpenDialogFullPath = FileUtils.getDirectoryPath(doc.file.fullPath);
                                 
                                 DocumentManager.addToWorkingSet(doc.file);
                             })
@@ -666,7 +662,7 @@ define(function (require, exports, module) {
             } else {
                 saveAsDefaultPath = FileUtils.getDirectoryPath(fullPath);
             }
-            defaultName = PathUtils.parseUrl(fullPath).filename;
+            defaultName = FileUtils.getBaseName(fullPath);
             NativeFileSystem.showSaveDialog(Strings.SAVE_FILE_AS, saveAsDefaultPath, defaultName,
                 _doSaveAfterSaveDialog,
                 function (error) {
@@ -818,7 +814,7 @@ define(function (require, exports, module) {
         
         if (doc && doc.isDirty) {
             // Document is dirty: prompt to save changes before closing
-            var filename = PathUtils.parseUrl(doc.file.fullPath).filename;
+            var filename = FileUtils.getBaseName(doc.file.fullPath);
             
             Dialogs.showModalDialog(
                 DefaultDialogs.DIALOG_ID_SAVE_CLOSE,
diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js
@@ -23,7 +23,7 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, PathUtils */
+/*global define, $ */
 
 /**
  * DocumentManager maintains a list of currently 'open' Documents. It also owns the list of files in
diff --git a/src/extensibility/InstallExtensionDialog.js b/src/extensibility/InstallExtensionDialog.js
@@ -22,14 +22,12 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, window, $, brackets, PathUtils, Mustache, document */
+/*global define, window, $, brackets, Mustache, document */
 /*unittests: Install Extension Dialog*/
 
 define(function (require, exports, module) {
     "use strict";
     
-    require("thirdparty/path-utils/path-utils.min");
-
     var Dialogs                = require("widgets/Dialogs"),
         StringUtils            = require("utils/StringUtils"),
         Strings                = require("strings"),
diff --git a/src/extensions/default/QuickView/main.js b/src/extensions/default/QuickView/main.js
@@ -33,6 +33,7 @@ define(function (require, exports, module) {
         DocumentManager     = brackets.getModule("document/DocumentManager"),
         EditorManager       = brackets.getModule("editor/EditorManager"),
         ExtensionUtils      = brackets.getModule("utils/ExtensionUtils"),
+        FileUtils           = brackets.getModule("file/FileUtils"),
         Menus               = brackets.getModule("command/Menus"),
         PreferencesManager  = brackets.getModule("preferences/PreferencesManager"),
         Strings             = brackets.getModule("strings"),
@@ -411,7 +412,7 @@ define(function (require, exports, module) {
                 if (PathUtils.isAbsoluteUrl(tokenString)) {
                     imgPath = tokenString;
                 } else {
-                    imgPath = "file:///" + docPath.substr(0, docPath.lastIndexOf("/") + 1) + tokenString;
+                    imgPath = "file:///" + FileUtils.getDirectoryPath(docPath) + tokenString;
                 }
                 
                 if (urlMatch) {
diff --git a/src/extensions/default/UrlCodeHints/main.js b/src/extensions/default/UrlCodeHints/main.js
@@ -33,6 +33,7 @@ define(function (require, exports, module) {
         CSSUtils            = brackets.getModule("language/CSSUtils"),
         DocumentManager     = brackets.getModule("document/DocumentManager"),
         EditorManager       = brackets.getModule("editor/EditorManager"),
+        FileUtils           = brackets.getModule("file/FileUtils"),
         HTMLUtils           = brackets.getModule("language/HTMLUtils"),
         NativeFileSystem    = brackets.getModule("file/NativeFileSystem").NativeFileSystem,
         ProjectManager      = brackets.getModule("project/ProjectManager"),
@@ -69,12 +70,7 @@ define(function (require, exports, module) {
             return result;
         }
 
-        var docUrl = window.PathUtils.parseUrl(doc.file.fullPath);
-        if (!docUrl) {
-            return result;
-        }
-
-        var docDir = docUrl.domain + docUrl.directory;
+        var docDir = FileUtils.getDirectoryPath(doc.file.fullPath);
 
         // get relative path from query string
         // TODO: handle site-root relative
diff --git a/src/file/FileUtils.js b/src/file/FileUtils.js
@@ -35,7 +35,6 @@ define(function (require, exports, module) {
     
     var NativeFileSystem    = require("file/NativeFileSystem").NativeFileSystem,
         NativeFileError     = require("file/NativeFileError"),
-        LanguageManager     = require("language/LanguageManager"),
         PerfUtils           = require("utils/PerfUtils"),
         Dialogs             = require("widgets/Dialogs"),
         DefaultDialogs      = require("widgets/DefaultDialogs"),
@@ -333,7 +332,7 @@ define(function (require, exports, module) {
 
     /**
      * Determine if file extension is a static html file extension.
-     * @param {string} file name with extension or just a file extension
+     * @param {string} fileExt file name with extension or just a file extension
      * @return {boolean} Returns true if fileExt is in the list
      */
     function isStaticHtmlFileExt(fileExt) {
@@ -346,7 +345,7 @@ define(function (require, exports, module) {
 
     /**
      * Determine if file extension is a server html file extension.
-     * @param {string} file name with extension or just a file extension
+     * @param {string} fileExt file name with extension or just a file extension
      * @return {boolean} Returns true if fileExt is in the list
      */
     function isServerHtmlFileExt(fileExt) {
@@ -359,13 +358,43 @@ define(function (require, exports, module) {
     
     /**
      * Get the parent directory of a file. If a directory is passed in the directory is returned.
-     * @param {string} full path to a file or directory
+     * @param {string} fullPath full path to a file or directory
      * @return {string} Returns the path to the parent directory of a file or the path of a directory 
      */
     function getDirectoryPath(fullPath) {
         return fullPath.substr(0, fullPath.lastIndexOf("/") + 1);
     }
-    
+
+    /**
+     * Get the base name of a file or a directory.
+     * @param {string} fullPath full path to a file or directory
+     * @return {string} Returns the base name of a file or the name of a
+     * directory
+     */
+    function getBaseName(fullPath) {
+        fullPath = canonicalizeFolderPath(fullPath);
+        return fullPath.substr(fullPath.lastIndexOf("/") + 1);
+    }
+
+    /**
+     * Get the filename extension.
+     *
+     * @param {string} fullPath full path to a file or directory
+     * @return {string} Returns the extension of a filename or empty string if
+     * the argument is a directory or a filename with no extension
+     */
+    function getFilenameExtension(fullPath) {
+        var baseName = getBaseName(fullPath),
+            idx      = baseName.lastIndexOf(".");
+
+        if (idx === -1) {
+            return "";
+        }
+
+        return baseName.substr(idx);
+    }
+
+
     // Define public API
     exports.LINE_ENDINGS_CRLF              = LINE_ENDINGS_CRLF;
     exports.LINE_ENDINGS_LF                = LINE_ENDINGS_LF;
@@ -386,4 +415,6 @@ define(function (require, exports, module) {
     exports.isStaticHtmlFileExt            = isStaticHtmlFileExt;
     exports.isServerHtmlFileExt            = isServerHtmlFileExt;
     exports.getDirectoryPath               = getDirectoryPath;
+    exports.getBaseName                    = getBaseName;
+    exports.getFilenameExtension           = getFilenameExtension;
 });
diff --git a/src/language/JSUtils.js b/src/language/JSUtils.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
-/*global define, $, brackets, PathUtils, CodeMirror */
+/*global define, $, brackets, CodeMirror */
 
 /**
  * Set of utilities for simple parsing of JS text.
@@ -34,6 +34,7 @@ define(function (require, exports, module) {
     var Async                   = require("utils/Async"),
         DocumentManager         = require("document/DocumentManager"),
         ChangedDocumentTracker  = require("document/ChangedDocumentTracker"),
+        FileUtils               = require("file/FileUtils"),
         NativeFileSystem        = require("file/NativeFileSystem").NativeFileSystem,
         CollectionUtils         = require("utils/CollectionUtils"),
         PerfUtils               = require("utils/PerfUtils"),
@@ -378,7 +379,7 @@ define(function (require, exports, module) {
         if (!keepAllFiles) {
             // Filter fileInfos for .js files
             jsFiles = fileInfos.filter(function (fileInfo) {
-                return (/^\.js/i).test(PathUtils.filenameExtension(fileInfo.fullPath));
+                return (/^\.js/i).test(FileUtils.getFilenameExtension(fileInfo.fullPath));
             });
         } else {
             jsFiles = fileInfos;
diff --git a/src/language/LanguageManager.js b/src/language/LanguageManager.js
@@ -23,7 +23,7 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, CodeMirror, PathUtils */
+/*global define, $, CodeMirror */
 
 /**
  * LanguageManager provides access to the languages supported by Brackets
@@ -103,6 +103,7 @@ define(function (require, exports, module) {
     
     // Dependencies
     var Async                 = require("utils/Async"),
+        FileUtils             = require("file/FileUtils"),
         _defaultLanguagesJSON = require("text!language/languages.json");
     
     
@@ -187,11 +188,11 @@ define(function (require, exports, module) {
      * @return {Language} The language for the provided file type or the fallback language
      */
     function getLanguageForPath(path) {
-        var fileName  = PathUtils.filename(path).toLowerCase(),
-            language  = _fileNameToLanguageMap[fileName],
+        var fileName = FileUtils.getBaseName(path).toLowerCase(),
+            language = _fileNameToLanguageMap[fileName],
             extension,
             parts;
-        
+
         // If no language was found for the file name, use the file extension instead
         if (!language) {
             // Split the file name into parts:
diff --git a/src/project/FileIndexManager.js b/src/project/FileIndexManager.js
@@ -23,7 +23,7 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, brackets, PathUtils */
+/*global define, $, brackets */
 
 /*
  * Manages a collection of FileIndexes where each index maintains a list of information about
@@ -41,6 +41,7 @@ define(function (require, exports, module) {
     
     var PerfUtils           = require("utils/PerfUtils"),
         ProjectManager      = require("project/ProjectManager"),
+        FileUtils           = require("file/FileUtils"),
         Dialogs             = require("widgets/Dialogs"),
         DefaultDialogs      = require("widgets/DefaultDialogs"),
         CollectionUtils     = require("utils/CollectionUtils"),
@@ -406,8 +407,7 @@ define(function (require, exports, module) {
     _addIndex(
         "css",
         function (entry) {
-            var filename = entry.name;
-            return PathUtils.filenameExtension(filename) === ".css";
+            return FileUtils.getFilenameExtension(entry.name) === ".css";
         }
     );
 
@@ -431,4 +431,4 @@ define(function (require, exports, module) {
     exports.getFilenameMatches = getFilenameMatches;
 
 
-});
+});
diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
-/*global define, $, PathUtils, window, Mustache */
+/*global define, $, window, Mustache */
 
 /*
  * Adds a "find in files" command to allow the user to find all occurances of a string in all files in
diff --git a/test/SpecRunner.js b/test/SpecRunner.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
-/*global require, define, $, beforeEach, afterEach, jasmine, brackets, PathUtils */
+/*global require, define, $, beforeEach, afterEach, jasmine, brackets */
 
 // Set the baseUrl to brackets/src
 require.config({
diff --git a/test/spec/CSSUtils-test.js b/test/spec/CSSUtils-test.js
@@ -515,32 +515,35 @@ define(function (require, exports, module) {
         });
         
         describe("find correct positions of selectors", function () {
-            var selectors;
                 
-            selectors = CSSUtils.extractAllSelectors(selectorPositionsTestCss);
-            
             it("should find selector positions when whitespace between selector and '{'", function () {
+                var selectors = CSSUtils.extractAllSelectors(selectorPositionsTestCss);
                 expect([selectors[0].selectorStartChar, selectors[0].selectorEndChar]).toEqual([0, 3]);
             });
             
             it("should find selector positions when no whitespace between selector and '{'", function () {
+                var selectors = CSSUtils.extractAllSelectors(selectorPositionsTestCss);
                 expect([selectors[1].selectorStartChar, selectors[1].selectorEndChar]).toEqual([0, 3]);
             });
             
             it("should find selector positions when '{' on the next line", function () {
+                var selectors = CSSUtils.extractAllSelectors(selectorPositionsTestCss);
                 expect([selectors[2].selectorStartChar, selectors[2].selectorEndChar]).toEqual([0, 3]);
             });
             
             it("should find selector positions when '{' on the next line and selector is indented", function () {
+                var selectors = CSSUtils.extractAllSelectors(selectorPositionsTestCss);
                 expect([selectors[3].selectorStartChar, selectors[3].selectorEndChar]).toEqual([4, 7]);
             });
             
             it("should find selector positions when '{' on the next line and selector is indented with tabs", function () {
+                var selectors = CSSUtils.extractAllSelectors(selectorPositionsTestCss);
                 expect([selectors[4].selectorStartChar, selectors[4].selectorEndChar]).toEqual([1, 4]);
             });
             
             it("should find selector positions in a selector group when '{' on the next line", function () {
-                var expected = [0, 2, 4, 6, 8, 10],
+                var selectors = CSSUtils.extractAllSelectors(selectorPositionsTestCss),
+                    expected = [0, 2, 4, 6, 8, 10],
                     result = [
                         selectors[5].selectorStartChar, selectors[5].selectorEndChar,
                         selectors[6].selectorStartChar, selectors[6].selectorEndChar,
@@ -551,7 +554,8 @@ define(function (require, exports, module) {
             });
             
             it("should find selector positions in a selector group when '{' on the next line and selector group is indented", function () {
-                var expected = [4, 6, 8, 10, 12, 14],
+                var selectors = CSSUtils.extractAllSelectors(selectorPositionsTestCss),
+                    expected = [4, 6, 8, 10, 12, 14],
                     result = [
                         selectors[8].selectorStartChar, selectors[8].selectorEndChar,
                         selectors[9].selectorStartChar, selectors[9].selectorEndChar,
diff --git a/test/spec/Editor-test.js b/test/spec/Editor-test.js
@@ -117,13 +117,19 @@ define(function (require, exports, module) {
             
             it("should switch to the HTML mode for files ending in .html", function () {
                 // verify editor content
-                var mode = LanguageManager.getLanguageForPath("file:///only/testing/the/path.html").getMode();
+                var mode = LanguageManager.getLanguageForPath("c:/only/testing/the/path.html").getMode();
                 expect(mode).toSpecifyModeNamed("text/x-brackets-html");
             });
             
-            it("should switch modes even if the url has a query string", function () {
+            it("should switch modes for UNIX absolute path", function () {
                 // verify editor content
-                var mode = LanguageManager.getLanguageForPath("https://only.org/testing/the/path.css?v=2").getMode();
+                var mode = LanguageManager.getLanguageForPath("/only/testing/the/path.css").getMode();
+                expect(mode).toSpecifyModeNamed(langNames.css.mode);
+            });
+
+            it("should switch modes for relative path", function () {
+                // verify editor content
+                var mode = LanguageManager.getLanguageForPath("only/testing/the/path.css").getMode();
                 expect(mode).toSpecifyModeNamed(langNames.css.mode);
             });
             
diff --git a/test/spec/FileUtils-test.js b/test/spec/FileUtils-test.js
diff --git a/test/spec/JSUtils-test.js b/test/spec/JSUtils-test.js
