Skip to content
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

Jump to bottom

avoid NPE for null analysis job when updating classpath #2269

Merged
merged 1 commit into from
Oct 11, 2022
Merged

avoid NPE for null analysis job when updating classpath #2269

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
56 changes: 30 additions & 26 deletions ...pse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/ClasspathUpdateHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,33 +56,37 @@ public void elementChanged(ElementChangedEvent event) {
PreferenceManager preferenceManager = JavaLanguageServerPlugin.getPreferencesManager();
if (preferenceManager.getPreferences().isAnnotationNullAnalysisEnabled()) {
IProject project = ProjectUtils.getProjectFromUri(uri);
IJavaProject javaProject = ProjectUtils.getJavaProject(project);
WorkspaceJob job = new WorkspaceJob("Classpath Update Job") {
@Override
public IStatus runInWorkspace(IProgressMonitor monitor) {
if (!preferenceManager.getPreferences().updateAnnotationNullAnalysisOptions(javaProject) || !preferenceManager.getPreferences().isAutobuildEnabled()) {
// When the project's compiler options didn't change or auto build is disabled, rebuilding is not required.
return Status.OK_STATUS;
}
BuildWorkspaceHandler buildWorkspaceHandler = new BuildWorkspaceHandler(JavaLanguageServerPlugin.getProjectsManager());
ProjectBuildParams params = new ProjectBuildParams(Arrays.asList(new TextDocumentIdentifier(uri)), true);
BuildWorkspaceStatus status = buildWorkspaceHandler.buildProjects(params, monitor);
switch (status) {
case FAILED:
case WITH_ERROR:
return Status.error("error occurs during building project");
case SUCCEED:
return Status.OK_STATUS;
case CANCELLED:
return Status.CANCEL_STATUS;
default:
return Status.OK_STATUS;
}
if (project != null) {
IJavaProject javaProject = ProjectUtils.getJavaProject(project);
if (javaProject != null) {
WorkspaceJob job = new WorkspaceJob("Classpath Update Job") {
@Override
public IStatus runInWorkspace(IProgressMonitor monitor) {
if (!preferenceManager.getPreferences().updateAnnotationNullAnalysisOptions(javaProject) || !preferenceManager.getPreferences().isAutobuildEnabled()) {
// When the project's compiler options didn't change or auto build is disabled, rebuilding is not required.
return Status.OK_STATUS;
}
BuildWorkspaceHandler buildWorkspaceHandler = new BuildWorkspaceHandler(JavaLanguageServerPlugin.getProjectsManager());
ProjectBuildParams params = new ProjectBuildParams(Arrays.asList(new TextDocumentIdentifier(uri)), true);
BuildWorkspaceStatus status = buildWorkspaceHandler.buildProjects(params, monitor);
switch (status) {
case FAILED:
case WITH_ERROR:
return Status.error("error occurs during building project");
case SUCCEED:
return Status.OK_STATUS;
case CANCELLED:
return Status.CANCEL_STATUS;
default:
return Status.OK_STATUS;
}
}
};
job.setPriority(Job.SHORT);
job.setRule(project);
job.schedule();
}
};
job.setPriority(Job.SHORT);
job.setRule(project);
job.schedule();
}
}
EventNotification notification = new EventNotification().withType(EventType.ClasspathUpdated).withData(uri);
this.connection.sendEventNotification(notification);
Expand Down