From d0e8e176c48abe3c5f565ad2ad84807ef862ea80 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 28 Dec 2017 13:27:57 +0100 Subject: [PATCH] Catch exceptions from decompiler service EA-108937 - RE: InvocationExprent.toJava --- .../idea/internal/KotlinDecompilerAdapter.kt | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerAdapter.kt b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerAdapter.kt index 136741fbdba..5fd1269bbdd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerAdapter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerAdapter.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2016 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.idea.internal @@ -28,7 +17,12 @@ import org.jetbrains.kotlin.psi.KtFile fun showDecompiledCode(sourceFile: KtFile) { val decompilerService = KotlinDecompilerService.getInstance() ?: return - val decompiledCode = decompilerService.decompile(sourceFile) + val decompiledCode = try { + decompilerService.decompile(sourceFile) + } catch (e: DecompileFailedException) { + null + } + if (decompiledCode == null) { Messages.showErrorDialog("Cannot decompile ${sourceFile.name}", "Decompiler error") return