From 557e06b9686aabd566f18d753e8bb1077650e2e5 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Mon, 12 Mar 2018 20:02:57 +0300 Subject: [PATCH] fix typo --- .../com/intellij/psi/impl/JavaSimplePropertyIndex.kt | 12 +++--------- .../execution/actions/RunConfigurationProducer.java | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/JavaSimplePropertyIndex.kt b/java/java-indexing-impl/src/com/intellij/psi/impl/JavaSimplePropertyIndex.kt index cd762cf3b17f..7d5ffe41522f 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/JavaSimplePropertyIndex.kt +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/JavaSimplePropertyIndex.kt @@ -171,22 +171,16 @@ class JavaSimplePropertyIndex : FileBasedIndexExtension .singleOrNull { ElementType.JAVA_STATEMENT_BIT_SET.contains(it.tokenType) } ?.takeIf { it.tokenType == JavaElementType.RETURN_STATEMENT} ?.let { LightTreeUtil.firstChildOfType(tree, it, ElementType.EXPRESSION_BIT_SET) } - ?.takeIf(this::doNotContainMethodCalls) + ?.takeIf(this::doesNotContainMethodCalls) ?.let { LightTreeUtil.toFilteredString(tree, it, null) } - private fun doNotContainMethodCalls(expression: LighterASTNode): Boolean { + private fun doesNotContainMethodCalls(expression: LighterASTNode): Boolean { if (expression.tokenType == JavaElementType.METHOD_CALL_EXPRESSION) { return false } val qualifier = JavaLightTreeUtil.findExpressionChild(tree, expression) - return qualifier == null || doNotContainMethodCalls(qualifier) + return qualifier == null || doesNotContainMethodCalls(qualifier) } - - private fun isEmptyExpressionList(expressionList: LighterASTNode): Boolean { - val children = tree.getChildren(expressionList) - return children.size == 2 && children[0].tokenType == JavaTokenType.LPARENTH && children[1].tokenType == JavaTokenType.RPARENTH - } - }.visitNode(tree.root) result } diff --git a/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java index bea5f3d7d135..6969af377e45 100644 --- a/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java +++ b/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java @@ -79,7 +79,7 @@ public abstract class RunConfigurationProducer { return null; } } - catch (ClassCastException e) { + catch (Exception e) { LOG.error(myConfigurationFactory + " produced wrong type", e); return null; }