Skip to content

Commit fc767a5

Browse files
YYCoderYYCoder
committed
feat: 🎸 thrift2pb support comments
1 parent a067bb1 commit fc767a5

File tree

15 files changed

+384
-370
lines changed

15 files changed

+384
-370
lines changed

‎.vscode/launch.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"program": "${workspaceFolder}",
1313
"args": [
1414
// ! file pb 2 thrift
15-
"-t=proto2thrift", "-i=./example/proto2thrift/idl.proto", "-o=./example/proto2thrift", "-use-space-indent=1",
16-
"-name-case=pascalCase", "-field-case=pascalCase",
15+
// "-t=proto2thrift", "-i=./example/proto2thrift/idl.proto", "-o=./example/proto2thrift", "-use-space-indent=1",
16+
// "-name-case=pascalCase", "-field-case=pascalCase",
1717

1818
// ! content pb 2 thrift
1919
// "-t=proto2thrift",
@@ -32,12 +32,12 @@
3232
// "-field-case=pascalCase",
3333

3434
// ! multiple file thrift 2 pb
35-
// "-t=thrift2proto", "-i=./example/multiple-thrift2proto/idl.thrift", "-o=./example/multiple-thrift2proto/output/output", "-use-space-indent=1",
35+
// "-t=thrift2proto", "-i=./example/multiple-thrift2proto/idl.thrift", "-o=./example/multiple-thrift2proto", "-use-space-indent=1",
3636
// "-name-case=pascalCase", "-field-case=snakeCase", "-syntax=3", "-r=1",
3737

3838
// ! multiple file pb 2 thrift
39-
// "-t=proto2thrift", "-i=./example/multiple-proto2thrift/idl.proto", "-o=./example/multiple-proto2thrift", "-use-space-indent=1",
40-
// "-name-case=pascalCase", "-field-case=pascalCase",
39+
"-t=proto2thrift", "-i=./example/multiple-proto2thrift/idl.proto", "-o=./example/multiple-proto2thrift", "-use-space-indent=1",
40+
"-name-case=pascalCase", "-field-case=pascalCase", "-r=1",
4141

4242
// ! dir pb 2 thrift
4343
// "-t=proto2thrift", "-i=./example/dir-proto2thrift", "-o=./example/dir-proto2thrift/output", "-use-space-indent=1",

‎example/multiple-proto2thrift/common/admin.thrift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
enum status {
2-
statusUnknown = 0
3-
statusUnreviewed = 1
4-
statusOnline = 2
5-
statusRejected = 3
6-
statusOffline = 4
1+
enum Status {
2+
StatusUnknown = 0
3+
StatusUnreviewed = 1
4+
StatusOnline = 2
5+
StatusRejected = 3
6+
StatusOffline = 4
77
}

‎example/multiple-proto2thrift/idl.thrift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
include "./common/admin.thrift";
2-
include "./test.thrift";
1+
include "./common/admin.thrift"
2+
include "./test.thrift"
33
enum OtherEnum {
44
OtherEnumUnknown = 0
55
Unreviewed = 1

‎example/multiple-proto2thrift/test.thrift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
struct timeRange {
2-
1: i64 start
3-
2: i64 end
1+
struct TimeRange {
2+
1: i64 Start
3+
2: i64 End
44
}

‎example/multiple-thrift2proto/common/admin.proto‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
syntax = "proto3";
22
enum Status {
3-
status_unknown = 0;
4-
status_unreviewed = 1;
5-
status_online = 2;
6-
status_rejected = 3;
7-
status_offline = 4;
3+
StatusUnknown = 0;
4+
StatusUnreviewed = 1;
5+
StatusOnline = 2;
6+
StatusRejected = 3;
7+
StatusOffline = 4;
88
}

‎example/multiple-thrift2proto/idl.proto‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
syntax = "proto3";
22
import "./test.proto";
33
import "./common/admin.proto";
4+
45
enum OtherEnum {
5-
other_enum_unknown = 0;
6-
unreviewed = 1;
7-
online = 2;
8-
rejected = 3;
9-
offline = 4;
6+
// 123123
7+
OtherEnumUnknown = 0;
8+
Unreviewed = 1;
9+
Online = 2;
10+
Rejected = 3;
11+
Offline = 4;
1012
}
1113
message Config {
12-
int64 id = 1;
13-
int32 tag = 2;
14-
repeated int32 type_list = 3;
15-
bool boolean = 4;
16-
admin.Status status = 5;
17-
map<int64, string> fail_map = 6;
18-
double fl = 7;
19-
double db = 8;
20-
bytes bs = 9;
21-
test.TimeRange nested = 10;
22-
repeated test.TimeRange nested_type_list = 11;
23-
map<string, test.TimeRange> nested_type_map = 12;
14+
int64 Id = 1;
15+
int32 Tag = 2;
16+
repeated int32 TypeList = 3;
17+
bool Boolean = 4;
18+
admin.Status Status = 5;
19+
map<int64, string> FailMap = 6;
20+
double Fl = 7;
21+
double Db = 8;
22+
bytes Bs = 9;
23+
test.TimeRange Nested = 10;
24+
repeated test.TimeRange NestedTypeList = 11;
25+
map<string, test.TimeRange> NestedTypeMap = 12;
2426
}
2527
service APIs {
2628
rpc TestOther(Config) returns (Config) {}
2729
}
30+

‎example/multiple-thrift2proto/idl.thrift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
include "./test.thrift";
2-
include "./common/admin.thrift";
1+
include "./test.thrift"
2+
include "./common/admin.thrift"
3+
34
enum OtherEnum {
5+
// 123123
46
OtherEnumUnknown = 0
57
Unreviewed = 1
68
Online = 2

‎example/multiple-thrift2proto/test.proto‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
syntax = "proto3";
22
message TimeRange {
3-
int64 start = 1;
4-
int64 end = 2;
3+
int64 Start = 1;
4+
// asdasdas
5+
int64 End = 2;
56
}

‎example/multiple-thrift2proto/test.thrift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
struct TimeRange {
22
1: i64 Start
3+
# asdasdas
34
2: i64 End
45
}

‎example/thrift2proto/idl.proto‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
syntax = "proto3";
22
package test.test.test;
33

4+
5+
/**
6+
* 123123
7+
*/
8+
9+
// asdasdasdsa
10+
// zxczxc
11+
412
enum Status {
13+
/*
14+
asdasd */
515
StatusUnknown = 0;
6-
StatusUnreviewed = 1;
16+
StatusUnreviewed = 1; // 123123
717
StatusOnline = 2;
818
StatusRejected = 3;
919
StatusOffline = 4;
@@ -16,7 +26,8 @@ enum OtherEnum {
1626
Offline = 4;
1727
}
1828
message RespOfTestGetApi {
19-
int32 Code = 1;
29+
int32 Code = 1; // asdzxzxc
30+
/* hahahaha */
2031
string Message = 2;
2132
}
2233
message ReqOfTestPostApi {
@@ -57,8 +68,12 @@ message RespOfTestOther {
5768
int64 A = 1;
5869
string B = 2;
5970
}
71+
72+
/* lkzlxjclzjxc */
6073
service APIs {
61-
rpc TestGetApi(ReqOfTestGetApi) returns (RespOfTestGetApi) {}
74+
// lallala
75+
rpc TestGetApi(ReqOfTestGetApi) returns (RespOfTestGetApi) {} // zxczcx
6276
rpc TestPostApi(ReqOfTestPostApi) returns (RespOfTestPostApi) {}
6377
rpc TestOther(ReqOfTestOther) returns (RespOfTestOther) {}
6478
}
79+

0 commit comments

Comments
 (0)