Merge pull request #7889 from adobe/kai/fix-6558-language-layer

Fix #6558. Resurrect language layer

Author: ingorichter

src/document/DocumentManager.js

@@ -695,17 +695,21 @@ define(function (require, exports, module) {
             oldDoc.off("languageChanged.DocumentManager");
         }
 
+        if (newDoc) {
+            PreferencesManager._setCurrentLanguage(newDoc.getLanguage().getId());
+            newDoc.on("languageChanged.DocumentManager", function (e, oldLang, newLang) {
+                PreferencesManager._setCurrentLanguage(newLang.getId());
+                exports.trigger("currentDocumentLanguageChanged", [oldLang, newLang]);
+            });
+        } else {
+            PreferencesManager._setCurrentLanguage(undefined);
+        }
+    
         if (newDoc !== oldDoc) {
             // Dispatch deprecated event with doc args (not File args as the new event uses)
             exports.trigger("currentDocumentChange", newDoc, oldDoc);
         }
 
-        if (newDoc) {
-            newDoc.on("languageChanged.DocumentManager", function (data) {
-                exports.trigger("currentDocumentLanguageChanged", data);
-            });
-        }
-    
     });
 
     // Deprecated APIs   

src/editor/Editor.js

@@ -69,6 +69,7 @@ define(function (require, exports, module) {
     var AnimationUtils     = require("utils/AnimationUtils"),
         Async              = require("utils/Async"),
         CodeMirror         = require("thirdparty/CodeMirror2/lib/codemirror"),
+        LanguageManager    = require("language/LanguageManager"),
         EventDispatcher    = require("utils/EventDispatcher"),
         Menus              = require("command/Menus"),
         PerfUtils          = require("utils/PerfUtils"),
@@ -178,6 +179,19 @@ define(function (require, exports, module) {
         return true;
     }
 
+    /**
+     * Helper function to build preferences context based on the full path of
+     * the file.
+     *
+     * @param {string} fullPath Full path of the file
+     *
+     * @return {*} A context for the specified file name
+     */
+    function _buildPreferencesContext(fullPath) {
+        return PreferencesManager._buildContext(fullPath,
+            fullPath ? LanguageManager.getLanguageForPath(fullPath).getId() : undefined);
+    }
+
     /**
      * List of all current (non-destroy()ed) Editor instances. Needed when changing global preferences
      * that affect all editors, e.g. tabbing or color scheme settings.
@@ -656,7 +670,7 @@ define(function (require, exports, module) {
     /**
      * Determine the mode to use from the document's language
      * Uses "text/plain" if the language does not define a mode
-     * @return string The mode to use
+     * @return {string} The mode to use
      */
     Editor.prototype._getModeFromDocument = function () {
         // We'd like undefined/null/"" to mean plain text mode. CodeMirror defaults to plaintext for any
@@ -2159,7 +2173,7 @@ define(function (require, exports, module) {
      * @return {*} current value of that pref
      */
     Editor.prototype._getOption = function (prefName) {
-        return PreferencesManager.get(prefName, this.document.file.fullPath);
+        return PreferencesManager.get(prefName, PreferencesManager._buildContext(this.document.file.fullPath, this.document.getLanguage().getId()));
     };
 
     /**
@@ -2247,7 +2261,7 @@ define(function (require, exports, module) {
 
 
     // Global settings that affect Editor instances that share the same preference locations
-
+    
     /**
      * Sets whether to use tab characters (vs. spaces) when inserting new text.
      * Affects any editors that share the same preference location.
@@ -2266,7 +2280,7 @@ define(function (require, exports, module) {
      * @return {boolean}
      */
     Editor.getUseTabChar = function (fullPath) {
-        return PreferencesManager.get(USE_TAB_CHAR, fullPath);
+        return PreferencesManager.get(USE_TAB_CHAR, _buildPreferencesContext(fullPath));
     };
 
     /**
@@ -2287,7 +2301,7 @@ define(function (require, exports, module) {
      * @return {number}
      */
     Editor.getTabSize = function (fullPath) {
-        return PreferencesManager.get(TAB_SIZE, fullPath);
+        return PreferencesManager.get(TAB_SIZE, _buildPreferencesContext(fullPath));
     };
 
     /**
@@ -2308,7 +2322,7 @@ define(function (require, exports, module) {
      * @return {number}
      */
     Editor.getSpaceUnits = function (fullPath) {
-        return PreferencesManager.get(SPACE_UNITS, fullPath);
+        return PreferencesManager.get(SPACE_UNITS, _buildPreferencesContext(fullPath));
     };
 
     /**
@@ -2329,7 +2343,7 @@ define(function (require, exports, module) {
      * @return {boolean}
      */
     Editor.getCloseBrackets = function (fullPath) {
-        return PreferencesManager.get(CLOSE_BRACKETS, fullPath);
+        return PreferencesManager.get(CLOSE_BRACKETS, _buildPreferencesContext(fullPath));
     };
 
     /**
@@ -2350,7 +2364,7 @@ define(function (require, exports, module) {
      * @return {boolean}
      */
     Editor.getShowLineNumbers = function (fullPath) {
-        return PreferencesManager.get(SHOW_LINE_NUMBERS, fullPath);
+        return PreferencesManager.get(SHOW_LINE_NUMBERS, _buildPreferencesContext(fullPath));
     };
 
     /**
@@ -2370,7 +2384,7 @@ define(function (require, exports, module) {
      * @return {boolean}
      */
     Editor.getShowActiveLine = function (fullPath) {
-        return PreferencesManager.get(STYLE_ACTIVE_LINE, fullPath);
+        return PreferencesManager.get(STYLE_ACTIVE_LINE, _buildPreferencesContext(fullPath));
     };
 
     /**
@@ -2391,7 +2405,7 @@ define(function (require, exports, module) {
      * @return {boolean}
      */
     Editor.getWordWrap = function (fullPath) {
-        return PreferencesManager.get(WORD_WRAP, fullPath);
+        return PreferencesManager.get(WORD_WRAP, _buildPreferencesContext(fullPath));
     };
 
     /**

src/editor/EditorManager.js

@@ -774,7 +774,7 @@ define(function (require, exports, module) {
     // File-based preferences handling
     exports.on("activeEditorChange", function (e, current) {
         if (current && current.document && current.document.file) {
-            PreferencesManager._setCurrentEditingFile(current.document.file.fullPath);
+            PreferencesManager._setCurrentFile(current.document.file.fullPath);
         }
     });