Skip to content

Enhance stack trace information for rule conflicts in BuildManager #2279

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Enhance stack trace information for rule conflicts in BuildManager #2279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 46 additions & 2 deletions ...bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/events/BuildManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,29 @@ private void basicBuild(int trigger, IncrementalProjectBuilder builder, Map<Stri
depth = getWorkManager().beginUnprotected();
// Acquire the rule required for running this builder
if (rule != null) {
Job.getJobManager().beginRule(rule, monitor);
try {
Job.getJobManager().beginRule(rule, monitor);
} catch (IllegalArgumentException e) {
// Enhance the error message with builder and project context
String builderLabel = currentBuilder.getLabel();
String builderClass = currentBuilder.getClass().getName();
String projectName = builder.getProject().getFullPath().toString();
String pluginId = currentBuilder.getPluginId();

String enhancedMessage = String.format(
"Rule conflict in builder '%s' (class: %s, plugin: %s) for project '%s'. " + //$NON-NLS-1$
"The builder requested rule '%s' which conflicts with the outer scope rule. " + //$NON-NLS-1$
"Original error: %s", //$NON-NLS-1$
builderLabel != null ? builderLabel : "<unknown>", //$NON-NLS-1$
builderClass,
pluginId != null ? pluginId : "<unknown>", //$NON-NLS-1$
projectName,
rule,
e.getMessage()
);

throw new IllegalArgumentException(enhancedMessage, e);
}
// Now that we've acquired the rule, changes may have been made concurrently, ensure we're pointing at the
// correct currentTree so delta contains concurrent changes made in areas guarded by the scheduling rule
if (currentTree != null) {
Expand All @@ -303,7 +325,29 @@ private void basicBuild(int trigger, IncrementalProjectBuilder builder, Map<Stri
getWorkManager().endUnprotected(depth);
}
if (rule != null) {
Job.getJobManager().endRule(rule);
try {
Job.getJobManager().endRule(rule);
} catch (IllegalArgumentException e) {
// Enhance the error message with builder and project context
String builderLabel = currentBuilder.getLabel();
String builderClass = currentBuilder.getClass().getName();
String projectName = builder.getProject().getFullPath().toString();
String pluginId = currentBuilder.getPluginId();

String enhancedMessage = String.format(
"Rule conflict when ending rule for builder '%s' (class: %s, plugin: %s) for project '%s'. " + //$NON-NLS-1$
"The builder tried to end rule '%s' which does not match the current scope. " + //$NON-NLS-1$
"Original error: %s", //$NON-NLS-1$
builderLabel != null ? builderLabel : "<unknown>", //$NON-NLS-1$
builderClass,
pluginId != null ? pluginId : "<unknown>", //$NON-NLS-1$
projectName,
rule,
e.getMessage()
);

throw new IllegalArgumentException(enhancedMessage, e);
}
}
// Be sure to clean up after ourselves.
if (clean || currentBuilder.wasForgetStateRequested()) {
Expand Down
Loading