Clone Options from TemplateSet.Options

sansanyun · Jun 2, 2017 · ada54c0 · ada54c0
1 parent 84719ff
commit ada54c0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/options.go b/options.go
@@ -16,3 +16,11 @@ func newOptions() *Options {
 		LStripBlocks: false,
 	}
 }
+
+// Update updates this options from another options.
+func (opt *Options) Update(other *Options) *Options {
+	opt.TrimBlocks = other.TrimBlocks
+	opt.LStripBlocks = other.LStripBlocks
+
+	return opt
+}
diff --git a/template.go b/template.go
@@ -69,8 +69,10 @@ func newTemplate(set *TemplateSet, name string, isTplString bool, tpl []byte) (*
 		size:           len(strTpl),
 		blocks:         make(map[string]*NodeWrapper),
 		exportedMacros: make(map[string]*tagMacroNode),
-		Options:        set.Options,
+		Options:        newOptions(),
 	}
+	// Copy all settings from another Options.
+	t.Options.Update(set.Options)
 
 	// Tokenize it
 	tokens, err := lex(name, strTpl)