From abeb30bb1c6c13c814a03e7a638e4975cd683d02 Mon Sep 17 00:00:00 2001 From: Ilya Puchka Date: Tue, 26 Dec 2017 21:20:09 +0100 Subject: [PATCH] fix rendering templates created from string literals --- Sources/Environment.swift | 2 ++ Sources/Template.swift | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Sources/Environment.swift b/Sources/Environment.swift index aafab8a..ce2d2c5 100644 --- a/Sources/Environment.swift +++ b/Sources/Environment.swift @@ -43,6 +43,8 @@ public struct Environment { } func render(template: Template, context: [String: Any]?) throws -> String { + // update temaplte environment as it cen be created from string literal with default environment + template.environment = self errorReporter.context = ErrorReporterContext(template: template) do { return try template.render(context) diff --git a/Sources/Template.swift b/Sources/Template.swift index db570e0..03176b2 100644 --- a/Sources/Template.swift +++ b/Sources/Template.swift @@ -8,7 +8,7 @@ let NSFileNoSuchFileError = 4 /// A class representing a template open class Template: ExpressibleByStringLiteral { let templateString: String - let environment: Environment + internal(set) var environment: Environment let tokens: [Token] /// The name of the loaded Template if the Template was loaded from a Loader