diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
| commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
| download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java')
| -rw-r--r-- | platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java index 6fa0ed27d8c8..0f9011308533 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -245,7 +245,12 @@ public class VariableInplaceRenamer extends InplaceRefactoring { final Runnable runnable = new Runnable() { @Override public void run() { - renamer.findUsages(usages, false, false); + ApplicationManager.getApplication().runReadAction(new Runnable() { + @Override + public void run() { + renamer.findUsages(usages, false, false); + } + }); } }; |