Merge pull request #12979 from haslam22/prefs-fix

zaggino · web-flow · commit bc4f6a7c08eb · 2016-12-21T09:39:11.000+11:00
Fix for #12970: Non-default languages and user preferences bug
diff --git a/src/language/LanguageManager.js b/src/language/LanguageManager.js
@@ -665,6 +665,11 @@ define(function (require, exports, module) {
                 _fileExtensionToLanguageMap[extension] = this;
             }
 
+            this._wasModified();
+        } else if(!_fileExtensionToLanguageMap[extension]) {
+            
+            // Language should be in the extension map but isn't
+            _fileExtensionToLanguageMap[extension] = this;
             this._wasModified();
         }
     };
@@ -956,6 +961,12 @@ define(function (require, exports, module) {
 
             // store language to language map
             _languages[language.getId()] = language;
+
+            // restore any preferences for non-default languages
+            if(PreferencesManager) {
+                _updateFromPrefs(_EXTENSION_MAP_PREF);
+                _updateFromPrefs(_NAME_MAP_PREF);
+            }
         }
 
         if (!language._setId(id) || !language._setName(name) ||
@@ -1074,6 +1085,15 @@ define(function (require, exports, module) {
                     language[state.add](name);
                 }
             }
+            if(!getLanguage(newMapping[name])) {
+                
+                // If the language doesn't exist, restore any overrides and remove it
+                // from the state.
+                if(overridden[name]) {
+                    _restoreOverriddenDefault(name, state);
+                }
+                delete newMapping[name];
+            }
         });
 
         // Look for removed names (extensions or filenames)
diff --git a/test/spec/LanguageManager-test.js b/test/spec/LanguageManager-test.js
@@ -849,6 +849,22 @@ define(function (require, exports, module) {
                 language = LanguageManager.getLanguageForPath("Gemfile");
                 expect(language.getId()).toBe("ruby");
             });
+
+            it("should manage preferences for non-default languages", function() {
+                var language,
+                    def = { id: "test", name: "Test", mode: ["null", "text/plain"] };
+                PreferencesManager.set(LanguageManager._EXTENSION_MAP_PREF, {
+                    extension: "test"
+                });
+                PreferencesManager.set(LanguageManager._NAME_MAP_PREF, {
+                    filename: "test"
+                });
+                defineLanguage(def);
+                language = LanguageManager.getLanguageForExtension("extension");
+                expect(language.getId()).toBe("test");
+                language = LanguageManager.getLanguageForPath("filename");
+                expect(language.getId()).toBe("test");
+            });
         });
 
         describe("isBinary", function () {
