Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions rosidl_gen/packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,21 @@ function getSubFolder(filePath, amentExecuted) {
filePath = filePath.replace(/\\/g, '/');
}

const subFolder = filePath.match(/\w+\/share\/\w+\/(\w+)\//)[1];
const ext = path.parse(filePath).ext.substr(1);

if (amentExecuted) {
return filePath.match(/\w+\/share\/\w+\/(\w+)\//)[1];
// If the .msg file is in a subdirectory of msg/,
// the |subFolder| will neither msg/srv/action
// so the file extension should be used instead.
if (!['msg', 'srv', 'action'].includes(subFolder)) {
return ext;
}
return subFolder;
}
// If the |amentExecuted| equals to false, the file's extension will be assigned as
// the name of sub folder.
return path.parse(filePath).ext.substr(1);
return ext;
}

function grabInterfaceInfo(filePath, amentExecuted) {
Expand Down