The language is now detected when constructing the document and when the underlying file is renamed. If the language changes, a languageChanged event is fired. Editors now determine their mode themselves by consulting the document's language and responding to languageChanged events. To save the editor state, editors are n longer closed and reopened when renaming a file. This brings back the problem with JSLint not opening when changing the extension to ".js".

Author: DennisKehrig

src/document/DocumentManager.js

@@ -599,15 +599,13 @@ define(function (require, exports, module) {
         this.file = file;
         this.refreshText(rawText, initialTimestamp);
 
+        this._updateLanguage();
+        // TODO: remove this listener when the document object is obsolete.
+        // But when is this the case? When _refCount === 0?
+        $(this.file).on("rename", this._updateLanguage.bind(this));
+        
         // This is a good point to clean up any old dangling Documents
         _gcDocuments();
-        
-        var _this = this;
-        $(module.exports).on("fileNameChange", function (e, oldName, newName) {
-            if (file.fullPath === newName) {
-                _this.language = null;
-            }
-        });
     }
 
     /**
@@ -945,16 +943,25 @@ define(function (require, exports, module) {
 
     /**
      * Returns the language this document is written in.
-     * The language returned is based on the file extension and is set in the constructor.
+     * The language returned is based on the file extension.
      * @return {Language} An object describing the language used in this document
      */
     Document.prototype.getLanguage = function () {
-        if (!this.language) {
-            var ext = PathUtils.filenameExtension(this.file.fullPath);
-            this.language = Languages.getLanguageForFileExtension(ext);
-        }
         return this.language;
     };
+
+    /**
+     * Updates the language according to the file extension
+     */
+    Document.prototype._updateLanguage = function () {
+        var oldLanguage = this.language;
+        var ext = PathUtils.filenameExtension(this.file.fullPath);
+        this.language = Languages.getLanguageForFileExtension(ext);
+        
+        if (oldLanguage && oldLanguage !== this.language) {
+            $(this).triggerHandler("languageChanged", [oldLanguage, this.language]);
+        }
+    }
 
     /**
      * Gets an existing open Document for the given file, or creates a new one if the Document is
@@ -1193,14 +1200,6 @@ define(function (require, exports, module) {
 
         // Send a "fileNameChanged" event. This will trigger the views to update.
         $(exports).triggerHandler("fileNameChange", [oldName, newName]);
-        
-        // If the renamed file is shown in the current full editor, re-open that
-        // This way everything that depends on the language will be updated (editor mode, JSLint, ...)
-        var doc = getCurrentDocument();
-        if (doc && doc.file.fullPath === newName) {
-            closeFullEditor(doc.file);
-            setCurrentDocument(doc);
-        }
     }
 
     // Define public API

src/editor/Editor.js

@@ -292,7 +292,7 @@ define(function (require, exports, module) {
      * @param {{startLine: number, endLine: number}=} range If specified, range of lines within the document
      *          to display in this editor. Inclusive.
      */
-    function Editor(document, makeMasterEditor, mode, container, range) {
+    function Editor(document, makeMasterEditor, container, range) {
         var self = this;
 
         _instances.push(this);
@@ -308,8 +308,12 @@ define(function (require, exports, module) {
         // store this-bound version of listeners so we can remove them later
         this._handleDocumentChange = this._handleDocumentChange.bind(this);
         this._handleDocumentDeleted = this._handleDocumentDeleted.bind(this);
+        this._handleDocumentLanguageChanged = this._handleDocumentLanguageChanged.bind(this);
         $(document).on("change", this._handleDocumentChange);
         $(document).on("deleted", this._handleDocumentDeleted);
+        $(document).on("languageChanged", this._handleDocumentLanguageChanged);
+
+        var mode = this._getModeFromDocument();
 
         // (if makeMasterEditor, we attach the Doc back to ourselves below once we're fully initialized)
 
@@ -346,13 +350,6 @@ define(function (require, exports, module) {
             "Cmd-Left": "goLineStartSmart"
         };
 
-        // We'd like null/"" to mean plain text mode. CodeMirror defaults to plaintext for any
-        // unrecognized mode, but it complains on the console in that fallback case: so, convert
-        // here so we're always explicit, avoiding console noise.
-        if (!mode) {
-            mode = "text/plain";
-        }
-        
         // Create the CodeMirror instance
         // (note: CodeMirror doesn't actually require using 'new', but jslint complains without it)
         this._codeMirror = new CodeMirror(container, {
@@ -436,6 +433,7 @@ define(function (require, exports, module) {
         this.document.releaseRef();
         $(this.document).off("change", this._handleDocumentChange);
         $(this.document).off("deleted", this._handleDocumentDeleted);
+        $(this.document).off("languageChanged", this._handleDocumentLanguageChanged);
 
         if (this._visibleRange) {   // TextRange also refs the Document
             this._visibleRange.dispose();
@@ -453,6 +451,18 @@ 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
+     */
+    Editor.prototype._getModeFromDocument = function () {
+        // We'd like undefined/null/"" to mean plain text mode. CodeMirror defaults to plaintext for any
+        // unrecognized mode, but it complains on the console in that fallback case: so, convert
+        // here so we're always explicit, avoiding console noise.
+        return this.document.getLanguage().mode || "text/plain";
+    };
+    
 
     /** 
      * Selects all text and maintains the current scroll position.
@@ -598,6 +608,14 @@ define(function (require, exports, module) {
         $(this).triggerHandler("lostContent", [event]);
     };
 
+    /**
+     * Responds to language changes, for instance when the file extension is changed.
+     */
+    Editor.prototype._handleDocumentLanguageChanged = function (event) {
+        var mode = this._getModeFromDocument();
+        this._codeMirror.setOption("mode", this._getModeFromDocument());
+    };
+    
 
     /**
      * Install event handlers on the CodeMirror instance, translating them into 

src/editor/EditorManager.js

@@ -109,8 +109,8 @@ define(function (require, exports, module) {
         $indentWidthInput;
 
     /**
-     * Creates a new Editor bound to the given Document. The editor's mode is inferred based on the
-     * document's language. The editor is appended to the given container as a visible child.
+     * Creates a new Editor bound to the given Document.
+     * The editor is appended to the given container as a visible child.
      * @param {!Document} doc  Document for the Editor's content
      * @param {!boolean} makeMasterEditor  If true, the Editor will set itself as the private "master"
      *          Editor for the Document. If false, the Editor will attach to the Document as a "slave."
@@ -120,7 +120,7 @@ define(function (require, exports, module) {
      * @return {Editor} the newly created editor.
      */
     function _createEditorForDocument(doc, makeMasterEditor, container, range) {
-        return new Editor(doc, makeMasterEditor, doc.getLanguage().mode, container, range);
+        return new Editor(doc, makeMasterEditor, container, range);
     }
 
     /**
@@ -250,8 +250,8 @@ define(function (require, exports, module) {
 
 
     /**
-     * Creates a new inline Editor instance for the given Document. The editor's mode is inferred
-     * based on the document's language. The editor is not yet visible or attached to a host editor.
+     * Creates a new inline Editor instance for the given Document.
+     * The editor is not yet visible or attached to a host editor.
      * @param {!Document} doc  Document for the Editor's content
      * @param {?{startLine:Number, endLine:Number}} range  If specified, all lines outside the given
      *      range are hidden from the editor. Range is inclusive. Line numbers start at 0.

src/file/FileUtils.js

@@ -272,8 +272,8 @@ define(function (require, exports, module) {
      */
     function updateFileEntryPath(entry, oldName, newName, isFolder) {
         if (isAffectedWhenRenaming(entry.fullPath, oldName, newName, isFolder)) {
-            var fullPath = entry.fullPath.replace(oldName, newName);
-            
+            var oldFullPath = entry.fullPath;
+            var fullPath = oldFullPath.replace(oldName, newName);
             entry.fullPath = fullPath;
 
             // TODO: Should this be a method on Entry instead?
@@ -287,6 +287,8 @@ define(function (require, exports, module) {
                 }
             }
 
+            $(entry).triggerHandler("rename", [oldFullPath, fullPath]);
+            
             return true;
         }