commit f21a5a687ad3534585cbe362f2bbdf0786c55d47
author Edwin Kempin <ekempin@google.com> Tue Oct 18 06:57:31 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 18 06:57:31 2022 +0000
tree e3a31fd9c5a08ec83e0e5ac65fb3833cb56eb858
parent 21d58134edc8558c64ad9d0ac2c2294922f67679
parent da8954432c61443ef2886d30dd52529b0674df3a

Merge "Don't ignore .txt file extension"

java/com/google/gitiles/BlobSoyData.java

diff --git a/java/com/google/gitiles/BlobSoyData.java b/java/com/google/gitiles/BlobSoyData.java
index 956222f..e898101 100644
--- a/java/com/google/gitiles/BlobSoyData.java
+++ b/java/com/google/gitiles/BlobSoyData.java
@@ -189,9 +189,7 @@
     int slash = path.lastIndexOf('/');
     int dot = path.lastIndexOf('.');
     String ext = ((0 < dot) && (slash < dot)) ? path.substring(dot + 1) : null;
-    if ("txt".equalsIgnoreCase(ext)) {
-      return null;
-    } else if ("mk".equalsIgnoreCase(ext)) {
+    if ("mk".equalsIgnoreCase(ext)) {
       return "sh";
     } else if ("Makefile".equalsIgnoreCase(path)
         || ((0 < slash) && "Makefile".equalsIgnoreCase(path.substring(slash + 1)))) {

modules/java-prettify

diff --git a/modules/java-prettify b/modules/java-prettify
index 54d1c6c..8af621b 160000
--- a/modules/java-prettify
+++ b/modules/java-prettify
@@ -1 +1 @@
-Subproject commit 54d1c6c735a92cad8c67cb4c9fcd1d090605c88e
+Subproject commit 8af621b7b99641eb803caa460009290a47fa3111