Skip to content

Clean up in DevTools remove unused lists. #3104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apple502j merged 2 commits into from
Jul 29, 2021
Merged

Clean up in DevTools remove unused lists. #3104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
640ad55
Remove unused local lists in DevTools clean up
Tacodiva Jul 26, 2021
347098b
Run Prettier
WorldLanguages Jul 28, 2021
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
1 change: 1 addition & 0 deletions addons-l10n/en/editor-devtools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"editor-devtools/youtube": "YouTube tutorials",
"editor-devtools/orphaned": "{count, plural, one {Developer tools: Delete 1 orphaned reporter block?} other {Developer tools: Delete # orphaned reporter blocks?} }",
"editor-devtools/unused-var": "{count, plural, one {Developer tools: Delete 1 unused local variable? Here it is:\n} other {Developer tools: Delete # unused local variables? Here they are:\n} }",
"editor-devtools/unused-list": "{count, plural, one {Developer tools: Delete 1 unused local list? Here it is:\n} other {Developer tools: Delete # unused local lists? Here they are:\n} }",
"editor-devtools/var-not-exist": "That variable does not exist...",
"editor-devtools/find": "Find",
"editor-devtools/find-placeholder": "Find (Ctrl+F)",
Expand Down
32 changes: 31 additions & 1 deletion addons/editor-devtools/DevTools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,6 @@ export default class DevTools {
let workspace = this.utils.getWorkspace();
let map = workspace.getVariableMap();
let vars = map.getVariablesOfType("");

let unusedLocals = [];

for (const row of vars) {
Expand Down Expand Up @@ -473,6 +472,37 @@ export default class DevTools {
}
}

// Locate unused local lists...
let lists = map.getVariablesOfType("list");
let unusedLists = [];

for (const row of lists) {
if (row.isLocal) {
let usages = map.getVariableUsesById(row.getId());
if (!usages || usages.length === 0) {
unusedLists.push(row);
}
}
}
if (unusedLists.length > 0 && !dataId) {
const unusedCount = unusedLists.length;
let message = this.msg("unused-list", {
count: unusedCount,
});
for (let i = 0; i < unusedLists.length; i++) {
let orphan = unusedLists[i];
if (i > 0) {
message += ", ";
}
message += orphan.name;
}
if (confirm(message)) {
for (const orphan of unusedLists) {
workspace.deleteVariableById(orphan.getId());
}
}
}

UndoGroup.endUndoGroup(workspace);
}, 100);
}
Expand Down