Skip to content

Commit

Permalink
Fix bug42
Browse files Browse the repository at this point in the history
  • Loading branch information
Wuvist committed May 2, 2019
1 parent f5e0cbf commit d75641e
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 2 deletions.
8 changes: 8 additions & 0 deletions gorazor/cases/bug42.gohtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@{
import(
"Tpl"
)
}
<div class="container">
@(raw(Tpl.TplBread([]string{"选择邮寄方式"})))
</div>
13 changes: 11 additions & 2 deletions gorazor/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,17 @@ func (parser *Parser) handleEXP(token Token) error {
parser.ast = parser.ast.Parent
parser.deferToken(token)
}

case HARD_PAREN_OPEN, PAREN_OPEN:
case HARD_PAREN_OPEN:
prev := parser.prevToken(0)
next := parser.peekToken(0)
err := parser.subParse(token, EXP, false)
if err != nil {
return err
}
if (prev != nil && prev.Type == AT) || (next != nil && next.Type == IDENTIFIER) {
parser.ast = parser.ast.Parent
}
case PAREN_OPEN:
prev := parser.prevToken(0)
next := parser.peekToken(0)
if token.Type == HARD_PAREN_OPEN && next.Type == HARD_PAREN_CLOSE {
Expand Down
16 changes: 16 additions & 0 deletions gorazor/test/bug42.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package cases

import (
"Tpl"
"bytes"
"github.com/sipin/gorazor/gorazor"
)

func Bug42() string {
var _buffer bytes.Buffer
_buffer.WriteString("\n<div class=\"container\">\n ")
_buffer.WriteString(gorazor.HTMLEscape((Tpl.TplBread([]string{"选择邮寄方式"}))))
_buffer.WriteString("\n</div>")

return _buffer.String()
}

0 comments on commit d75641e

Please sign in to comment.