fix: Problem with block directives #77

0xJacky · 0xJacky · commit 6b9ebbfcc637 · 2023-02-09T21:06:01.000+08:00
diff --git a/server/pkg/nginx/parse.go b/server/pkg/nginx/parse.go
@@ -53,8 +53,14 @@ func (l *NgxLocation) parseLocation(directive gonginx.IDirective, deep int) {
 				l.Content += strings.Repeat("\t", deep) + c + "\n"
 			}
 		}
-		l.Content += strings.Repeat("\t", deep) + location.GetName() + " " + strings.Join(location.GetParameters(), " ") + ";\n"
-		l.parseLocation(location, deep+1)
+		l.Content += strings.Repeat("\t", deep) + location.GetName() + " " + strings.Join(location.GetParameters(), " ")
+		if location.GetBlock() != nil && location.GetBlock().GetDirectives() != nil {
+			l.Content += " { \n"
+			l.parseLocation(location, deep+1)
+			l.Content += " } \n"
+		} else {
+			l.Content += ";\n"
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,14 @@ func (l *NgxLocation) parseLocation(directive gonginx.IDirective, deep int) {`
`53`	`53`	`l.Content += strings.Repeat("\t", deep) + c + "\n"`
`54`	`54`	`}`
`55`	`55`	`}`
`56`		`- l.Content += strings.Repeat("\t", deep) + location.GetName() + " " + strings.Join(location.GetParameters(), " ") + ";\n"`
`57`		`- l.parseLocation(location, deep+1)`
	`56`	`+ l.Content += strings.Repeat("\t", deep) + location.GetName() + " " + strings.Join(location.GetParameters(), " ")`
	`57`	`+ if location.GetBlock() != nil && location.GetBlock().GetDirectives() != nil {`
	`58`	`+ l.Content += " { \n"`
	`59`	`+ l.parseLocation(location, deep+1)`
	`60`	`+ l.Content += " } \n"`
	`61`	`+ } else {`
	`62`	`+ l.Content += ";\n"`
	`63`	`+ }`
`58`	`64`	`}`
`59`	`65`	`}`
`60`	`66`