Renamed ReferenceSearcherImpl to IdeaReferenceSearcher
This commit is contained in:
committed by
valentin
parent
9e11b40fe1
commit
f5e9230a04
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.j2k.Converter;
|
||||
import org.jetbrains.jet.j2k.ConverterSettings;
|
||||
import org.jetbrains.jet.j2k.FilesConversionScope;
|
||||
import org.jetbrains.jet.j2k.ReferenceSearcherImpl;
|
||||
import org.jetbrains.jet.j2k.IdeaReferenceSearcher;
|
||||
import org.jetbrains.jet.plugin.j2k.J2kPostProcessor;
|
||||
|
||||
import java.util.List;
|
||||
@@ -50,7 +50,7 @@ public class JavaToKotlinAction extends AnAction {
|
||||
final Converter converter = Converter.OBJECT$.create(project,
|
||||
ConverterSettings.defaultSettings,
|
||||
new FilesConversionScope(selectedJavaFiles),
|
||||
ReferenceSearcherImpl.INSTANCE$,
|
||||
IdeaReferenceSearcher.INSTANCE$,
|
||||
//TODO: (module refactoring) resulting files should be analyzed in context of respective java files
|
||||
new J2kPostProcessor(selectedJavaFiles.iterator().next()));
|
||||
CommandProcessor.getInstance().executeCommand(
|
||||
|
||||
+1
-1
@@ -89,7 +89,7 @@ public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBl
|
||||
val converter = Converter.create(fileCopiedFrom.getProject(),
|
||||
ConverterSettings.defaultSettings,
|
||||
FilesConversionScope(listOf(fileCopiedFrom)),
|
||||
ReferenceSearcherImpl,
|
||||
IdeaReferenceSearcher,
|
||||
J2kPostProcessor(fileCopiedTo))
|
||||
val startOffsets = code.startOffsets
|
||||
val endOffsets = code.endOffsets
|
||||
|
||||
@@ -35,7 +35,7 @@ public object EmptyReferenceSearcher: ReferenceSearcher {
|
||||
override fun findMethodCalls(method: PsiMethod, scope: PsiElement) = Collections.emptyList<PsiMethodCallExpression>()
|
||||
}
|
||||
|
||||
public object ReferenceSearcherImpl: ReferenceSearcher {
|
||||
public object IdeaReferenceSearcher : ReferenceSearcher {
|
||||
override fun findVariableUsages(variable: PsiVariable, scope: PsiElement): Collection<PsiReferenceExpression> {
|
||||
return ReferencesSearch.search(variable, LocalSearchScope(scope)).findAll().filterIsInstance(javaClass<PsiReferenceExpression>())
|
||||
}
|
||||
|
||||
@@ -34,12 +34,12 @@ import org.jetbrains.jet.plugin.j2k.J2kPostProcessor
|
||||
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
|
||||
import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor
|
||||
import com.intellij.psi.PsiJavaFile
|
||||
import org.jetbrains.jet.j2k.ReferenceSearcherImpl
|
||||
import org.jetbrains.jet.j2k.IdeaReferenceSearcher
|
||||
import junit.framework.TestCase
|
||||
import com.intellij.openapi.util.Disposer
|
||||
import org.jetbrains.jet.j2k.translateToKotlin
|
||||
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
|
||||
import org.jetbrains.jet.JetTestCaseBuilder
|
||||
import com.intellij.openapi.util.Disposer
|
||||
|
||||
public abstract class AbstractJavaToKotlinConverterTest() : LightCodeInsightFixtureTestCase() {
|
||||
val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n")
|
||||
@@ -136,14 +136,14 @@ public abstract class AbstractJavaToKotlinConverterTest() : LightCodeInsightFixt
|
||||
|
||||
private fun elementToKotlin(text: String, settings: ConverterSettings, project: Project): String {
|
||||
val fileWithText = createJavaFile(text)
|
||||
val converter = Converter.create(project, settings, FilesConversionScope(listOf(fileWithText)), ReferenceSearcherImpl, J2kPostProcessor(fileWithText))
|
||||
val converter = Converter.create(project, settings, FilesConversionScope(listOf(fileWithText)), IdeaReferenceSearcher, J2kPostProcessor(fileWithText))
|
||||
val element = fileWithText.getFirstChild()!!
|
||||
return converter.elementToKotlin(element)
|
||||
}
|
||||
|
||||
private fun fileToKotlin(text: String, settings: ConverterSettings, project: Project): String {
|
||||
val file = createJavaFile(text)
|
||||
val converter = Converter.create(project, settings, FilesConversionScope(listOf(file)), ReferenceSearcherImpl, J2kPostProcessor(file))
|
||||
val converter = Converter.create(project, settings, FilesConversionScope(listOf(file)), IdeaReferenceSearcher, J2kPostProcessor(file))
|
||||
return converter.elementToKotlin(file)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user