Merge changes I5374219a,I454b982d into stable-2.8

* changes:
  SideBySide2: Map .py files to text/x-python
  SideBySide2: Map *.cxx and *.hxx to clike CodeMirror mode
This commit is contained in:
Shawn Pearce
2013-12-10 03:12:54 +00:00
committed by Gerrit Code Review

View File

@@ -30,12 +30,17 @@ public class DefaultFileExtensionRegistry extends MimeDetector {
private static final MimeType INI = newMimeType("text/x-ini", 2);
private static final MimeType PYTHON = newMimeType("text/x-python", 2);
private static final ImmutableMap<String, MimeType> TYPES = ImmutableMap.of(
".gitmodules", INI,
"project.config", INI,
"BUCK", PYTHON,
"defs", newMimeType(PYTHON.toString(), 1),
"go", newMimeType("text/x-go", 1));
private static final ImmutableMap<String, MimeType> TYPES =
ImmutableMap.<String,MimeType>builder()
.put(".gitmodules", INI)
.put("project.config", INI)
.put("BUCK", PYTHON)
.put("defs", newMimeType(PYTHON.toString(), 1))
.put("py", newMimeType(PYTHON.toString(), 1))
.put("go", newMimeType("text/x-go", 1))
.put("cxx", newMimeType("text/x-c++src", 1))
.put("hxx", newMimeType("text/x-c++hdr", 1))
.build();
private static MimeType newMimeType(String type, final int specificity) {
return new MimeType(type) {