Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12

1 files changed, 8 insertions, 1 deletions

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
index 0c838cd05ec5..2e620c2379c9 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
@@ -723,7 +723,10 @@ public class TemplateState implements Disposable {
 
     ExpressionContext context = createExpressionContext(start);
     Result result = isQuick ? expressionNode.calculateQuickResult(context) : expressionNode.calculateResult(context);
-    if ((result == null || result.equalsToText("", element)) && defaultValue != null) {
+    if (isQuick && isEmptyResult(result, element) && !oldValue.isEmpty()) {
+      return;
+    }
+    if (isEmptyResult(result, element) && defaultValue != null) {
       result = defaultValue.calculateResult(context);
     }
     if (element != null) {
@@ -743,6 +746,10 @@ public class TemplateState implements Disposable {
     }
   }
 
+  private static boolean isEmptyResult(Result result, PsiElement context) {
+    return result == null || result.equalsToText("", context);
+  }
+
   private void replaceString(String newValue, int start, int end, int segmentNumber) {
     String oldText = myDocument.getCharsSequence().subSequence(start, end).toString();