Skip to content

Commit fa8fd50

Browse files
AnthonyLeonardoGracioAnthonyLeonardoGracio
committed
Merge branch 'topic/problemMatchers' into 'master'
Make problemMatchers more simple See merge request eng/ide/ada_language_server!2153
2 parents 7408d2d + 5ded1d9 commit fa8fd50

File tree

3 files changed

+45
-6
lines changed

3 files changed

+45
-6
lines changed

‎integration/vscode/ada/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -772,11 +772,11 @@
772772
"severity": "error",
773773
"pattern": [
774774
{
775-
"regexp": "^([^:]+):(\\d+):(\\d+):\\s+(\\((error)\\)|(error):)\\s+(.*)$",
775+
"regexp": "^([^:]+):(\\d+):(\\d+):\\s+(?:\\(error\\)|error:)\\s*(.*)$",
776776
"file": 1,
777777
"line": 2,
778778
"column": 3,
779-
"message": 7
779+
"message": 4
780780
}
781781
]
782782
},
@@ -791,11 +791,11 @@
791791
"severity": "warning",
792792
"pattern": [
793793
{
794-
"regexp": "^([^:]+):(\\d+):(\\d+):\\s+(\\((warning|medium|medium warning|low|low warning|style)\\)|(warning|medium|medium warning|low|low warning|style):)\\s+(.*)$",
794+
"regexp": "^([^:]+):(\\d+):(\\d+):\\s+(?:\\((?:warning|medium|medium warning|low|low warning|style)\\)|(?:warning|medium|medium warning|low|low warning|style):)\\s+(.*)$",
795795
"file": 1,
796796
"line": 2,
797797
"column": 3,
798-
"message": 7
798+
"message": 4
799799
}
800800
]
801801
},
@@ -810,11 +810,11 @@
810810
"severity": "info",
811811
"pattern": [
812812
{
813-
"regexp": "^([^:]+):(\\d+):(\\d+):\\s+(\\((info|[Nn]ote|check)\\)|(info|[Nn]ote|check):)\\s+(.*)$",
813+
"regexp": "^([^:]+):(\\d+):(\\d+):\\s+(?:\\((?:info|[Nn]ote|check)\\)|(?:info|[Nn]ote|check):)\\s+(.*)$",
814814
"file": 1,
815815
"line": 2,
816816
"column": 3,
817-
"message": 7
817+
"message": 4
818818
}
819819
]
820820
}

‎integration/vscode/ada/test/general/tasks.test.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,20 @@ ada: Run main - src/test.adb - .${path.sep}obj${path.sep}test${exe}
388388
1: function "Get_Or_Create_Manager" is not referenced [-gnatwu]`.trim(),
389389
);
390390
});
391+
392+
test('problemMatchers severities (errors only)', async () => {
393+
await testProblemMatchersWithCompilerMessages(
394+
'compiler_messages_errors_only.txt',
395+
`
396+
0: "New_Var_Edit" is undefined (more references follow)
397+
0: no candidate interpretations match the actuals:
398+
0: unmatched actual "Title" in call
399+
0: "Update_Variable" is undefined (more references follow)
400+
0: no candidate interpretations match the actuals:
401+
0: found type "Kernel_Handle" defined at gps-kernel.ads:92
402+
0: expected type "Standard.Boolean"`.trim(),
403+
);
404+
});
391405
});
392406

393407
suite('Task Execution', function () {

‎integration/vscode/ada/test/general/ws/main_with_problem/compiler_messages_errors_only.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/home/unknown/src/scenario_views.adb:774:18: error: "New_Var_Edit" is undefined (more references follow)
2+
/home/unknown/src/scenario_views.adb:776:07: error: no candidate interpretations match the actuals:
3+
/home/unknown/src/scenario_views.adb:776:07: error: missing argument for parameter "Kernel" in call to "Gtk_New" declared at gps-kernel-mdi.ads:147
4+
/home/unknown/src/scenario_views.adb:776:07: error: missing argument for parameter "Group" in call to "Gtk_New" declared at gps-kernel-mdi.ads:116
5+
/home/unknown/src/scenario_views.adb:776:07: error: missing argument for parameter "Home_Dir" in call to "Gtk_New" declared at gps-kernel.ads:100
6+
/home/unknown/src/scenario_views.adb:776:07: error: missing argument for parameter "Flags" in call to "Gtk_New" declared at gtk-message_dialog.ads:124
7+
/home/unknown/src/scenario_views.adb:776:07: error: missing argument for parameter "Flags" in call to "Gtk_New" declared at gtk-dialog.ads:223
8+
/home/unknown/src/scenario_views.adb:776:07: error: too many arguments in call to "Gtk_New"
9+
/home/unknown/src/scenario_views.adb:776:07: error: missing argument for parameter "Spacing" in call to "Gtk_New" declared at gtk-box.ads:107
10+
/home/unknown/src/scenario_views.adb:777:16: error: unmatched actual "Title" in call
11+
/home/unknown/src/scenario_views.adb:781:22: error: "Update_Variable" is undefined (more references follow)
12+
/home/unknown/src/scenario_views.adb:854:10: error: no candidate interpretations match the actuals:
13+
/home/unknown/src/scenario_views.adb:854:10: error: missing argument for parameter "Log_Dir" in call to "Gtk_New" declared at gps-kernel.ads:100
14+
/home/unknown/src/scenario_views.adb:854:10: error: missing argument for parameter "Buttons" in call to "Gtk_New" declared at gtk-message_dialog.ads:124
15+
/home/unknown/src/scenario_views.adb:854:10: error: too many arguments in call to "Gtk_New"
16+
/home/unknown/src/scenario_views.adb:854:26: error: found type "Kernel_Handle" defined at gps-kernel.ads:92
17+
/home/unknown/src/scenario_views.adb:854:26: error: ==> in call to "Gtk_New" at gps-kernel-mdi.ads:147
18+
/home/unknown/src/scenario_views.adb:854:26: error: expected an access type with designated type "Gtk_Widget_Record'Class" defined at gtk-widget.ads:350
19+
/home/unknown/src/scenario_views.adb:854:26: error: found type "Kernel_Handle" defined at gps-kernel.ads:92
20+
/home/unknown/src/scenario_views.adb:854:26: error: ==> in call to "Gtk_New" at gtkada-mdi.ads:251
21+
/home/unknown/src/scenario_views.adb:854:26: error: expected type "UTF8_String" defined at glib.ads:79
22+
/home/unknown/src/scenario_views.adb:854:26: error: found type "Kernel_Handle" defined at gps-kernel.ads:92
23+
/home/unknown/src/scenario_views.adb:854:26: error: ==> in call to "Gtk_New" at gtk-dialog.ads:223
24+
/home/unknown/src/scenario_views.adb:857:21: error: expected type "Standard.Boolean"
25+
/home/unknown/src/scenario_views.adb:857:21: error: found type "Action_Filter" defined at gps-kernel.ads:458

0 commit comments

Comments
 (0)