From e714e07bc60ebfc80ed3423411244931f3cecab4 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 7 Nov 2017 15:54:48 +0700 Subject: [PATCH] IntroduceVariableBase: StringUtil.stripQuotesAroundValue restored (was actually necessary here) --- .../introduceVariable/IntroduceVariableBase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java index b6fc14a9a83c..22ef070ad2bd 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java @@ -1116,11 +1116,13 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase { LOG.assertTrue(parentRange.getStartOffset() <= rangeMarker.getStartOffset(), parent + "; prefix:" + prefix + "; suffix:" + suffix); String beg = allText.substring(parentRange.getStartOffset(), rangeMarker.getStartOffset()); - if (StringUtil.unquoteString(beg).trim().length() == 0 && prefix == null) beg = ""; + //noinspection SSBasedInspection (suggested replacement breaks behavior) + if (StringUtil.stripQuotesAroundValue(beg).trim().length() == 0 && prefix == null) beg = ""; LOG.assertTrue(rangeMarker.getEndOffset() <= parentRange.getEndOffset(), parent + "; prefix:" + prefix + "; suffix:" + suffix); String end = allText.substring(rangeMarker.getEndOffset(), parentRange.getEndOffset()); - if (StringUtil.unquoteString(end).trim().length() == 0 && suffix == null) end = ""; + //noinspection SSBasedInspection (suggested replacement breaks behavior) + if (StringUtil.stripQuotesAroundValue(end).trim().length() == 0 && suffix == null) end = ""; final String start = beg + (prefix != null ? prefix : ""); refIdx[0] = start.length();