refactor: using event ProjectManager.EVENT_PROJECT_CHANGED_OR_RENAMED_PATH

Author: abose

src/extensions/default/JSLint/ESLint.js

@@ -37,7 +37,6 @@ define(function (require, exports, module) {
         Strings            = brackets.getModule("strings"),
         StringUtils        = brackets.getModule("utils/StringUtils"),
         ProjectManager     = brackets.getModule("project/ProjectManager"),
-        FileSystem         = brackets.getModule("filesystem/FileSystem"),
         LanguageManager    = brackets.getModule("language/LanguageManager"),
         NodeUtils          = brackets.getModule("utils/NodeUtils"),
         Metrics            = brackets.getModule("utils/Metrics");
@@ -242,28 +241,15 @@ define(function (require, exports, module) {
         });
     }
 
-    function _isFileInArray(fileToCheck, fileArray){
-        if(!fileArray){
-            return false;
-        }
-        for(let file of fileArray){
-            if(file.fullPath === fileToCheck.fullPath){
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function _projectFileChanged(_evt, entry, added, removed) {
-        let configFilePath = FileSystem.getFileForPath(ProjectManager.getProjectRoot().fullPath + PACKAGE_JSON);
-        if(entry && entry.fullPath === configFilePath.fullPath
-            || _isFileInArray(configFilePath, added) || _isFileInArray(configFilePath, removed)){
+    function _projectFileChanged(_evt, changedPath, addedSet, removedSet) {
+        let configPath = path.join(ProjectManager.getProjectRoot().fullPath, PACKAGE_JSON);
+        if(changedPath=== configPath || addedSet.has(configPath) || removedSet.has(configPath)){
             _reloadOptions();
         }
     }
 
     AppInit.appReady(function () {
-        ProjectManager.on(ProjectManager.EVENT_PROJECT_FILE_CHANGED, _projectFileChanged);
+        ProjectManager.on(ProjectManager.EVENT_PROJECT_CHANGED_OR_RENAMED_PATH, _projectFileChanged);
         ProjectManager.on(ProjectManager.EVENT_PROJECT_OPEN, function () {
             _reloadOptions();
             if(!Phoenix.isNativeApp) {

src/extensions/default/JSLint/JSHint.js

@@ -244,31 +244,18 @@ define(function (require, exports, module) {
         return !!(jsHintConfigFileErrorMessage || projectSpecificOptions);
     }
 
-    function _isFileInArray(fileToCheck, fileArray){
-        if(!fileArray){
-            return false;
-        }
-        for(let file of fileArray){
-            if(file.fullPath === fileToCheck.fullPath){
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function _projectFileChanged(_evt, entry, added, removed) {
-        let configFilePath = FileSystem.getFileForPath(ProjectManager.getProjectRoot().fullPath + CONFIG_FILE_NAME);
-        if(entry && entry.fullPath === configFilePath.fullPath
-            || _isFileInArray(configFilePath, added)){
+    function _projectFileChanged(_evt, changedPath, addedSet, removedSet) {
+        let configPath = path.join(ProjectManager.getProjectRoot().fullPath, CONFIG_FILE_NAME);
+        if(changedPath === configPath || addedSet.has(configPath)){
             _reloadOptions();
-        } else if(_isFileInArray(configFilePath, removed)){
+        } else if(removedSet.has(configPath)){
             projectSpecificOptions = null;
             jsHintConfigFileErrorMessage = null;
         }
     }
 
     AppInit.appReady(function () {
-        ProjectManager.on(ProjectManager.EVENT_PROJECT_FILE_CHANGED, _projectFileChanged);
+        ProjectManager.on(ProjectManager.EVENT_PROJECT_CHANGED_OR_RENAMED_PATH, _projectFileChanged);
         ProjectManager.on(ProjectManager.EVENT_PROJECT_OPEN, _reloadOptions);
         _reloadOptions();
     });

src/extensionsIntegrated/Phoenix-live-preview/main.js

@@ -541,7 +541,7 @@ define(function (require, exports, module) {
     }
 
     async function _projectFileChanges(evt, changedFile) {
-        if(changedFile && (utils.isPreviewableFile(changedFile.fullPath) ||
+        if(changedFile && changedFile.isFile && (utils.isPreviewableFile(changedFile.fullPath) ||
             utils.isServerRenderedFile(changedFile.fullPath))){
             // we are getting this change event somehow.
             // bug, investigate why we get this change event as a project file change.

src/nls/root/strings.js

@@ -1174,7 +1174,7 @@ define({
     "BEAUTIFY_CODE_NOTIFICATION": "Click here or press <b>`{0}`</b> to Beautify code. </br> <img src=\"styles/images/beautify.gif\">  <br/> <a href='#' style='float:right;'>ok</a>",
     "DEFAULT_PROJECT_NOTIFICATION": "Click here to open the <br/><b>default project</b> in phoenix. </br> <a href='#' style='float:right;'>ok</a>",
     "DIRECTORY_REPLACE_MESSAGE": "The selected folder <span class='dialog-filename'>{0}</span> is not empty. Are you sure you want to replace the folder contents with the project?",
-    "DEFAULT_PROJECT_HTML_CLICK_HERE": "Click here to locate this &ltspan&gt in the HTML file",
+    "DEFAULT_PROJECT_HTML_CLICK_HERE": "Click here to locate this &lt;span&gt; in the HTML file",
     "BUILD_WEBSITE_SECTION": "Build Website",
     "LEARN_SECTION": "Learn With Examples",
     "CREATE_EXTENSION_SECTION": "Create {APP_NAME} Extensions and Themes",