From 864b305ff4bec7b8389e25b27dc7f1e9b1be9320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Svensson?= Date: Mon, 9 Apr 2018 14:21:29 +0200 Subject: [PATCH] Bug 533379 - Only add space when appropriate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only strings starting with "operator" should be subject to the space addition. Change-Id: I690695e7c3385e0d4e64ddd4cbe470a20cf788d6 Signed-off-by: Torbjörn Svensson --- .../org/eclipse/cdt/internal/ui/search/CSearchUtil.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java index 43e5bd89717..218d8a651c2 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchUtil.java @@ -7,6 +7,7 @@ * * Contributors: * Andrew Niefer (Rational Software) - initial implementation + * Torbjörn Svensson (STMicroelectronics) - bug #533379 *******************************************************************************/ package org.eclipse.cdt.internal.ui.search; @@ -92,9 +93,11 @@ public class CSearchUtil { */ public static String adjustSearchStringForOperators(String searchStr) { int operatorIndex = searchStr.indexOf("operator"); //$NON-NLS-1$ - int operatorCharIndex = operatorIndex + 8; // "operator" is 8 characters - if (operatorCharIndex < searchStr.length() && isOperatorChar(searchStr.charAt(operatorCharIndex))) { - searchStr = searchStr.substring(0, operatorCharIndex) + ' ' + searchStr.substring(operatorCharIndex); + if (operatorIndex >= 0) { // Only do this if string actually contains "operator" + int operatorCharIndex = operatorIndex + 8; // "operator" is 8 characters + if (operatorCharIndex < searchStr.length() && isOperatorChar(searchStr.charAt(operatorCharIndex))) { + searchStr = searchStr.substring(0, operatorCharIndex) + ' ' + searchStr.substring(operatorCharIndex); + } } return searchStr; }