Skip to content

Commit 5649b71

Browse files
author
automatic-merge
committed
Merge remote branch 'origin/master' into edge
2 parents dcfd1a3 + 60d5298 commit 5649b71

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

integration/vscode/ada/package.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,19 @@
858858
},
859859
{
860860
"command": "ada.subprogramBox",
861-
"when": "ADA_PROJECT_CONTEXT"
861+
"when": "editorLangId == ada"
862+
}
863+
],
864+
"editor/context": [
865+
{
866+
"command": "ada.otherFile",
867+
"group": "ada",
868+
"when": "editorLangId == ada"
869+
},
870+
{
871+
"command": "ada.subprogramBox",
872+
"group": "ada",
873+
"when": "editorLangId == ada"
862874
}
863875
],
864876
"editor/title/run": [

integration/vscode/ada/src/commands.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { AdaConfig, getOrAskForProgram, initializeConfig } from './debugConfigPr
1010
import { adaExtState, logger, mainOutputChannel } from './extension';
1111
import { findAdaMain, getProjectFileRelPath, getSymbols } from './helpers';
1212
import {
13+
DEFAULT_PROBLEM_MATCHER,
1314
SimpleTaskDef,
1415
TASK_PROVE_FILE_PLAIN_NAME,
1516
TASK_PROVE_LINE_PLAIN_NAME,
@@ -833,7 +834,14 @@ async function sparkProveSubprogram(
833834
task.name,
834835
task.source,
835836
undefined,
836-
task.problemMatchers,
837+
/**
838+
* In some cases the task returned by the API has an empty list of
839+
* problem matchers despite being configured with problem matchers in
840+
* tasks.json. In that case use the default problem matcher to avoid an
841+
* empty problem matcher list which would hide problems from the
842+
* Problems view.
843+
*/
844+
task.problemMatchers.length > 0 ? task.problemMatchers : [DEFAULT_PROBLEM_MATCHER],
837845
);
838846

839847
/**

0 commit comments

Comments
 (0)