Skip to content

Commit 56e5d4e

Browse files
Denys Smirnovdennwc
Denys Smirnov
authored and
dennwc
committed
use a correct field for token and identifier name; fixes #18
Signed-off-by: Denys Smirnov <denys@sourced.tech>
1 parent 19054b5 commit 56e5d4e

125 files changed

Lines changed: 30516 additions & 2969 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎driver/normalizer/annotation.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ var Annotations = []Mapping{
286286
AnnotateType("ByKeyword", FieldRoles{"Value": {Rename: uast.KeyToken}}, role.Equal, role.Incomplete),
287287
AnnotateType("GroupKeyword", FieldRoles{"Value": {Rename: uast.KeyToken}}, role.Equal, role.Incomplete),
288288

289-
AnnotateType("IdentifierToken", FieldRoles{"Value": {Rename: uast.KeyToken}},
289+
AnnotateType("IdentifierToken", FieldRoles{"Text": {Rename: uast.KeyToken}},
290290
role.Identifier, role.Expression),
291291
AnnotateType("QualifiedName", nil, role.Qualified, role.Identifier),
292292

‎driver/normalizer/normalizer.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,11 @@ var Normalizers = []Mapping{
388388
"TrailingTrivia": Any(),
389389
"IsMissing": Bool(false),
390390

391-
// all token values are the same
392-
"Text": Var("name"),
391+
// we drop this one, because C# allows to declare
392+
// a "for" identifier by using "@for" notation
393+
// and we don't need that token in Semantic mode
394+
"Text": Any(),
395+
// all other token values are the same
393396
"Value": Var("name"),
394397
"ValueText": Var("name"),
395398
}, Obj{

‎fixtures/Program.cs.uast‎

Lines changed: 136 additions & 136 deletions
Large diffs are not rendered by default.

‎fixtures/_integration.cs.legacy‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ CompilationUnit {
127127
. . . . . . . }
128128
. . . . . . . Properties: {
129129
. . . . . . . . IsMissing: false
130-
. . . . . . . . Text: System
130+
. . . . . . . . Value: System
131131
. . . . . . . . ValueText: System
132132
. . . . . . . . internalRole: Identifier
133133
. . . . . . . }
@@ -248,7 +248,7 @@ CompilationUnit {
248248
. . . . . . . }
249249
. . . . . . . Properties: {
250250
. . . . . . . . IsMissing: false
251-
. . . . . . . . Text: HelloWorld
251+
. . . . . . . . Value: HelloWorld
252252
. . . . . . . . ValueText: HelloWorld
253253
. . . . . . . . internalRole: Identifier
254254
. . . . . . . }
@@ -347,7 +347,7 @@ CompilationUnit {
347347
. . . . . . . }
348348
. . . . . . . Properties: {
349349
. . . . . . . . IsMissing: false
350-
. . . . . . . . Text: Hello
350+
. . . . . . . . Value: Hello
351351
. . . . . . . . ValueText: Hello
352352
. . . . . . . . internalRole: Identifier
353353
. . . . . . . }
@@ -486,7 +486,7 @@ CompilationUnit {
486486
. . . . . . . . . }
487487
. . . . . . . . . Properties: {
488488
. . . . . . . . . . IsMissing: false
489-
. . . . . . . . . . Text: Main
489+
. . . . . . . . . . Value: Main
490490
. . . . . . . . . . ValueText: Main
491491
. . . . . . . . . . internalRole: Identifier
492492
. . . . . . . . . }
@@ -680,7 +680,7 @@ CompilationUnit {
680680
. . . . . . . . . . . . . . . . . . . }
681681
. . . . . . . . . . . . . . . . . . . Properties: {
682682
. . . . . . . . . . . . . . . . . . . . IsMissing: false
683-
. . . . . . . . . . . . . . . . . . . . Text: Console
683+
. . . . . . . . . . . . . . . . . . . . Value: Console
684684
. . . . . . . . . . . . . . . . . . . . ValueText: Console
685685
. . . . . . . . . . . . . . . . . . . . internalRole: Identifier
686686
. . . . . . . . . . . . . . . . . . . }
@@ -743,7 +743,7 @@ CompilationUnit {
743743
. . . . . . . . . . . . . . . . . . . }
744744
. . . . . . . . . . . . . . . . . . . Properties: {
745745
. . . . . . . . . . . . . . . . . . . . IsMissing: false
746-
. . . . . . . . . . . . . . . . . . . . Text: WriteLine
746+
. . . . . . . . . . . . . . . . . . . . Value: WriteLine
747747
. . . . . . . . . . . . . . . . . . . . ValueText: WriteLine
748748
. . . . . . . . . . . . . . . . . . . . internalRole: Identifier
749749
. . . . . . . . . . . . . . . . . . . }
@@ -1023,7 +1023,7 @@ CompilationUnit {
10231023
. . . . . . . . . . . . . . . . . . . }
10241024
. . . . . . . . . . . . . . . . . . . Properties: {
10251025
. . . . . . . . . . . . . . . . . . . . IsMissing: false
1026-
. . . . . . . . . . . . . . . . . . . . Text: Console
1026+
. . . . . . . . . . . . . . . . . . . . Value: Console
10271027
. . . . . . . . . . . . . . . . . . . . ValueText: Console
10281028
. . . . . . . . . . . . . . . . . . . . internalRole: Identifier
10291029
. . . . . . . . . . . . . . . . . . . }
@@ -1106,7 +1106,7 @@ CompilationUnit {
11061106
. . . . . . . . . . . . . . . . . . . }
11071107
. . . . . . . . . . . . . . . . . . . Properties: {
11081108
. . . . . . . . . . . . . . . . . . . . IsMissing: false
1109-
. . . . . . . . . . . . . . . . . . . . Text: WriteLine
1109+
. . . . . . . . . . . . . . . . . . . . Value: WriteLine
11101110
. . . . . . . . . . . . . . . . . . . . ValueText: WriteLine
11111111
. . . . . . . . . . . . . . . . . . . . internalRole: Identifier
11121112
. . . . . . . . . . . . . . . . . . . }
@@ -1386,7 +1386,7 @@ CompilationUnit {
13861386
. . . . . . . . . . . . . . . . . . . }
13871387
. . . . . . . . . . . . . . . . . . . Properties: {
13881388
. . . . . . . . . . . . . . . . . . . . IsMissing: false
1389-
. . . . . . . . . . . . . . . . . . . . Text: Console
1389+
. . . . . . . . . . . . . . . . . . . . Value: Console
13901390
. . . . . . . . . . . . . . . . . . . . ValueText: Console
13911391
. . . . . . . . . . . . . . . . . . . . internalRole: Identifier
13921392
. . . . . . . . . . . . . . . . . . . }
@@ -1449,7 +1449,7 @@ CompilationUnit {
14491449
. . . . . . . . . . . . . . . . . . . }
14501450
. . . . . . . . . . . . . . . . . . . Properties: {
14511451
. . . . . . . . . . . . . . . . . . . . IsMissing: false
1452-
. . . . . . . . . . . . . . . . . . . . Text: ReadKey
1452+
. . . . . . . . . . . . . . . . . . . . Value: ReadKey
14531453
. . . . . . . . . . . . . . . . . . . . ValueText: ReadKey
14541454
. . . . . . . . . . . . . . . . . . . . internalRole: Identifier
14551455
. . . . . . . . . . . . . . . . . . . }

‎fixtures/_integration.cs.uast‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@
133133
},
134134
IsMissing: false,
135135
LeadingTrivia: [],
136-
Text: "Hello",
137136
TrailingTrivia: [],
137+
Value: "Hello",
138138
ValueText: "Hello",
139139
},
140140
IsMissing: false,
@@ -472,8 +472,8 @@
472472
},
473473
IsMissing: false,
474474
LeadingTrivia: [],
475-
Text: "Console",
476475
TrailingTrivia: [],
476+
Value: "Console",
477477
ValueText: "Console",
478478
},
479479
IsMissing: false,
@@ -515,8 +515,8 @@
515515
},
516516
IsMissing: false,
517517
LeadingTrivia: [],
518-
Text: "WriteLine",
519518
TrailingTrivia: [],
519+
Value: "WriteLine",
520520
ValueText: "WriteLine",
521521
},
522522
IsMissing: false,
@@ -827,8 +827,8 @@
827827
IsDirective: false,
828828
},
829829
],
830-
Text: "Console",
831830
TrailingTrivia: [],
831+
Value: "Console",
832832
ValueText: "Console",
833833
},
834834
IsMissing: false,
@@ -870,8 +870,8 @@
870870
},
871871
IsMissing: false,
872872
LeadingTrivia: [],
873-
Text: "WriteLine",
874873
TrailingTrivia: [],
874+
Value: "WriteLine",
875875
ValueText: "WriteLine",
876876
},
877877
IsMissing: false,
@@ -1063,8 +1063,8 @@
10631063
},
10641064
IsMissing: false,
10651065
LeadingTrivia: [],
1066-
Text: "Console",
10671066
TrailingTrivia: [],
1067+
Value: "Console",
10681068
ValueText: "Console",
10691069
},
10701070
IsMissing: false,
@@ -1106,8 +1106,8 @@
11061106
},
11071107
IsMissing: false,
11081108
LeadingTrivia: [],
1109-
Text: "ReadKey",
11101109
TrailingTrivia: [],
1110+
Value: "ReadKey",
11111111
ValueText: "ReadKey",
11121112
},
11131113
IsMissing: false,
@@ -1186,8 +1186,8 @@
11861186
},
11871187
IsMissing: false,
11881188
LeadingTrivia: [],
1189-
Text: "Main",
11901189
TrailingTrivia: [],
1190+
Value: "Main",
11911191
ValueText: "Main",
11921192
},
11931193
IsMissing: false,
@@ -1419,8 +1419,8 @@
14191419
},
14201420
IsMissing: false,
14211421
LeadingTrivia: [],
1422-
Text: "HelloWorld",
14231422
TrailingTrivia: [],
1423+
Value: "HelloWorld",
14241424
ValueText: "HelloWorld",
14251425
},
14261426
IsMissing: false,
@@ -1546,8 +1546,8 @@
15461546
},
15471547
IsMissing: false,
15481548
LeadingTrivia: [],
1549-
Text: "System",
15501549
TrailingTrivia: [],
1550+
Value: "System",
15511551
ValueText: "System",
15521552
},
15531553
IsMissing: false,

‎fixtures/accesor_list.cs.uast‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@
101101
},
102102
IsMissing: false,
103103
LeadingTrivia: [],
104-
Text: "List",
105104
TrailingTrivia: [],
105+
Value: "List",
106106
ValueText: "List",
107107
},
108108
IsMissing: false,
@@ -245,8 +245,8 @@
245245
},
246246
IsMissing: false,
247247
LeadingTrivia: [],
248-
Text: "fruitsList",
249248
TrailingTrivia: [],
249+
Value: "fruitsList",
250250
ValueText: "fruitsList",
251251
},
252252
Initializer: { '@type': "EqualsValueClause",
@@ -416,8 +416,8 @@
416416
},
417417
IsMissing: false,
418418
LeadingTrivia: [],
419-
Text: "List",
420419
TrailingTrivia: [],
420+
Value: "List",
421421
ValueText: "List",
422422
},
423423
IsMissing: false,
@@ -708,8 +708,8 @@
708708
},
709709
IsMissing: false,
710710
LeadingTrivia: [],
711-
Text: "fruitsList",
712711
TrailingTrivia: [],
712+
Value: "fruitsList",
713713
ValueText: "fruitsList",
714714
},
715715
IsMissing: false,
@@ -878,8 +878,8 @@
878878
},
879879
IsMissing: false,
880880
LeadingTrivia: [],
881-
Text: "FruitsList",
882881
TrailingTrivia: [],
882+
Value: "FruitsList",
883883
ValueText: "FruitsList",
884884
},
885885
Initializer: ~,
@@ -984,8 +984,8 @@
984984
},
985985
IsMissing: false,
986986
LeadingTrivia: [],
987-
Text: "List",
988987
TrailingTrivia: [],
988+
Value: "List",
989989
ValueText: "List",
990990
},
991991
IsMissing: false,
@@ -1388,8 +1388,8 @@
13881388
},
13891389
IsMissing: false,
13901390
LeadingTrivia: [],
1391-
Text: "fruitsList",
13921391
TrailingTrivia: [],
1392+
Value: "fruitsList",
13931393
ValueText: "fruitsList",
13941394
},
13951395
IsMissing: false,
@@ -1579,8 +1579,8 @@
15791579
},
15801580
IsMissing: false,
15811581
LeadingTrivia: [],
1582-
Text: "Join",
15831582
TrailingTrivia: [],
1583+
Value: "Join",
15841584
ValueText: "Join",
15851585
},
15861586
IsMissing: false,
@@ -1935,8 +1935,8 @@
19351935
IsDirective: false,
19361936
},
19371937
],
1938-
Text: "FruitsList",
19391938
TrailingTrivia: [],
1939+
Value: "FruitsList",
19401940
ValueText: "FruitsList",
19411941
},
19421942
IsMissing: false,
@@ -1978,8 +1978,8 @@
19781978
},
19791979
IsMissing: false,
19801980
LeadingTrivia: [],
1981-
Text: "Clear",
19821981
TrailingTrivia: [],
1982+
Value: "Clear",
19831983
ValueText: "Clear",
19841984
},
19851985
IsMissing: false,
@@ -2315,8 +2315,8 @@
23152315
},
23162316
IsMissing: false,
23172317
LeadingTrivia: [],
2318-
Text: "value",
23192318
TrailingTrivia: [],
2319+
Value: "value",
23202320
ValueText: "value",
23212321
},
23222322
IsMissing: false,
@@ -2358,8 +2358,8 @@
23582358
},
23592359
IsMissing: false,
23602360
LeadingTrivia: [],
2361-
Text: "Split",
23622361
TrailingTrivia: [],
2362+
Value: "Split",
23632363
ValueText: "Split",
23642364
},
23652365
IsMissing: false,
@@ -2532,8 +2532,8 @@
25322532
},
25332533
IsMissing: false,
25342534
LeadingTrivia: [],
2535-
Text: "FruitsList",
25362535
TrailingTrivia: [],
2536+
Value: "FruitsList",
25372537
ValueText: "FruitsList",
25382538
},
25392539
IsMissing: false,
@@ -2575,8 +2575,8 @@
25752575
},
25762576
IsMissing: false,
25772577
LeadingTrivia: [],
2578-
Text: "AddRange",
25792578
TrailingTrivia: [],
2579+
Value: "AddRange",
25802580
ValueText: "AddRange",
25812581
},
25822582
IsMissing: false,
@@ -2749,8 +2749,8 @@
27492749
},
27502750
IsMissing: false,
27512751
LeadingTrivia: [],
2752-
Text: "Fruits",
27532752
TrailingTrivia: [],
2753+
Value: "Fruits",
27542754
ValueText: "Fruits",
27552755
},
27562756
Initializer: ~,

0 commit comments

Comments
 (0)