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

Rename package k2js -> kotlin.js in js.translator

Browse Source 
org.jetbrains.k2js -> org.jetbrains.kotlin.js
This commit is contained in:
Alexander Udalov
2015-01-04 05:47:05 +03:00
parent 6f2a0b06e1
commit 2bc3aa2199
144 changed files with 815 additions and 888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+7 -7
View File
@@ -44,11 +44,11 @@ import org.jetbrains.k2js.config.Config;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.config.LibrarySourcesConfig;
import org.jetbrains.k2js.config.LibrarySourcesConfigWithCaching;
import org.jetbrains.k2js.facade.Status;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
import org.jetbrains.k2js.test.utils.JsTestUtils;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.kotlin.js.facade.MainCallParameters;
import org.jetbrains.kotlin.js.facade.Status;
import org.jetbrains.kotlin.js.translate.context.Namer;
import java.io.File;
import java.io.IOException;
@@ -57,9 +57,9 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import static org.jetbrains.k2js.facade.K2JSTranslator.translateWithMainCallParameters;
import static org.jetbrains.k2js.test.rhino.RhinoUtils.runRhinoTest;
import static org.jetbrains.k2js.test.utils.JsTestUtils.convertFileNameToDotJsFile;
import static org.jetbrains.kotlin.js.facade.K2JSTranslator.translateWithMainCallParameters;
public abstract class BasicTest extends KotlinTestWithEnvironment {
// predictable order of ecma version in tests
@@ -198,7 +198,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
return false;
}
protected boolean shouldGenerateSourcemap() {
protected boolean shouldGenerateSourceMap() {
return false;
}
@@ -280,10 +280,10 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
@NotNull
private Config createConfig(@NotNull Project project, @NotNull String moduleId, @NotNull EcmaVersion ecmaVersion, @Nullable List<String> libraries) {
if (libraries == null) {
return new LibrarySourcesConfigWithCaching(project, moduleId, ecmaVersion, shouldGenerateSourcemap(), IS_INLINE_ENABLED, shouldBeTranslateAsUnitTestClass());
return new LibrarySourcesConfigWithCaching(project, moduleId, ecmaVersion, shouldGenerateSourceMap(), IS_INLINE_ENABLED, shouldBeTranslateAsUnitTestClass());
}
else {
return new LibrarySourcesConfig(project, moduleId, librariesWithJsStdlib(libraries), ecmaVersion, shouldGenerateSourcemap(), IS_INLINE_ENABLED);
return new LibrarySourcesConfig(project, moduleId, librariesWithJsStdlib(libraries), ecmaVersion, shouldGenerateSourceMap(), IS_INLINE_ENABLED);
}
}
js/js.tests/test/org/jetbrains/k2js/test/MultipleFilesTranslationTest.java
+1 -1
View File
@@ -18,8 +18,8 @@ package org.jetbrains.k2js.test;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
import org.jetbrains.kotlin.js.facade.MainCallParameters;
import java.util.List;
js/js.tests/test/org/jetbrains/k2js/test/MultipleModulesTranslationTest.kt
+1 -4
View File
@@ -17,17 +17,14 @@
package org.jetbrains.k2js.test
import org.jetbrains.k2js.config.EcmaVersion
import org.jetbrains.k2js.facade.MainCallParameters
import org.jetbrains.k2js.test.BasicTest
import org.jetbrains.kotlin.js.facade.MainCallParameters
import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker
import java.io.File
import java.util.ArrayList
import org.jetbrains.k2js.test.utils.JsTestUtils.getAllFilesInDir
import java.util.HashMap
import java.util.LinkedHashMap
import java.util.Collections
public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(main) {
js/js.tests/test/org/jetbrains/k2js/test/SingleFileTranslationTest.java
+1 -1
View File
@@ -19,9 +19,9 @@ package org.jetbrains.k2js.test;
import com.google.common.collect.Lists;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker;
import org.jetbrains.k2js.test.rhino.RhinoSystemOutputChecker;
import org.jetbrains.kotlin.js.facade.MainCallParameters;
import static org.jetbrains.k2js.test.utils.JsTestUtils.readFile;
js/js.tests/test/org/jetbrains/k2js/test/SourceMapTest.java
+1 -1
View File
@@ -32,7 +32,7 @@ public final class SourceMapTest extends SingleFileTranslationTest {
}
@Override
protected boolean shouldGenerateSourcemap() {
protected boolean shouldGenerateSourceMap() {
return true;
}
js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.k2js.test.rhino;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.kotlin.js.translate.context.Namer;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.k2js.test.rhino;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.k2js.facade.K2JSTranslator;
import org.jetbrains.kotlin.js.facade.K2JSTranslator;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java
+2 -2
View File
@@ -22,7 +22,7 @@ import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.facade.K2JSTranslator;
import org.jetbrains.kotlin.js.facade.K2JSTranslator;
import org.mozilla.javascript.*;
import java.io.File;
@@ -302,4 +302,4 @@ public final class RhinoUtils {
return OPTIMIZATION_DEFAULT;
}
}
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/CharTest.java
-2
View File
@@ -16,9 +16,7 @@
package org.jetbrains.k2js.test.semantics;
import org.jetbrains.k2js.facade.exceptions.TranslationInternalException;
import org.jetbrains.k2js.test.SingleFileTranslationTest;
import org.junit.Assert;
public final class CharTest extends SingleFileTranslationTest {
public CharTest() {
js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.k2js.test.semantics;
import junit.framework.Test;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.k2js.test.SingleFileTranslationTest;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.kotlin.js.translate.context.Namer;
@SuppressWarnings("JUnitTestCaseWithNoTests")
public final class ExamplesTest extends SingleFileTranslationTest {
js/js.tests/test/org/jetbrains/k2js/test/semantics/JsUnitTestBase.java
+7 -4
View File
@@ -20,13 +20,16 @@ import com.google.common.collect.Lists;
import junit.framework.Test;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.test.MultipleFilesTranslationTest;
import org.jetbrains.k2js.test.utils.JsUnitTestReporter;
import org.jetbrains.k2js.test.rhino.RhinoSystemOutputChecker;
import org.jetbrains.k2js.test.rhino.RhinoUtils;
import org.jetbrains.k2js.test.utils.JsUnitTestReporter;
import org.jetbrains.kotlin.js.facade.MainCallParameters;
import java.util.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public abstract class JsUnitTestBase extends MultipleFilesTranslationTest {
@@ -48,7 +51,7 @@ public abstract class JsUnitTestBase extends MultipleFilesTranslationTest {
@NotNull
@Override
protected List<String> additionalJsFiles(@NotNull EcmaVersion ecmaVersion) {
ArrayList<String> result = Lists.newArrayList(super.additionalJsFiles(ecmaVersion));
List<String> result = Lists.newArrayList(super.additionalJsFiles(ecmaVersion));
result.add(JS_TESTS_JS);
return result;
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
+3 -3
View File
@@ -16,7 +16,7 @@
package org.jetbrains.k2js.test.semantics;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.kotlin.js.translate.context.Namer;
import org.mozilla.javascript.JavaScriptException;
/**
@@ -36,8 +36,7 @@ public final class MiscTest extends AbstractExpressionTest {
fooBoxTest();
}
public void testSafecallComputesExpressionOnlyOnce() throws Exception {
public void testSafeCallComputesExpressionOnlyOnce() throws Exception {
fooBoxTest();
}
@@ -171,6 +170,7 @@ public final class MiscTest extends AbstractExpressionTest {
fail();
}
catch (JavaScriptException e) {
// ignore
}
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/NumberTest.java
+1 -1
View File
@@ -16,8 +16,8 @@
package org.jetbrains.k2js.test.semantics;
import org.jetbrains.k2js.facade.exceptions.TranslationInternalException;
import org.jetbrains.k2js.test.SingleFileTranslationTest;
import org.jetbrains.kotlin.js.facade.exceptions.TranslationInternalException;
import org.junit.Assert;
public final class NumberTest extends SingleFileTranslationTest {
js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTest.java
+1 -1
View File
@@ -18,9 +18,9 @@ package org.jetbrains.k2js.test.semantics;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.test.SingleFileTranslationTest;
import org.jetbrains.k2js.test.rhino.RhinoFunctionNativeObjectResultChecker;
import org.jetbrains.kotlin.js.facade.MainCallParameters;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestBase.java
+1 -1
View File
@@ -20,9 +20,9 @@ import com.google.common.collect.Lists;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.k2js.config.EcmaVersion;
import org.jetbrains.k2js.facade.MainCallParameters;
import org.jetbrains.k2js.test.SingleFileTranslationTest;
import org.jetbrains.k2js.test.rhino.RhinoResultChecker;
import org.jetbrains.kotlin.js.facade.MainCallParameters;
import java.io.File;
import java.util.List;