From 6ef250049415fc09eac66630236c7f2c5cbdc5dc Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 26 Mar 2012 21:51:52 +0400 Subject: [PATCH] Extracted JetContentBasedFileSubstitutor.getDecompiledPsiFile() to separate extension point implementation, JetClsFileDecompiledPsiFileProvider. --- idea/src/META-INF/plugin.xml | 1 + .../JetClsFileDecompiledPsiFileProvider.java | 36 +++++++++++++++++++ .../JetContentBasedFileSubstitutor.java | 5 --- 3 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 idea/src/org/jetbrains/jet/plugin/libraries/JetClsFileDecompiledPsiFileProvider.java diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 7f98daea0f8..3bbd6dd0a8b 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -156,6 +156,7 @@ + diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetClsFileDecompiledPsiFileProvider.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetClsFileDecompiledPsiFileProvider.java new file mode 100644 index 00000000000..d5deae8690d --- /dev/null +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetClsFileDecompiledPsiFileProvider.java @@ -0,0 +1,36 @@ +/* + * Copyright 2010-2012 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.libraries; + +import com.intellij.psi.ClsFileDecompiledPsiFileProvider; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiJavaFile; +import com.intellij.psi.impl.compiled.ClsFileImpl; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Evgeny Gerashchenko + * @since 3/20/12 + */ +public class JetClsFileDecompiledPsiFileProvider implements ClsFileDecompiledPsiFileProvider { + @Nullable + @Override + public PsiFile getDecompiledPsiFile(@NotNull PsiJavaFile psiFile) { + return JetDecompiledData.getDecompiledData((ClsFileImpl) psiFile).getJetFile(); + } +} diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java b/idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java index b7652072076..dd6224fea61 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/JetContentBasedFileSubstitutor.java @@ -59,10 +59,5 @@ public class JetContentBasedFileSubstitutor implements ContentBasedClassFileProc public SyntaxHighlighter createHighlighter(Project project, VirtualFile vFile) { return new JetHighlighter(); } - - @Nullable - public PsiFile getDecompiledPsiFile(PsiFile psiFile) { - return JetDecompiledData.getDecompiledData((ClsFileImpl) psiFile).getJetFile(); - } }