optimize parser (#206)

* add comment support

* add comment support

* 1. group support multi level folder
2. remove force flag

* bug fix

* refactor parser and remove deprecated code

* refactor parser and remove deprecated code

* refactor parser and remove deprecated code

* refactor parser and remove deprecated code

* refactor parser and remove deprecated code

* refactor parser and remove deprecated code

* refactor parser and remove deprecated code

* optimized parser

Co-authored-by: kim <xutao@xiaoheiban.cn>
master
kingxt 4 years ago committed by GitHub
parent c7831ac96d
commit 88da8685dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -22,10 +22,14 @@ info(
version: 1.0 version: 1.0
) )
type Request struct { // TODO: test
// {
type Request struct { // TODO: test
// TOOD
Name string ` + "`" + `path:"name,options=you|me"` + "`" + ` // } Name string ` + "`" + `path:"name,options=you|me"` + "`" + ` // }
} } // TODO: test
// TODO: test
type Response struct { type Response struct {
Message string ` + "`" + `json:"message"` + "`" + ` Message string ` + "`" + `json:"message"` + "`" + `
} }

@ -139,6 +139,7 @@ func (s *apiImportState) process(api *ApiStruct, token string) (apiFileState, er
} }
line = token + line line = token + line
line = removeComment(line)
if len(strings.Fields(line)) != 2 { if len(strings.Fields(line)) != 2 {
return nil, errors.New("import syntax error: " + line) return nil, errors.New("import syntax error: " + line)
} }
@ -159,6 +160,8 @@ func (s *apiTypeState) process(api *ApiStruct, token string) (apiFileState, erro
token = "" token = ""
line = strings.TrimSpace(line) line = strings.TrimSpace(line)
line = removeComment(line) line = removeComment(line)
line = strings.TrimSpace(line)
if strings.HasSuffix(line, leftBrace) { if strings.HasSuffix(line, leftBrace) {
blockCount++ blockCount++
} }
@ -191,6 +194,8 @@ func (s *apiServiceState) process(api *ApiStruct, token string) (apiFileState, e
api.Service += "\n" + line api.Service += "\n" + line
line = strings.TrimSpace(line) line = strings.TrimSpace(line)
line = removeComment(line) line = removeComment(line)
line = strings.TrimSpace(line)
if strings.HasSuffix(line, leftBrace) { if strings.HasSuffix(line, leftBrace) {
blockCount++ blockCount++
} }

Loading…
Cancel
Save