Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalyan Prasad Tatavarthi2018-07-30 05:45:56 -0400
committerKalyan Prasad Tatavarthi2018-07-30 05:48:18 -0400
commitc8c61ceaae40fb7480be6c7f29082aea579b47b5 (patch)
tree8c613595c7605f0ae1c081e7b0f23aa75141f09b /org.eclipse.text
parente18255b8f790682a2a9e9778cfcbf52de4f9c859 (diff)
downloadeclipse.platform.text-c8c61ceaae40fb7480be6c7f29082aea579b47b5.tar.gz
eclipse.platform.text-c8c61ceaae40fb7480be6c7f29082aea579b47b5.tar.xz
eclipse.platform.text-c8c61ceaae40fb7480be6c7f29082aea579b47b5.zip
Bug 109481 - [find/replace] replace doesn't work when using a regex withI20180730-2240I20180730-2000I20180730-0800
a lookahead or boundary matchers :- Reverting Changes as a result of Bug 537377 Change-Id: I975d326e67f650bc2dddac6948775b3bb3fbdf5a Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
Diffstat (limited to 'org.eclipse.text')
-rw-r--r--org.eclipse.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapter.java10
1 files changed, 3 insertions, 7 deletions
diff --git a/org.eclipse.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapter.java b/org.eclipse.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapter.java
index 7fc5049fe..d80a2f9cc 100644
--- a/org.eclipse.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapter.java
+++ b/org.eclipse.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,7 +9,6 @@
* IBM Corporation - initial API and implementation
* Cagatay Calli <ccalli@gmail.com> - [find/replace] retain caps when replacing - https://bugs.eclipse.org/bugs/show_bug.cgi?id=28949
* Cagatay Calli <ccalli@gmail.com> - [find/replace] define & fix behavior of retain caps with other escapes and text before \C - https://bugs.eclipse.org/bugs/show_bug.cgi?id=217061
- * Florian Ingerl <imelflorianingerl@gmail.com> - [find/replace] replace doesn't work when using a regex with a lookahead or boundary matchers - https://bugs.eclipse.org/bugs/show_bug.cgi?id=109481
*******************************************************************************/
package org.eclipse.jface.text;
@@ -195,11 +194,8 @@ public class FindReplaceDocumentAdapter implements CharSequence {
String prevMatch= fFindReplaceMatcher.group();
try {
replaceText= interpretReplaceEscapes(replaceText, prevMatch);
- Matcher replaceTextMatcher= pattern.matcher(this);
- replaceTextMatcher.find(fFindReplaceMatcher.start());
- StringBuffer sb= new StringBuffer();
- replaceTextMatcher.appendReplacement(sb, replaceText);
- replaceText= sb.substring(fFindReplaceMatcher.start());
+ Matcher replaceTextMatcher= pattern.matcher(prevMatch);
+ replaceText= replaceTextMatcher.replaceFirst(replaceText);
} catch (IndexOutOfBoundsException ex) {
throw new PatternSyntaxException(ex.getLocalizedMessage(), replaceText, -1);
}

Back to the top