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

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f

1 files changed, 1 insertions, 5 deletions

diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
index 7e8ec09f3e23..a34d30dc5401 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
@@ -320,11 +320,7 @@ public class RenameProcessor extends BaseRefactoringProcessor {
   protected boolean isPreviewUsages(UsageInfo[] usages) {
     if (myForceShowPreview) return true;
     if (super.isPreviewUsages(usages)) return true;
-    if (UsageViewUtil.hasNonCodeUsages(usages)) {
-      WindowManager.getInstance().getStatusBar(myProject)
-        .setInfo(RefactoringBundle.message("occurrences.found.in.comments.strings.and.non.java.files"));
-      return true;
-    }
+    if (UsageViewUtil.reportNonRegularUsages(usages, myProject)) return true;
     return false;
   }