Fix handling of nil URL in import response

Introduced in c6481a9
bep · Dec 29, 2020 · 42bab9c · 42bab9c
1 parent 275947e
commit 42bab9c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/transpiler.go b/transpiler.go
@@ -261,11 +261,15 @@ func (t *Transpiler) input() {
 					},
 				}
 			} else {
-				response = &embeddedsass.InboundMessage_CanonicalizeResponse{
-					Id: c.CanonicalizeRequest.GetId(),
-					Result: &embeddedsass.InboundMessage_CanonicalizeResponse_Url{
+				var url *embeddedsass.InboundMessage_CanonicalizeResponse_Url
+				if resolved != "" {
+					url = &embeddedsass.InboundMessage_CanonicalizeResponse_Url{
 						Url: resolved,
-					},
+					}
+				}
+				response = &embeddedsass.InboundMessage_CanonicalizeResponse{
+					Id:     c.CanonicalizeRequest.GetId(),
+					Result: url,
 				}
 			}
 

diff --git a/transpiler_test.go b/transpiler_test.go
@@ -94,6 +94,7 @@ body
 		// Error cases
 		{"Invalid syntax", Options{}, Args{Source: "div { color: $white; }"}, false},
 		{"Import not found", Options{}, Args{Source: "@import \"foo\""}, false},
+		{"Import with ImportResolver, not found", Options{}, Args{Source: "@import \"foo\"", ImportResolver: colorsResolver}, false},
 		{"Error in ImportResolver.CanonicalizeURL", Options{}, Args{Source: "@import \"colors\";", ImportResolver: testImportResolver{name: "colors", failOnCanonicalizeURL: true}}, false},
 		{"Error in ImportResolver.Load", Options{}, Args{Source: "@import \"colors\";", ImportResolver: testImportResolver{name: "colors", failOnLoad: true}}, false},
 		{"Invalid OutputStyle", Options{}, Args{Source: "a", OutputStyle: "asdf"}, false},