Add a logging integration test that uses splitLogsAndContent

PiperOrigin-RevId: 708665947
google · Dec 23, 2024 · 10fa3f5 · 10fa3f5
1 parent 2178d15
commit 10fa3f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/documentation/dev/externs.md b/documentation/dev/externs.md
@@ -205,7 +205,8 @@ protos                 | Return: the proto message Java type<br/> Param: the exa
 proto enums            | the proto enum Java type                                                                                                                                           |
 `uri`                  | `com.google.common.html.types.SafeUrl`, `com.google.common.html.types.SafeUrlProto`                                                                                |
 `trusted_resource_uri` | `com.google.common.html.types.TrustedResourceUrl`, `com.google.common.html.types.TrustedResourceUrlProto`                                                          |
-`html`                 | `com.google.common.html.types.SafeHtml`, `com.google.common.html.types.SafeHtmlProto`                                                                              |
+`html`                 | `com.google.common.html.types.SafeHtml`, `com.google.common.html.types.SafeHtmlProto`, `com.google.template.soy.data.SanitizedContent`                             |
+`attributes`           | `com.google.template.soy.data.SanitizedContent`                                                                                                                    |
 `iterable<?>`          | Return: `? extends java.lang.Iterable`<br/> Param: `java.lang.Iterable` or `com.google.template.soy.data.SoyValue`                                                 |
 `list<?>`              | Return: `? extends java.lang.Iterable`<br/> Param: `? super com.google.common.collect.ImmutableList` (excluding `Object`), `com.google.template.soy.data.SoyValue` |
 `set<?>`               | Return: `? extends java.lang.Iterable`<br/> Param: `? super com.google.common.collect.ImmutableSet` (excluding `Object`)                                           |

diff --git a/java/src/com/google/template/soy/passes/ValidateExternsPass.java b/java/src/com/google/template/soy/passes/ValidateExternsPass.java
@@ -479,7 +479,9 @@ private boolean typesAreCompatible(
       case ATTRIBUTES:
         return javaType == SanitizedContent.class;
       case HTML:
-        return javaType == SafeHtml.class || javaType == SafeHtmlProto.class;
+        return javaType == SafeHtml.class
+            || javaType == SafeHtmlProto.class
+            || javaType == SanitizedContent.class;
       case PROTO:
         SoyProtoType protoType = (SoyProtoType) soyType;
         return JavaQualifiedNames.getClassName(protoType.getDescriptor()).equals(javaType.getName())