diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java')
-rw-r--r-- | platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java index 284a8ecb85bf..3a1f04b80414 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java @@ -623,10 +623,6 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable, } public boolean performGuardedChange(Runnable change) { - return performGuardedChange(change, null); - } - - public boolean performGuardedChange(Runnable change, @Nullable final String debug) { checkValid(); assert !myChangeGuard : "already in change"; @@ -634,7 +630,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable, myChangeGuard = true; boolean result; try { - result = myOffsets.performGuardedChange(change, debug); + result = myOffsets.performGuardedChange(change); } finally { myEditor.getDocument().stopGuardedBlockChecking(); |