Skip to content

Bugfix for #2453: NPE in BarContentAssistProcessor. #2484

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −6
Open

Bugfix for #2453: NPE in BarContentAssistProcessor. #2484

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
591b8d4
Bugfix for #2453: NPE in BarContentAssistProcessor.
nettozahler Nov 3, 2024
113a645
Version bump(s) for 4.34 stream
eclipse-platform-bot Nov 3, 2024
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
2 changes: 1 addition & 1 deletion tests/org.eclipse.ui.genericeditor.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.genericeditor.tests;singleton:=true
Bundle-Version: 1.3.500.qualifier
Bundle-Version: 1.3.600.qualifier
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.ui.genericeditor.tests,
Expand Down
13 changes: 8 additions & 5 deletions ...tests/src/org/eclipse/ui/genericeditor/tests/contributions/BarContentAssistProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,15 @@ public BarContentAssistProcessor(String completeString) {

@Override
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
for (int offsetInProposal = Math.min(this.completeString.length(), viewer.getDocument().getLength()); offsetInProposal > 0; offsetInProposal--) {
final IDocument doc= viewer.getDocument();
if (doc == null) {
return new ICompletionProposal[0];
}
for (int offsetInProposal = Math.min(this.completeString.length(), doc.getLength()); offsetInProposal > 0; offsetInProposal--) {
String maybeMatchingString = this.completeString.substring(0, offsetInProposal);
try {
int lastIndex = offset - offsetInProposal + this.completeString.length();
if (offset >= offsetInProposal && viewer.getDocument().get(offset - offsetInProposal, maybeMatchingString.length()).equals(maybeMatchingString)) {
if (offset >= offsetInProposal && doc.get(offset - offsetInProposal, maybeMatchingString.length()).equals(maybeMatchingString)) {
CompletionProposal proposal = new CompletionProposal(this.completeString.substring(offsetInProposal), offset, 0, lastIndex);
return new ICompletionProposal[] { proposal };
}
Expand Down Expand Up @@ -98,13 +102,13 @@ public IContextInformationValidator getContextInformationValidator() {
return new IContextInformationValidator() {
private ITextViewer viewer;
private int offset;

@Override
public void install(IContextInformation info, ITextViewer infoViewer, int documentOffset) {
this.viewer= infoViewer;
this.offset= documentOffset;
}

@Override
public boolean isContextInformationValid(int offsetToTest) {
try {
Expand All @@ -123,5 +127,4 @@ public boolean isContextInformationValid(int offsetToTest) {
public String getErrorMessage() {
return null;
}

}
Loading