Add Emmet option inside Edit menu

src/extensions/default/CSSCodeHints/main.js

@@ -73,7 +73,7 @@ define(function (require, exports, module) {
     // the Emmet icon serves as a clickable link that redirects to the MDN page for the property (if available).
     // This object follows the structure:
     // { PROPERTY_NAME: MDN_URL }
-    const MDN_PROPERTIES_URLS = {};
+    const mdnPropertiesUrls = {};
 
     PreferencesManager.definePreference("codehint.CssPropHints", "boolean", true, {
         description: Strings.DESCRIPTION_CSS_PROP_HINTS
@@ -389,7 +389,7 @@ define(function (require, exports, module) {
                 const propertyKey = computedPropertyKeys[resultItem.sourceIndex];
                 if(properties[propertyKey] && properties[propertyKey].MDN_URL){
                     resultItem.MDN_URL = properties[propertyKey].MDN_URL;
-                    MDN_PROPERTIES_URLS[propertyKey] = resultItem.MDN_URL;
+                    mdnPropertiesUrls[propertyKey] = resultItem.MDN_URL;
                 }
             }
 
@@ -429,8 +429,8 @@ define(function (require, exports, module) {
                             let $icon = $(`<a class="emmet-css-code-hint" style="text-decoration: none">Emmet</a>`);
 
                             // if MDN_URL is available for the property, add the href attribute to redirect to mdn
-                            if(MDN_PROPERTIES_URLS[expandedAbbr]) {
-                                $icon.attr("href", MDN_PROPERTIES_URLS[expandedAbbr]);
+                            if(mdnPropertiesUrls[expandedAbbr]) {
+                                $icon.attr("href", mdnPropertiesUrls[expandedAbbr]);
                                 $icon.attr("title", Strings.DOCS_MORE_LINK_MDN_TITLE);
                             }
 

src/extensions/default/HTMLCodeHints/main.js

@@ -467,7 +467,7 @@ define(function (require, exports, module) {
             return false;
         }
 
-        // to show emmet hint when either a single or three exclamation mark(s) is present
+        // not to show emmet hint when either a single or three exclamation mark(s) is present
         if (line.includes('!!') && !line.includes('!!!')) {
             return false;
         }
@@ -1227,7 +1227,7 @@ define(function (require, exports, module) {
         preferenceChanged();
 
         var emmetMarkupHints = new EmmetMarkupHints();
-        CodeHintManager.registerHintProvider(emmetMarkupHints, ["html", "php", "jsp"], 0);
+        CodeHintManager.registerHintProvider(emmetMarkupHints, ["html", "php"], 0);
 
         // For unit testing
         exports.emmetHintProvider = emmetMarkupHints;

src/nls/root/strings.js

@@ -524,6 +524,7 @@ define({
     "CMD_BEAUTIFY_CODE": "Beautify Code",
     "CMD_BEAUTIFY_CODE_ON_SAVE": "Beautify Code After Save",
     "CMD_AUTO_RENAME_TAGS": "Auto Rename HTML Tags",
+    "CMD_TOGGLE_EMMET": "Emmet",
 
     // Search menu commands
     "FIND_MENU": "Find",

src/preferences/AllPreferences.js

@@ -31,20 +31,48 @@
  * PreferencesManager.on("change", AllPreferences.EMMET, preferenceChanged);
    preferenceChanged();
  * ```
+ * NB: JSDOC/Comments marked with * are required for adding the option to Menu
  */
 
-   define(function (require, exports, module) {
+define(function (require, exports, module) {
     const PreferencesManager = require("preferences/PreferencesManager");
     const Strings = require("strings");
+    const Menus = require("command/Menus");
+    const AppInit = require("utils/AppInit");
+    const CommandManager = require("command/CommandManager");
+    const Commands = require("command/Commands");
+
+    // * list of all the commands
+    const EMMET_COMMAND_ID = "edit.emmet";
+    const emmetCommand = CommandManager.register(Strings.CMD_TOGGLE_EMMET, EMMET_COMMAND_ID, toggleEmmet);
+
 
     // list of all the preferences
     const PREFERENCES_LIST = {
         EMMET: "emmet"
     };
 
+
+    // define Emmet in preferences file
     PreferencesManager.definePreference(PREFERENCES_LIST.EMMET, "boolean", true, {
         description: Strings.DESCRIPTION_EMMET
     });
 
+
+    // * emmet helper function to toggle emmet preferences
+    function toggleEmmet() {
+        PreferencesManager.set(PREFERENCES_LIST.EMMET, !PreferencesManager.get(PREFERENCES_LIST.EMMET));
+        emmetCommand.setChecked(PreferencesManager.get(PREFERENCES_LIST.EMMET));
+    }
+
+
+    AppInit.appReady(function () {
+        // * Register the command and add it to Menu bar
+        emmetCommand.setChecked(PreferencesManager.get(PREFERENCES_LIST.EMMET));
+        var menu = Menus.getMenu(Menus.AppMenuBar.EDIT_MENU);
+
+        menu.addMenuItem(EMMET_COMMAND_ID);
+    });
+
     module.exports = PREFERENCES_LIST;
-});
+});