Skip to content

Commit f41bd33

Browse files
efr15efr15
authored
Merge pull request #2710 from TypeCobolTeam/v2.7.0
V2.7.0
2 parents b9630dc + cc296f6 commit f41bd33

File tree

72 files changed

+6085
-389
lines changed

Some content is hidden

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

72 files changed

+6085
-389
lines changed

‎CSCup/CSCup.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<Nullable>disable</Nullable>
99
<!-- This project is used only at compile time, no need to redistribute -->
1010
<IsPackable>false</IsPackable>
11+
<!-- Disable .NET Analyzers on this project as it is a compile-time dependency only and not part of the packaged projects -->
12+
<EnableNETAnalyzers>false</EnableNETAnalyzers>
1113
</PropertyGroup>
1214

1315
<ItemGroup>

‎TypeCobol.LanguageServer.Test/LSRTest.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,8 @@ public void EI_ExtractRemarksData()
450450
[TestCategory("GetDataLayout")]
451451
public void GetDataLayoutRequest()
452452
{
453-
LSRTestHelper.Test("GetDataLayoutRequest", LsrTestingOptions.NoLsrTesting);
453+
LSRTestHelper.Test("GetDataLayoutRequestCSV", LsrTestingOptions.NoLsrTesting);
454+
LSRTestHelper.Test("GetDataLayoutRequestTREE", LsrTestingOptions.NoLsrTesting);
454455
}
455456

456457
[TestMethod]

‎TypeCobol.LanguageServer.Test/LSRTests/GetDataLayoutRequest/input/GetDataLayoutRequest.tlsp ‎TypeCobol.LanguageServer.Test/LSRTests/GetDataLayoutRequestCSV/input/GetDataLayoutRequestCSV.tlsp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
{
2929
"category": 1,
30-
"message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"result\":{\"csvResult\":{\"root\":\"TCOZEFR0\",\"header\":\"LineNumber;NodeLevel;LevelNumber;VariableName;PictureTypeOrUsage;Start;End;Length\",\"rows\":[\"12;0;1;FILLER (1);GROUP OCCURS 1;1;81;81\",\"13;1;5;Array1 (1 1);GROUP OCCURS 9;1;81;81\",\"14;2;10;Var1 (1 1);PIC X;1;1;1\",\"15;2;10;Array2 (1 1 1);GROUP OCCURS 8;2;9;8\",\"16;3;15;Var2 (1 1 1);PIC X;2;2;1\",\"17;0;1;FILLER;GROUP;1;4;4\",\"18;1;5;GRP-REDEFINED;GROUP;1;3;3\",\"19;2;10;VAR-1;PIC 9(05) COMP-3;1;3;3\",\"20;1;5;FILLER;REDEFINES GRP-REDEFINED;1;3;3\",\"21;2;10;VAR-RED1;PIC 9(05) COMP-3;1;3;3\",\"22;1;5;GROUP-WITH-88-1;GROUP;4;4;1\",\"23;2;10;GROUP-WITH-88-2;PIC 9(01);4;4;1\",\"28;0;1;Var1-in-ls;PIC XX;1;2;2\",\"29;0;1;num1;PIC 9(03);1;3;3\",\"30;0;1;num2;comp-1;1;4;4\",\"31;0;1;num3;comp-2;1;8;8\",\"32;0;1;num4;PIC 9(03) comp-3;1;2;2\",\"33;0;1;num5;PIC 9(03) comp-4;1;2;2\",\"34;0;1;num6;PIC 9(03) comp-5;1;2;2\",\"35;0;1;num7;PIC 9(03) packed-decimal;1;2;2\",\"36;0;1;num8;PIC 9(03) binary;1;2;2\",\"37;0;1;num9;PIC 9(03) comp;1;2;2\"],\"separator\":\";\"}}}"
30+
"message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"result\":{\"csvResult\":{\"root\":\"TCOZEFR0\",\"header\":\"LineNumber;NodeLevel;LevelNumber;VariableName;PictureTypeOrUsage;Start;End;Length\",\"rows\":[\"12;0;1;FILLER (1);GROUP OCCURS 1;1;81;81\",\"13;1;5;Array1 (1 1);GROUP OCCURS 9;1;81;81\",\"14;2;10;Var1 (1 1);PIC X;1;1;1\",\"15;2;10;Array2 (1 1 1);GROUP OCCURS 8;2;9;8\",\"16;3;15;Var2 (1 1 1);PIC X;2;2;1\",\"17;0;1;FILLER;GROUP;1;4;4\",\"18;1;5;GRP-REDEFINED;GROUP;1;3;3\",\"19;2;10;VAR-1;PIC 9(05) COMP-3;1;3;3\",\"20;1;5;FILLER;GROUP REDEFINES GRP-REDEFINED;1;3;3\",\"21;2;10;VAR-RED1;PIC 9(05) COMP-3;1;3;3\",\"22;1;5;GROUP-WITH-88-1;GROUP;4;4;1\",\"23;2;10;GROUP-WITH-88-2;PIC 9(01);4;4;1\",\"28;0;1;Var1-in-ls;PIC XX;1;2;2\",\"29;0;1;num1;PIC 9(03);1;3;3\",\"30;0;1;num2;comp-1;1;4;4\",\"31;0;1;num3;comp-2;1;8;8\",\"32;0;1;num4;PIC 9(03) comp-3;1;2;2\",\"33;0;1;num5;PIC 9(03) comp-4;1;2;2\",\"34;0;1;num6;PIC 9(03) comp-5;1;2;2\",\"35;0;1;num7;PIC 9(03) packed-decimal;1;2;2\",\"36;0;1;num8;PIC 9(03) binary;1;2;2\",\"37;0;1;num9;PIC 9(03) comp;1;2;2\"],\"separator\":\";\"}}}"
3131
},
3232
{
3333
"category": 0,

‎TypeCobol.LanguageServer.Test/LSRTests/GetDataLayoutRequest/output_expected/GetDataLayoutRequest.rlsp ‎TypeCobol.LanguageServer.Test/LSRTests/GetDataLayoutRequestCSV/output_expected/GetDataLayoutRequestCSV.rlsp

File renamed without changes.

‎TypeCobol.LanguageServer.Test/LSRTests/GetDataLayoutRequestTREE/input/GetDataLayoutRequestTREE.tlsp

+59
Large diffs are not rendered by default.

‎TypeCobol.LanguageServer.Test/LSRTests/GetDataLayoutRequestTREE/output_expected/GetDataLayoutRequestTREE.rlsp

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"success": true,
3+
"diff_index": [
4+
-1
5+
]
6+
}

‎TypeCobol.LanguageServer.Test/ProcessorTests/DataLayout/CSV-SimplePgm.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LineNumber;NodeLevel;LevelNumber;VariableName;PictureTypeOrUsage;Start;End;Lengt
1010
17;0;1;FILLER;GROUP;1;4;4
1111
18;1;5;GRP-REDEFINED;GROUP;1;3;3
1212
19;2;10;VAR-1;PIC 9(05) COMP-3;1;3;3
13-
20;1;5;FILLER;REDEFINES GRP-REDEFINED;1;3;3
13+
20;1;5;FILLER;GROUP REDEFINES GRP-REDEFINED;1;3;3
1414
21;2;10;VAR-RED1;PIC 9(05) COMP-3;1;3;3
1515
22;1;5;GROUP-WITH-88-1;GROUP;4;4;1
1616
23;2;10;GROUP-WITH-88-2;PIC 9(01);4;4;1

‎TypeCobol.LanguageServer.Test/ProcessorTests/DataLayout/INCLUDED.cpy

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
02 root-included.
2+
05 grp-included.
3+
10 var-included-1 PIC X.
4+
10 FILLER PIC X.
5+
10 var-included-occ PIC X OCCURS 3.
6+
05 grp-included-redef REDEFINES grp-included.
7+
10 var-included-2 PIC X(5).

‎TypeCobol.LanguageServer.Test/ProcessorTests/DataLayout/Tree-Copy.txt

+149
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
{"line":1,"character":12}
2+
---------------------------------------------------------------------------------
3+
{
4+
"dataValues": [
5+
0,
6+
0,
7+
0,
8+
"copy",
9+
null,
10+
0,
11+
0,
12+
0,
13+
null,
14+
-1,
15+
0
16+
],
17+
"children": [
18+
{
19+
"dataValues": [
20+
1,
21+
0,
22+
0,
23+
"working-storage",
24+
null,
25+
0,
26+
0,
27+
0,
28+
null,
29+
0,
30+
0
31+
],
32+
"children": [
33+
{
34+
"dataValues": [
35+
2,
36+
1,
37+
1,
38+
"TCOQLF",
39+
"GROUP",
40+
0,
41+
1,
42+
6,
43+
null,
44+
0,
45+
2
46+
],
47+
"children": [
48+
{
49+
"dataValues": [
50+
3,
51+
2,
52+
5,
53+
"TCOQLF-Var1",
54+
"PIC X",
55+
0,
56+
1,
57+
1,
58+
null,
59+
0,
60+
2
61+
],
62+
"children": []
63+
},
64+
{
65+
"dataValues": [
66+
3,
67+
3,
68+
5,
69+
"TCOQLF-Var2",
70+
"PIC X",
71+
0,
72+
2,
73+
1,
74+
null,
75+
1,
76+
2
77+
],
78+
"children": []
79+
},
80+
{
81+
"dataValues": [
82+
3,
83+
4,
84+
5,
85+
"TCOQLF-Var3",
86+
"PIC X",
87+
0,
88+
3,
89+
1,
90+
null,
91+
2,
92+
2
93+
],
94+
"children": []
95+
},
96+
{
97+
"dataValues": [
98+
3,
99+
5,
100+
5,
101+
"TCOQLF-Var4",
102+
"PIC X",
103+
0,
104+
4,
105+
1,
106+
null,
107+
3,
108+
2
109+
],
110+
"children": []
111+
},
112+
{
113+
"dataValues": [
114+
3,
115+
6,
116+
5,
117+
"TCOQLF-Var5",
118+
"PIC X",
119+
0,
120+
5,
121+
1,
122+
null,
123+
4,
124+
2
125+
],
126+
"children": []
127+
},
128+
{
129+
"dataValues": [
130+
3,
131+
7,
132+
5,
133+
"TCOQLF-Var6",
134+
"PIC X",
135+
0,
136+
6,
137+
1,
138+
null,
139+
5,
140+
2
141+
],
142+
"children": []
143+
}
144+
]
145+
}
146+
]
147+
}
148+
]
149+
}

‎TypeCobol.LanguageServer.Test/ProcessorTests/DataLayout/Tree-MainPgm.txt

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{"line":10,"character":12}
2+
---------------------------------------------------------------------------------
3+
{
4+
"dataValues": [
5+
0,
6+
0,
7+
0,
8+
"MAINPGM",
9+
null,
10+
0,
11+
0,
12+
0,
13+
null,
14+
-1,
15+
0
16+
],
17+
"children": [
18+
{
19+
"dataValues": [
20+
1,
21+
0,
22+
0,
23+
"working-storage",
24+
null,
25+
0,
26+
0,
27+
0,
28+
null,
29+
0,
30+
0
31+
],
32+
"children": [
33+
{
34+
"dataValues": [
35+
2,
36+
6,
37+
1,
38+
"main-group",
39+
"GROUP",
40+
0,
41+
1,
42+
1,
43+
null,
44+
0,
45+
2
46+
],
47+
"children": [
48+
{
49+
"dataValues": [
50+
3,
51+
7,
52+
5,
53+
"main-var",
54+
"PIC X",
55+
0,
56+
1,
57+
1,
58+
null,
59+
0,
60+
2
61+
],
62+
"children": []
63+
}
64+
]
65+
}
66+
]
67+
}
68+
]
69+
}

0 commit comments

Comments
 (0)