Merge pull request #98 from nginxinc/fix-lua-build

Fix lua build

Author: xynicole

build.go

@@ -155,6 +155,7 @@ func Build(w io.Writer, config Config, options *BuildOptions) error {
 	return err
 }
 
+//nolint:gocognit
 func buildBlock(sb io.StringWriter, parent *Directive, block Directives, depth int, lastLine int, options *BuildOptions) {
 	for i, stmt := range block {
 		directive := Enquote(stmt.Directive)
@@ -172,13 +173,16 @@ func buildBlock(sb io.StringWriter, parent *Directive, block Directives, depth i
 
 		_, _ = sb.WriteString(margin(options, depth))
 
-		if stmt.IsComment() {
-			_, _ = sb.WriteString("#")
-			_, _ = sb.WriteString(*stmt.Comment)
-		} else if options.extBuilders != nil {
+		if options.extBuilders != nil {
 			if ext, ok := options.extBuilders[directive]; ok {
 				_, _ = sb.WriteString(ext.Build(stmt))
+				continue
 			}
+		}
+
+		if stmt.IsComment() {
+			_, _ = sb.WriteString("#")
+			_, _ = sb.WriteString(*stmt.Comment)
 		} else {
 			_, _ = sb.WriteString(directive)
 

build_test.go

@@ -263,13 +263,49 @@ var buildFixtures = []buildFixture{
 		options: BuildOptions{Builders: []RegisterBuilder{lua.RegisterBuilder()}},
 		parsed: Directives{
 			{
-				Directive: "content_by_lua_block",
-				Line:      1,
-				Args:      []string{"\n                ngx.say(\"I need no extra escaping here, for example: \\r\\nblah\")\n            "},
+				Directive: "http",
+				Args:      []string{},
+				Block: Directives{
+					{
+						Directive: "server",
+						Args:      []string{},
+						Block: Directives{
+							{
+								Directive: "listen",
+								Args:      []string{"127.0.0.1:8080"},
+							},
+							{
+								Directive: "server_name",
+								Args:      []string{"default_server"},
+							},
+							{
+								Directive: "location",
+								Args:      []string{"/"},
+								Block: Directives{
+									{
+										Directive: "content_by_lua_block",
+										Line:      1,
+										Args:      []string{"\n                ngx.say(\"I need no extra escaping here, for example: \\r\\nblah\")\n            "},
+									},
+								},
+							},
+						},
+					},
+				},
 			},
 		},
 
-		expected: "content_by_lua_block {\n                ngx.say(\"I need no extra escaping here, for example: \\r\\nblah\")\n            }",
+		expected: strings.Join([]string{
+			"http {",
+			"    server {",
+			"        listen 127.0.0.1:8080;",
+			"        server_name default_server;",
+			"        location / {",
+			"            content_by_lua_block {\n                ngx.say(\"I need no extra escaping here, for example: \\r\\nblah\")\n            }",
+			"        }",
+			"    }",
+			"}",
+		}, "\n"),
 	},
 	{
 		name:    "set_by_lua_block",