DevTools: Make snippets renaming work through SnippetsProjectDelegate.

Source/devtools/front_end/NavigatorView.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 43 matching lines @@
 
     this._rootNode = new WebInspector.NavigatorRootTreeNode(this);
     this._rootNode.populate();
 
     WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.InspectedURLChanged, this._inspectedURLChanged, this);
 }
 
 WebInspector.NavigatorView.Events = {
     ItemSelected: "ItemSelected",
     ItemSearchStarted: "ItemSearchStarted",
-    FileRenamed: "FileRenamed"
+    ItemRenamingRequested: "ItemRenamingRequested"
 }
 
 WebInspector.NavigatorView.iconClassForType = function(type)
 {
     if (type === WebInspector.NavigatorTreeOutline.Types.Domain)
         return "navigator-domain-tree-item";
     if (type === WebInspector.NavigatorTreeOutline.Types.FileSystem)
         return "navigator-folder-tree-item";
     return "navigator-folder-tree-item";
 }
@@ skipping 170 matching lines @@
         node = parentNode;
         while (node) {
             parentNode = node.parent;
             if (!parentNode || !node.isEmpty())
                 break;
             parentNode.removeChild(node);
             node = parentNode;
         }
     },
 
-    _fileRenamed: function(uiSourceCode, newTitle)
-    {    
-        var data = { uiSourceCode: uiSourceCode, name: newTitle };
-        this.dispatchEventToListeners(WebInspector.NavigatorView.Events.FileRenamed, data);
-    },
-
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
      */
-    handleRename: function(uiSourceCode, callback)
+    requestRename: function(uiSourceCode)
     {
+        this.dispatchEventToListeners(WebInspector.ScriptsNavigator.Events.ItemRenamingRequested, uiSourceCode);
     },
 
     /**
      * @param {WebInspector.UISourceCode} uiSourceCode
      * @param {function(boolean)=} callback
      */
     rename: function(uiSourceCode, callback)
     {
-        var uri = uiSourceCode.uri();
-        var node = this._uiSourceCodeNodes[uri];
+        var node = this._uiSourceCodeNodes[uiSourceCode.uri()];
         if (!node)
             return null;
-        /**
-         * @param {boolean} renameCommitted
-         */
-        function callbackWrapper(renameCommitted)
-        {
-            if (renameCommitted) {
-                delete this._uiSourceCodeNodes[uri];
-                this._uiSourceCodeNodes[uiSourceCode.uri()] = node;
-            }
+        node.rename(callback);
+    },
 
-            if (callback)
-                callback(renameCommitted);
-        }
-        node.rename(callbackWrapper.bind(this));
+    /**
+     * @param {WebInspector.UISourceCode} uiSourceCode
+     * @param {string} oldURI
+     */
+    _titleChanged: function(uiSourceCode, oldURI)
+    {
+        var node = this._uiSourceCodeNodes[oldURI];
+        delete this._uiSourceCodeNodes[oldURI];
+        this._uiSourceCodeNodes[uiSourceCode.uri()] = node;
     },
 
     reset: function()
     {
         for (var uri in this._uiSourceCodeNodes)
             this._uiSourceCodeNodes[uri].dispose();
 
         this._scriptsTree.removeChildren();
         this._uiSourceCodeNodes = {};
         this._rootNode.reset();
@@ skipping 260 matching lines @@
          * @param {string} mimeType
          */
         function callback(content, contentEncoded, mimeType)
         {
             this._warmedUpContent = content;
         }
     },
 
     _shouldRenameOnMouseDown: function()
     {
+        if (!this._uiSourceCode.canRename())
+            return false;
         var isSelected = this === this.treeOutline.selectedTreeElement;
         var isFocused = this.treeOutline.childrenListElement.isSelfOrAncestor(document.activeElement);
         return isSelected && isFocused && !WebInspector.isBeingEdited(this.treeOutline.element);
     },
 
     selectOnMouseDown: function(event)
     {
         if (event.which !== 1 || !this._shouldRenameOnMouseDown()) {
             TreeElement.prototype.selectOnMouseDown.call(this, event);
             return;
         }
         setTimeout(rename.bind(this), 300);
 
         function rename()
         {
             if (this._shouldRenameOnMouseDown())
-                this._navigatorView.handleRename(this._uiSourceCode);
+                this._navigatorView.requestRename(this._uiSourceCode);
         }
     },
 
     _ondragstart: function(event)
     {
         event.dataTransfer.setData("text/plain", this._warmedUpContent);
         event.dataTransfer.effectAllowed = "copy";
         return true;
     },
 
@@ skipping 243 matching lines @@
         if (!this._treeElement)
             return;
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.TitleChanged, this._titleChanged, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyChanged, this._workingCopyChanged, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.WorkingCopyCommitted, this._workingCopyCommitted, this);
         this._uiSourceCode.removeEventListener(WebInspector.UISourceCode.Events.FormattedChanged, this._formattedChanged, this);
     },
 
     _titleChanged: function(event)
     {
+        var oldURI = /** @type {string} */ (event.data);
+        this._navigatorView._titleChanged(this._uiSourceCode, oldURI);
         this.updateTitle();
     },
 
     _workingCopyChanged: function(event)
     {
         this.updateTitle();
     },
 
     _workingCopyCommitted: function(event)
     {
@@ skipping 24 matching lines @@
     {
         if (!this._treeElement)
             return;
 
         // Tree outline should be marked as edited as well as the tree element to prevent search from starting.
         var treeOutlineElement = this._treeElement.treeOutline.element;
         WebInspector.markBeingEdited(treeOutlineElement, true);
 
         function commitHandler(element, newTitle, oldTitle)
         {
-            if (newTitle && newTitle !== oldTitle)
-                this._navigatorView._fileRenamed(this._uiSourceCode, newTitle);
+            if (newTitle !== oldTitle) {
+                this._treeElement.titleText = newTitle;
+                this._uiSourceCode.rename(newTitle, renameCallback.bind(this));
+                return;
+            }
             afterEditing.call(this, true);
         }
 
+        function renameCallback(success)
+        {
+            if (!success) {
+                WebInspector.markBeingEdited(treeOutlineElement, false);
+                this.updateTitle();
+                this.rename(callback);
+                return;
+            }
+            afterEditing.call(this, true);
+        }
+
         function cancelHandler()
         {
             afterEditing.call(this, false);
         }
 
         /**
          * @param {boolean} committed
          */
         function afterEditing(committed)
         {
@@ skipping 145 matching lines @@
 
     willRemoveChild: function(node)
     {
         if (node._isMerged || !this.isPopulated())
             return;
         this._treeElement.removeChild(node._treeElement);
     },
 
     __proto__: WebInspector.NavigatorTreeNode.prototype
 }