From dd17451e3971bbfe59246c4283b1c0257092f4cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20D=C3=B6bber?= <doebber@in.tum.de> Date: Tue, 10 Jan 2012 13:13:19 +0000 Subject: [PATCH] fixed bug in field assist refs 86 --- .../fortiss/tooling/base/ui/fieldassist/FieldAssist.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssist.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssist.java index a4f403db1..818a0abb8 100644 --- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssist.java +++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/fieldassist/FieldAssist.java @@ -35,7 +35,7 @@ import org.eclipse.swt.widgets.Text; * @author doebber * @author $Author: hoelzl $ * @version $Rev: 18709 $ - * @ConQAT.Rating YELLOW Hash: 7CF69F2D99AF737A905EC1FA352EF278 + * @ConQAT.Rating YELLOW Hash: 10BFEAD4A602E137D545980D6A831649 */ public class FieldAssist { @@ -117,8 +117,7 @@ public class FieldAssist { @Override public IContentProposal[] getProposals(String contents, int position) { int tmp = findBeginningOfWord(contents, position); - String currentWord = contents.substring( - Math.min(position, tmp + 1), position); + String currentWord = contents.substring(tmp + 1, position); setProposals(concreteProvider.getProposals(currentWord)); return super.getProposals(currentWord, position); } @@ -127,7 +126,7 @@ public class FieldAssist { /** Finds the beginning of the word the cursor is placed in. */ private int findBeginningOfWord(String contents, int position) { int tmp = Math.max(0, position - 1); - while (tmp > 0 && !Character.isWhitespace(contents.charAt(tmp)) + while (tmp >= 0 && !Character.isWhitespace(contents.charAt(tmp)) && !isAdditionalWhitespace(contents.charAt(tmp))) { tmp--; } -- GitLab