Skip to content

Commit 8dd84d3

Browse files
committed
fix 修复注释中的回车符导致的代码生成错误
1 parent 2173c9d commit 8dd84d3

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

v2/dataheaderelem.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package v2
33
import (
44
"github.com/davyxu/tabtoy/v2/i18n"
55
"github.com/davyxu/tabtoy/v2/model"
6+
"strings"
67
)
78

89
type DataHeaderElement struct {
@@ -97,7 +98,7 @@ func (self *DataHeaderElement) Parse(def *model.FieldDescriptor, localFD *model.
9798
return DataSheetHeader_FieldMeta
9899
}
99100

100-
def.Comment = self.Comment
101+
def.Comment = strings.Replace(self.Comment, "\n", " ", -1)
101102

102103
// 根据字段名查找, 处理repeated字段case
103104
exist, ok := headerByName[def.Name]

v2/printer/globals.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package printer
33
import (
44
"github.com/davyxu/tabtoy/v2/i18n"
55
"github.com/davyxu/tabtoy/v2/model"
6+
"strings"
67
)
78

89
type TableIndex struct {
@@ -139,7 +140,9 @@ func (self *Globals) AddContent(tab *model.Table) bool {
139140
rowFD.Complex = localFD.RowDescriptor()
140141
rowFD.IsRepeated = true
141142
rowFD.Order = int32(len(self.CombineStruct.Fields) + 1)
142-
rowFD.Comment = localFD.Name
143+
144+
// 去掉注释中的回车,避免代码生成错误
145+
rowFD.Comment = strings.Replace(localFD.Name, "\n", " ", -1)
143146
self.CombineStruct.Add(rowFD)
144147

145148
if localFD.RowDescriptor() == nil {

v2/typemodel.go

+3
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ func (self *typeModelRoot) ParseData(localFD *model.FileDescriptor, globalFD *mo
155155

156156
m.fd.Comment, self.Col = m.getValue("Comment")
157157

158+
// 去掉注释中的回车,避免代码生成错误
159+
m.fd.Comment = strings.Replace(m.fd.Comment, "\n", " ", -1)
160+
158161
var rawMeta string
159162
rawMeta, self.Col = m.getValue("Meta")
160163

0 commit comments

Comments
 (0)