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

#19486 NPE fix #19764

Merged
merged 1 commit into from
Apr 22, 2023
Merged

#19486 NPE fix #19764

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
6 changes: 4 additions & 2 deletions .../org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,14 @@ public SQLRuleScanner getRuleScanner() {

@Nullable
public IAnnotationModel getAnnotationModel() {
return getSourceViewer().getAnnotationModel();
final ISourceViewer viewer = getSourceViewer();
return viewer != null ? viewer.getAnnotationModel() : null;
}

@Nullable
public ProjectionAnnotationModel getProjectionAnnotationModel() {
return ((ProjectionViewer) getSourceViewer()).getProjectionAnnotationModel();
final ProjectionViewer viewer = (ProjectionViewer) getSourceViewer();
return viewer != null ? viewer.getProjectionAnnotationModel() : null;
}

public SQLEditorSourceViewerConfiguration getViewerConfiguration() {
Expand Down