Bug 578370 - [18][javadoc] provide support for property values to be
wrapped in single quotes for @highlight in snippets

Change-Id: I70cd2454e30913535b869d4fc699e0d6ff3f756c
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/jdt/eclipse.jdt.ui/+/190269
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java
index a571fdb..bfb8554 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocContentAccess2.java
@@ -1951,7 +1951,6 @@
 			String regExValue = getPropertyValue("regex", tagProperties); //$NON-NLS-1$
 			String subStringValue = getPropertyValue("substring", tagProperties); //$NON-NLS-1$
 			String substitution = getPropertyValue("replacement", tagProperties); //$NON-NLS-1$
-			substitution = stripQuotes(substitution);
 			Pattern regexPattern = null;
 			if (regExValue != null) {
 				regexPattern = Pattern.compile(regExValue);
@@ -2127,7 +2126,8 @@
 		String newStr = str;
 		if (str != null && str.length() >= 2) {
 			int length = str.length();
-			if (str.charAt(0) == '"' && str.charAt(length-1) == '"') {
+			if ((str.charAt(0) == '"' && str.charAt(length-1) == '"')
+					|| (str.charAt(0) == '\'' && str.charAt(length-1) == '\'')) {
 				newStr = str.substring(1, length-1);
 			}
 		}