azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decompiler: switch to using non-project based decompiled text builder

Browse Source 
Move ProjectBasedResolverForDecompiler to test root (since only used for validating)
This commit is contained in:
Pavel V. Talanov
2014-02-26 17:08:39 +04:00
parent 32ecdfede0
commit 5bd9955785
3 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.kt
+1 -1
View File
@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObject
import org.jetbrains.jet.plugin.libraries.JetDecompiledData.descriptorToKey
public fun buildDecompiledData(classFile: VirtualFile, project: Project): JetDecompiledData {
return buildDecompiledData(classFile, project, ProjectBasedResolverForDecompiler(project))
return buildDecompiledData(classFile, project, DeserializerForDecompiler(classFile))
}
public fun buildDecompiledData(classFile: VirtualFile, project: Project, resolver: ResolverForDecompiler): JetDecompiledData {
idea/src/org/jetbrains/jet/plugin/libraries/ProjectBasedResolverForDecompiler.kt
-41
View File
@@ -1,41 +0,0 @@
/*
* Copyright 2010-2014 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 org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
import org.jetbrains.jet.di.InjectorForJavaDescriptorResolverUtil
import com.intellij.openapi.project.Project
import org.jetbrains.jet.lang.resolve.BindingTraceContext
import java.util.Collections
public class ProjectBasedResolverForDecompiler(project: Project) : ResolverForDecompiler {
val javaDescriptorResolver = InjectorForJavaDescriptorResolverUtil.create(project, BindingTraceContext()).getJavaDescriptorResolver()!!
override fun resolveClass(classFqName: FqName): ClassDescriptor? {
return javaDescriptorResolver.resolveClass(classFqName)
}
override fun resolveDeclarationsInPackage(packageFqName: FqName): Collection<DeclarationDescriptor> {
val packageFragment = javaDescriptorResolver.getPackageFragment(packageFqName)
if (packageFragment == null) {
return Collections.emptyList()
}
return packageFragment.getMemberScope().getAllDescriptors() filter { it !is ClassDescriptor }
}
}
idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextConsistencyTest.kt
+22
View File
@@ -27,6 +27,12 @@ import org.jetbrains.jet.plugin.JetLightProjectDescriptor
import com.intellij.openapi.projectRoots.Sdk
import org.jetbrains.jet.plugin.PluginTestCaseBase
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
import com.intellij.openapi.project.Project
import org.jetbrains.jet.di.InjectorForJavaDescriptorResolverUtil
import org.jetbrains.jet.lang.resolve.BindingTraceContext
import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
import java.util.Collections
public class DecompiledTextConsistencyTest : JetLightCodeInsightFixtureTestCase() {
@@ -50,3 +56,19 @@ public class DecompiledTextConsistencyTest : JetLightCodeInsightFixtureTestCase(
override fun getSdk() = PluginTestCaseBase.fullJdk()
}
}
class ProjectBasedResolverForDecompiler(project: Project) : ResolverForDecompiler {
val javaDescriptorResolver = InjectorForJavaDescriptorResolverUtil.create(project, BindingTraceContext()).getJavaDescriptorResolver()!!
override fun resolveClass(classFqName: FqName): ClassDescriptor? {
return javaDescriptorResolver.resolveClass(classFqName)
}
override fun resolveDeclarationsInPackage(packageFqName: FqName): Collection<DeclarationDescriptor> {
val packageFragment = javaDescriptorResolver.getPackageFragment(packageFqName)
if (packageFragment == null) {
return Collections.emptyList()
}
return packageFragment.getMemberScope().getAllDescriptors() filter { it !is ClassDescriptor }
}
}