From f1a2866f0c5af0f69338ddd3f379ed79ed7249da Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 10 Feb 2012 14:10:52 +0400 Subject: [PATCH] KT-1223 Code completion for imported from jars extension functions - don't mute ProcessCanceledException in hack --- .../org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java index 51c8b73a988..620575c5ce7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java @@ -2,6 +2,7 @@ package org.jetbrains.jet.lang.resolve.java; import com.google.common.collect.Sets; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiModifier; @@ -112,6 +113,8 @@ public class JavaPackageScope extends JavaClassOrPackageScope { for (String methodName : methodNames) { try { allDescriptors.addAll(getFunctions(methodName)); + } catch (ProcessCanceledException cancelException) { + throw cancelException; } catch (RuntimeException ex) { LOG.error(ex); }