Merge pull request #18 from gostaticanalysis/fix-template-delims

Fix template delims

Author: tenntenn

_template/{{.Pkg}}/{{.Pkg}}.go renamed to _template/@@.Pkg@@/@@.Pkg@@.go

@@ -1,4 +1,4 @@
-package {{.Pkg}}
+package @@.Pkg@@
 
 import (
 	"go/ast"
@@ -8,11 +8,11 @@ import (
 	"golang.org/x/tools/go/ast/inspector"
 )
 
-const doc = "{{.Pkg}} is ..."
+const doc = "@@.Pkg@@ is ..."
 
 // Analyzer is ...
 var Analyzer = &analysis.Analyzer{
-	Name: "{{.Pkg}}",
+	Name: "@@.Pkg@@",
 	Doc:  doc,
 	Run:  run,
 	Requires: []*analysis.Analyzer{

_template/{{.Pkg}}/{{.Pkg}}_test.go renamed to _template/@@.Pkg@@/@@.Pkg@@_test.go

@@ -1,15 +1,15 @@
-package {{.Pkg}}_test
+package @@.Pkg@@_test
 
 import (
 	"testing"
 
-	"{{.ImportPath}}"
+	"@@.ImportPath@@"
 	"golang.org/x/tools/go/analysis/analysistest"
 )
 
 // TestAnalyzer is a test for Analyzer.
 func TestAnalyzer(t *testing.T) {
 	testdata := analysistest.TestData()
-	analysistest.Run(t, testdata, {{.Pkg}}.Analyzer, "a")
+	analysistest.Run(t, testdata, @@.Pkg@@.Analyzer, "a")
 }
 

_template/@@.Pkg@@/cmd/@@.Pkg@@/main.go

@@ -0,0 +1,10 @@
+@@ if .Cmd -@@
+package main
+
+import (
+	"@@.ImportPath@@"
+	"golang.org/x/tools/go/analysis/@@.Checker@@checker"
+)
+
+func main() { @@.Checker@@checker.Main(@@.Pkg@@.Analyzer) }
+@@end@@

_template/{{.Pkg}}/plugin/main.go renamed to _template/@@.Pkg@@/plugin/main.go

@@ -1,20 +1,20 @@
-{{ if .Plugin -}}
+@@ if .Plugin -@@
 // This file can build as a plugin for golangci-lint by below command.
-//    go build -buildmode=plugin -o path_to_plugin_dir {{.ImportPath}}/plugin/{{.Pkg}}
+//    go build -buildmode=plugin -o path_to_plugin_dir @@.ImportPath@@/plugin/@@.Pkg@@
 // See: https://golangci-lint.run/contributing/new-linters/#how-to-add-a-private-linter-to-golangci-lint
 
 package main
 
 import (
 	"strings"
 
-	"{{.ImportPath}}"
+	"@@.ImportPath@@"
 	"golang.org/x/tools/go/analysis"
 )
 
 // flags for Analyzer.Flag.
 // If you would like to specify flags for your plugin, you can put them via 'ldflags' as below.
-//     $ go build -buildmode=plugin -ldflags "-X 'main.flags=-opt val'" {{.ImportPath}}/plugin/{{.Pkg}}
+//     $ go build -buildmode=plugin -ldflags "-X 'main.flags=-opt val'" @@.ImportPath@@/plugin/@@.Pkg@@
 var flags string
 
 // AnalyzerPlugin provides analyzers as a plugin.
@@ -25,13 +25,13 @@ type analyzerPlugin struct{}
 
 func (analyzerPlugin) GetAnalyzers() []*analysis.Analyzer {
 	if flags != "" {
-		flagset := {{.Pkg}}.Analyzer.Flags
+		flagset := @@.Pkg@@.Analyzer.Flags
 		if err := flagset.Parse(strings.Split(flags, " ")); err != nil {
-			panic("cannot parse flags of {{.Pkg}}: " + err.Error())
+			panic("cannot parse flags of @@.Pkg@@: " + err.Error())
 		}
 	}
 	return []*analysis.Analyzer{
-		{{.Pkg}}.Analyzer,
+		@@.Pkg@@.Analyzer,
 	}
 }
-{{end}}
+@@end@@

_template/{{.Pkg}}/testdata/src/a/a.go renamed to _template/@@.Pkg@@/testdata/src/a/a.go

@@ -80,10 +80,11 @@ func main() {
 		fmt.Fprintln(w, "// Code generated by _tools/txtar/main.go; DO NOT EDIT.")
 		fmt.Fprintln(w, "")
 		fmt.Fprintln(w, "package main")
-		fmt.Fprintln(w, )
+		fmt.Fprintln(w)
 		fmt.Fprintln(w, `import "text/template"`)
-		fmt.Fprintln(w, )
-		fmt.Fprintf(w, "var tmpl = template.Must(template.New(\"template\").Parse(%q))\n", archived)
+		fmt.Fprintln(w)
+		fmt.Fprintf(w, "var tmpl = template.Must(template.New"+
+			"(\"template\").Delims(`@@`, `@@`).Parse(%q))\n", archived)
 	}
 
 	if err := w.Close(); err != nil {