Skip to content

Commit

Permalink
Merge pull request #1715 from codefori/fix/evfevent_reader
Browse files Browse the repository at this point in the history
Fix/evfevent_reader
  • Loading branch information
worksofliam authored Dec 13, 2023
2 parents 92c91f7 + c50fb28 commit 50389b8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion schemas/actions.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"$id": "#/actions/items/anyOf/0/properties/postDownload",
"type": "array",
"title": "Post Download",
"description": "Remote files/folders to download when the Action is complete.",
"description": "Remote files/folders to download when the Action is complete. Using `.evfevent` in combination with a build tool will populate the Problems view.",
"default": [""],
"items": {
"type": "string",
Expand Down
4 changes: 3 additions & 1 deletion src/api/CompileTools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,9 @@ export namespace CompileTools {
env: Object.fromEntries(variables),
}, writeEmitter);

const useLocalEvfevent = fromWorkspace && chosenAction.postDownload && chosenAction.postDownload.includes(`.evfevent`);
const useLocalEvfevent =
fromWorkspace && chosenAction.postDownload &&
(chosenAction.postDownload.includes(`.evfevent`) || chosenAction.postDownload.includes(`.evfevent/`));

if (commandResult) {
hasRun = true;
Expand Down
2 changes: 1 addition & 1 deletion src/api/local/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export async function getLocalActions(currentWorkspace: WorkspaceFolder) {
export async function getEvfeventFiles(currentWorkspace: WorkspaceFolder) {
if (currentWorkspace) {
const relativeSearch = new RelativePattern(currentWorkspace, `**/.evfevent/*`);
const iprojectFiles = await workspace.findFiles(relativeSearch, null, 1);
const iprojectFiles = await workspace.findFiles(relativeSearch, null);

return iprojectFiles;
}
Expand Down

0 comments on commit 50389b8

Please sign in to comment.