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

more renames to get rid of "Jet" in class and method names

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-09 19:06:50 +01:00
parent a3241637ce
commit e64a270d1a
152 changed files with 465 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt
+2 -2
View File
@@ -35,8 +35,8 @@ public abstract class AbstractPseudoValueTest : AbstractPseudocodeTest() {
fun getElementToValueMap(pseudocode: PseudocodeImpl): Map<KtElement, PseudoValue> {
val elementToValues = LinkedHashMap<KtElement, PseudoValue>()
pseudocode.getCorrespondingElement().accept(object : KtTreeVisitorVoid() {
override fun visitJetElement(element: KtElement) {
super.visitJetElement(element)
override fun visitKtElement(element: KtElement) {
super.visitKtElement(element)
val value = pseudocode.getElementValue(element)
if (value != null) {
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
+4 -4
View File
@@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.checkers.CheckerTestUtil;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.parsing.JetScriptDefinition;
import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
import org.jetbrains.kotlin.parsing.KotlinScriptDefinition;
import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter;
import org.jetbrains.kotlin.resolve.AnalyzingUtils;
@@ -156,8 +156,8 @@ public class CodegenTestFiles {
scriptParameterValues.add(value);
}
JetScriptDefinitionProvider.getInstance(project).addScriptDefinition(
new JetScriptDefinition(
KotlinScriptDefinitionProvider.getInstance(project).addScriptDefinition(
new KotlinScriptDefinition(
".kts",
scriptParameterTypes
)
compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java
+6 -7
View File
@@ -16,10 +16,9 @@
package org.jetbrains.kotlin.codegen;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.parsing.JetScriptDefinition;
import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
import org.jetbrains.kotlin.parsing.KotlinScriptDefinition;
import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider;
import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.test.ConfigurationKind;
@@ -30,15 +29,15 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
public class ScriptGenTest extends CodegenTestCase {
private static final JetScriptDefinition FIB_SCRIPT_DEFINITION =
new JetScriptDefinition(".lang.kt",
new AnalyzerScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType()));
private static final KotlinScriptDefinition FIB_SCRIPT_DEFINITION =
new KotlinScriptDefinition(".lang.kt",
new AnalyzerScriptParameter(Name.identifier("num"), JvmPlatform.INSTANCE$.getBuiltIns().getIntType()));
@Override
protected void setUp() throws Exception {
super.setUp();
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
JetScriptDefinitionProvider.getInstance(myEnvironment.getProject()).addScriptDefinition(FIB_SCRIPT_DEFINITION);
KotlinScriptDefinitionProvider.getInstance(myEnvironment.getProject()).addScriptDefinition(FIB_SCRIPT_DEFINITION);
}
public void testLanguage() throws Exception {
compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java
+3 -3
View File
@@ -47,7 +47,7 @@ public abstract class AbstractParsingTest extends ParsingTestCase {
}
public AbstractParsingTest() {
super(".", "kt", new JetParserDefinition());
super(".", "kt", new KotlinParserDefinition());
}
private static void checkPsiGetters(KtElement elem) throws Throwable {
@@ -83,7 +83,7 @@ public abstract class AbstractParsingTest extends ParsingTestCase {
}
protected void doParsingTest(@NotNull String filePath) throws Exception {
doBaseTest(filePath, KtNodeTypes.JET_FILE);
doBaseTest(filePath, KtNodeTypes.KT_FILE);
}
protected void doExpressionCodeFragmentParsingTest(@NotNull String filePath) throws Exception {
@@ -100,7 +100,7 @@ public abstract class AbstractParsingTest extends ParsingTestCase {
myFile.acceptChildren(new KtVisitorVoid() {
@Override
public void visitJetElement(@NotNull KtElement element) {
public void visitKtElement(@NotNull KtElement element) {
element.acceptChildren(this);
try {
checkPsiGetters(element);
compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
+2 -2
View File
@@ -72,7 +72,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
val descriptors = ArrayList<DeclarationDescriptor>()
psiFile.accept(object : KtVisitorVoid() {
override fun visitJetFile(file: KtFile) {
override fun visitKtFile(file: KtFile) {
val fqName = file.getPackageFqName()
if (!fqName.isRoot()) {
val packageDescriptor = context.module.getPackage(fqName)
@@ -126,7 +126,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
element.acceptChildren(this)
}
override fun visitJetElement(element: KtElement) {
override fun visitKtElement(element: KtElement) {
element.acceptChildren(this)
}
compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt
+1 -1
View File
@@ -133,7 +133,7 @@ class MutableDiagnosticsTest : KotlinTestWithEnvironment() {
val dummyElement = KtPsiFactory(getEnvironment().project).createType("Int")
init {
dummyElement.getContainingJetFile().doNotAnalyze = null
dummyElement.getContainingKtFile().doNotAnalyze = null
}
override fun getFactory() = unimplemented()
compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java
+7 -7
View File
@@ -31,8 +31,8 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.config.ContentRootsKt;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.parsing.JetScriptDefinition;
import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
import org.jetbrains.kotlin.parsing.KotlinScriptDefinition;
import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider;
import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter;
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.test.ConfigurationKind;
@@ -49,14 +49,14 @@ import java.util.List;
public class ScriptTest {
@Test
public void testScript() throws Exception {
Class<?> aClass = compileScript("fib.kts", numIntParam(), Collections.<JetScriptDefinition>emptyList());
Class<?> aClass = compileScript("fib.kts", numIntParam(), Collections.<KotlinScriptDefinition>emptyList());
Assert.assertNotNull(aClass);
aClass.getConstructor(int.class).newInstance(4);
}
@Test
public void testScriptWithPackage() throws Exception {
Class<?> aClass = compileScript("fib.pkg.kts", numIntParam(), Collections.<JetScriptDefinition>emptyList());
Class<?> aClass = compileScript("fib.pkg.kts", numIntParam(), Collections.<KotlinScriptDefinition>emptyList());
Assert.assertNotNull(aClass);
aClass.getConstructor(int.class).newInstance(4);
}
@@ -64,7 +64,7 @@ public class ScriptTest {
@Test
public void testScriptWithScriptDefinition() throws Exception {
Class<?> aClass = compileScript("fib.fib.kt", null,
Collections.singletonList(new JetScriptDefinition(".fib.kt", numIntParam())));
Collections.singletonList(new KotlinScriptDefinition(".fib.kt", numIntParam())));
Assert.assertNotNull(aClass);
aClass.getConstructor(int.class).newInstance(4);
}
@@ -73,7 +73,7 @@ public class ScriptTest {
private static Class<?> compileScript(
@NotNull String scriptPath,
@Nullable List<AnalyzerScriptParameter> scriptParameters,
@NotNull List<JetScriptDefinition> scriptDefinitions
@NotNull List<KotlinScriptDefinition> scriptDefinitions
) {
KotlinPaths paths = PathUtil.getKotlinPathsForDistDirectory();
MessageCollector messageCollector = PrintingMessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR;
@@ -91,7 +91,7 @@ public class ScriptTest {
KotlinCoreEnvironment.createForProduction(rootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES);
try {
JetScriptDefinitionProvider.getInstance(environment.getProject()).markFileAsScript(environment.getSourceFiles().get(0));
KotlinScriptDefinitionProvider.getInstance(environment.getProject()).markFileAsScript(environment.getSourceFiles().get(0));
return KotlinToJVMBytecodeCompiler.compileScript(configuration, paths, environment);
}
catch (CompilationException e) {
compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt
+1 -1
View File
@@ -97,7 +97,7 @@ abstract class AbstractTypeBindingTest : KotlinLiteFixture() {
}
println("psi: ${binding.psiElement.getText()}")
println("type: ${binding.jetType.render()}")
println("type: ${binding.kotlinType.render()}")
printCollection(binding.getArgumentBindings()) {
print(it)
compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class DefaultModalityModifiersTest extends KotlinLiteFixture {
ResolveSession resolveSession = createLazyResolveSession(
moduleContext,
new FileBasedDeclarationProviderFactory(moduleContext.getStorageManager(),
Collections.singleton(aClass.getContainingJetFile())),
Collections.singleton(aClass.getContainingKtFile())),
new BindingTraceContext(),
TargetPlatform.Default.INSTANCE$
);