actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2026-05-01 21:02:33 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

small style fixes related to templates

Browse Source
This commit is contained in:
Egor Kovetskiy
2022-06-07 14:21:11 +06:00
parent 78345736d5
commit 1ebb29eba0
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/mark/includes/templates.go
View File

@@ -20,9 +20,9 @@ import (
// <optional yaml data> -->
var reIncludeDirective = regexp.MustCompile(
`(?s)` +
`<!--\s*Include:\s*(?P<template>.+?)\s*` +
`(?:\n\s*Delims:\s*(?:(none|"(?P<left>.*?)"\s*,\s*"(?P<right>.*?)")))?\s*` +
`(?:\n(?P<config>.*?))?-->`,
`<!--\s*Include:\s*(?P<template>.+?)\s*` +
`(?:\n\s*Delims:\s*(?:(none|"(?P<left>.*?)"\s*,\s*"(?P<right>.*?)")))?\s*` +
`(?:\n(?P<config>.*?))?-->`,
)
func LoadTemplate(
@@ -111,15 +111,21 @@ func ProcessIncludes(
groups := reIncludeDirective.FindSubmatch(spec)
var (
path, none, left, right, config = string(groups[1]), string(groups[2]), string(groups[3]), string(groups[4]), groups[5]
data = map[string]interface{}{}
path = string(groups[1])
delimsNone = string(groups[2])
left = string(groups[3])
right = string(groups[4])
config = groups[5]
data = map[string]interface{}{}
facts = karma.Describe("path", path)
)
if none == "none" {
if delimsNone == "none" {
left = "\x00"
right = "\x01"
}
err = yaml.Unmarshal(config, &data)
if err != nil {
err = facts.