Re-sort GYP files with the latest version of tools/source_list.py

tools/sort_sources.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """Given a GYP/GN filename, sort C-ish source files in that file.
 
 Shows a diff and prompts for confirmation before doing the deed.
 Works great with tools/git/for-all-touched-files.py.
 """
@@ skipping 31 matching lines @@
   comments = []
   sources = []
   for line in original_lines:
     if re.search(COMMENT_PATTERN, line):
       comments.append(line)
     elif re.search(SOURCE_PATTERN, line):
       # Associate the line with the preceeding comments.
       sources.append([line, comments])
       comments = []
     else:
-      if comments:
-        output_lines.extend(comments)
-        comments = []
+      # |sources| should be flushed first, to handle comments at the end of a
+      # source list correctly.
       if sources:
         for source_line, source_comments in sorted(sources):
           output_lines.extend(source_comments)
           output_lines.append(source_line)
         sources = []
+      if comments:
+        output_lines.extend(comments)
+        comments = []
       output_lines.append(line)
   return output_lines
 
 
 def ProcessFile(filename, should_confirm):
   """Process the input file and rewrite if needed.
 
   Args:
     filename: Path to the input file.
     should_confirm: If true, diff and confirmation prompt are shown.
@@ skipping 29 matching lines @@
   if len(filenames) < 1:
     parser.print_help()
     return 1
 
   for filename in filenames:
     ProcessFile(filename, opts.should_confirm)
 
 
 if __name__ == '__main__':
   sys.exit(main())