Simplify and fix sorting of PatchFiles.

appengine/chromium_rietveld/new_static/model/patch_file.js

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 "use strict";
 
 function PatchFile(patchset, name)
 {
     this.name = name || "";
+    this.prefix = name || "";
     this.extension = "";
-    this.prefix = "";
     this.language = "";
     this.containsEmbeddedLanguages = false;
     this.status = "";
     this.chunks = 0;
     this.missingBaseFile = false;
     this.propertyChanges = "";
     this.added = 0;
     this.removed = 0;
     this.id = 0;
     this.patchset = patchset || null; // PatchSet
     this.isBinary = false;
     this.messages = {}; // Map<line number, Array<PatchFileMessage>>
     this.messageCount = 0;
     this.drafts = []; // Array<PatchFileMessage>
     this.draftCount = 0;
     this.diff = null;
     this.isLayoutTest = this.name.startsWith("LayoutTests/");
+    this.isHeader = false;
     Object.preventExtensions(this);
 
     var dotIndex = this.name.lastIndexOf(".");
     if (dotIndex != -1) {
         this.extension = this.name.from(dotIndex + 1);
+        this.isHeader = PatchFile.HEADER_EXTENSIONS[this.extension] || false;
         this.prefix = this.name.to(dotIndex);
         this.language = PatchFile.SYNTAX_LANGUAGES[this.extension] || "";
         this.containsEmbeddedLanguages = PatchFile.MIXED_LANGUAGES[this.language];
     }
 }
 
 PatchFile.DIFF_URL = "/download/issue{1}_{2}_{3}.diff";
 PatchFile.CONTEXT_URL = "/{1}/diff_skipped_lines/{2}/{3}/{4}/{5}/a/2000";
 PatchFile.DRAFT_URL = "/api/{1}/{2}/{3}/draft_message";
 PatchFile.IMAGE_URL = "/{1}/image/{2}/{3}/{4}";
@@ skipping 27 matching lines @@
     "pl": "perl",
     "pm": "perl",
     "py": "python",
     "rb": "ruby",
     "sh": "bash",
     "svg": "xml",
     "xhtml": "html",
     "xml": "xml",
 };
 
+PatchFile.HEADER_EXTENSIONS = {
+    "h": true,
+    "hxx": true,
+    "hpp": true,
+};
+
 PatchFile.compare = function(a, b)
 {
-    if (a.isLayoutTest && b.isLayoutTest)
-        return a.name.localeCompare(b.name);
-    if (a.isLayoutTest)
-        return 1;
-    if (b.isLayoutTest)
-        return -1;
+    if (a.isLayoutTest != b.isLayoutTest)
+        return b.isLayoutTest ? -1 : 1;
     if (a.prefix != b.prefix)
-        return a.name.localeCompare(b.name);
-    if (a.extension == "h" && (b.extension == "cpp" || b.extension == "cc"))
-        return -1;
-    if (b.extension == "h" && (a.extension == "cpp" || a.extension == "cc"))
-        return 1;
+        return a.prefix.localeCompare(b.prefix);
+    if (a.isHeader != b.isHeader)
+        return a.isHeader ? -1 : 1;
     return a.extension.localeCompare(b.extension);
 };
 
 PatchFile.prototype.shouldResetEmbeddedLanguage = function(language, text)
 {
     if (!this.containsEmbeddedLanguages)
         return false;
     if (language == "javascript" && text.startsWith("<\/script"))
         return true;
     if (language == "css" && text.startsWith("<\/style"))
@@ skipping 232 matching lines @@
     while (text[numberStart] == " " && numberStart < text.length)
         ++numberStart;
     var numberEnd = numberStart;
     while (text[numberEnd] != " " && numberEnd < text.length)
         ++numberEnd;
     return {
         lineNumber: parseInt(text.substring(numberStart, numberEnd), 10),
         text: text.from(numberEnd + 1),
     };
 };