From 66e2ae5119b95d4099bb4545bfde52602985f00a Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Tue, 9 Dec 2008 09:32:04 +0000 Subject: [PATCH] Bug 257913 - Content Assist misses proposals, patch by Jens Elementhaler --- .../internal/ui/text/contentassist/CCompletionProposal.java | 2 +- .../ui/text/contentassist/CContentAssistProcessor.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java index d32de99487e..87d16a865f4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java @@ -516,7 +516,7 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro return false; final int wordLength= word.length(); - if (offset >= fReplacementOffset + wordLength) + if (offset > fReplacementOffset + wordLength) return false; try { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java index 1cc1f0a3c11..0d18ed02aca 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java @@ -153,8 +153,7 @@ public class CContentAssistProcessor extends ContentAssistProcessor { // wrap proposals which are no ICCompletionProposals boolean wrapped= false; int i=0; - for (Object element : proposals) { - ICompletionProposal proposal= (ICompletionProposal) element; + for (ICompletionProposal proposal : proposals) { if (proposal instanceof ICCompletionProposal) { proposalsInput[i++]= (ICCompletionProposal)proposal; } else {