From f9f932eab0297bee322e61f4df4dc3a017afe9a7 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 18 Dec 2013 15:02:14 +0400 Subject: [PATCH] Translate JetImportFilteringRule to Kotlin --- .../findUsages/JetImportFilteringRule.java | 40 ------------------- .../findUsages/JetImportFilteringRule.kt | 36 +++++++++++++++++ 2 files changed, 36 insertions(+), 40 deletions(-) delete mode 100644 idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.java create mode 100644 idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.java b/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.java deleted file mode 100644 index d437d016757..00000000000 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2010-2013 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. - */ - -package org.jetbrains.jet.plugin.findUsages; - -import com.intellij.psi.PsiElement; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.usages.Usage; -import com.intellij.usages.rules.ImportFilteringRule; -import com.intellij.usages.rules.PsiElementUsage; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.psi.JetImportDirective; - -public class JetImportFilteringRule extends ImportFilteringRule { - @Override - public boolean isVisible(@NotNull Usage usage) { - if (usage instanceof PsiElementUsage) { - PsiElement psiElement = ((PsiElementUsage)usage).getElement(); - if (psiElement.getContainingFile() instanceof JetFile) { - return PsiTreeUtil.getParentOfType(psiElement, JetImportDirective.class) == null; - } - } - - return true; - } -} diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt new file mode 100644 index 00000000000..00829012a6b --- /dev/null +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt @@ -0,0 +1,36 @@ +/* + * Copyright 2010-2013 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. + */ + +package org.jetbrains.jet.plugin.findUsages + +import com.intellij.psi.PsiElement +import com.intellij.psi.util.PsiTreeUtil +import com.intellij.usages.Usage +import com.intellij.usages.rules.ImportFilteringRule +import com.intellij.usages.rules.PsiElementUsage +import org.jetbrains.jet.lang.psi.JetFile +import org.jetbrains.jet.lang.psi.JetImportDirective +import org.jetbrains.jet.lang.psi.psiUtil.getParentByType + +public class JetImportFilteringRule : ImportFilteringRule() { + public override fun isVisible(usage: Usage): Boolean { + if (usage is PsiElementUsage) { + return usage.getElement()?.getParentByType(javaClass()) == null + } + + return true + } +}