diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java index 69280a6163b..7e4fcdb4e45 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java @@ -44,15 +44,15 @@ public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegre } public void testJavaClass() throws IOException { - doNavigationInSourcesTest("libraries/stdlib/src/kotlin/Iterators.kt", "Collections", "java.util.Collections"); + doNavigationInSourcesTest("libraries/stdlib/src/kotlin/collections/Maps.kt", "Collections", "java.util.Collections"); } public void testKotlinClass() throws IOException { - doNavigationInSourcesTest("libraries/stdlib/src/kotlin/Iterators.kt", "FunctionIterator", "kotlin.FunctionIterator"); + doNavigationInSourcesTest("libraries/stdlib/src/kotlin/collections/Stream.kt", "AbstractIterator", "kotlin.support.AbstractIterator"); } public void testClassWithJavaAnalog() throws IOException { - doNavigationInSourcesTest("libraries/stdlib/src/kotlin/Iterators.kt", "Iterator", "kotlin.Iterator"); + doNavigationInSourcesTest("libraries/stdlib/src/kotlin/collections/AbstractIterator.kt", "Iterator", "kotlin.Iterator"); } public void testNavigationInKotlinBuiltIns() throws IOException { @@ -69,6 +69,10 @@ public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegre PsiFile psiFile = getPsiFileForFileFromSources(file); String text = psiFile.getText(); int index = text.indexOf(element); + assertNotSame(-1, "Cannot find text '" + element + "' in file " + path); + while (Character.isLetter(text.charAt(index - 1))) { + index = text.indexOf(element, index + 1); + } PsiReference ref = psiFile.findReferenceAt(index); assertNotNull("Cannot find reference at " + index + ", " + text.substring(index - 20, index) + "" + text.substring(index, index + 20), ref); diff --git a/idea/tests/org/jetbrains/jet/plugin/lightClasses/LightClassForLibrarySourceFileTest.java b/idea/tests/org/jetbrains/jet/plugin/lightClasses/LightClassForLibrarySourceFileTest.java index 4ee3844053c..bbc9e13115a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/lightClasses/LightClassForLibrarySourceFileTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/lightClasses/LightClassForLibrarySourceFileTest.java @@ -26,8 +26,8 @@ import org.jetbrains.jet.plugin.libraries.NavigateToStdlibSourceRegressionTest; public class LightClassForLibrarySourceFileTest extends NavigateToStdlibSourceRegressionTest { public void testLightClassForFileFromLibrarySource() throws Exception { - PsiElement navigationElement = getNavigationElement("libraries/stdlib/src/kotlin/Iterators.kt", "FunctionIterator"); - assertTrue("FunctionIterator should navigate to JetClassOrObject", navigationElement instanceof JetClassOrObject); + PsiElement navigationElement = getNavigationElement("libraries/stdlib/src/kotlin/collections/Stream.kt", "AbstractIterator"); + assertTrue("AbstractIterator should navigate to JetClassOrObject", navigationElement instanceof JetClassOrObject); PsiClass lightClass = LightClassUtil.getPsiClass((JetClassOrObject) navigationElement); assertTrue("Do not create Kotlin Light Class for file from library sources", !(lightClass instanceof KotlinLightClass)); } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ArraysTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ArraysTest.java index e069bb4def3..f9463d4db69 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/ArraysTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/ArraysTest.java @@ -21,6 +21,6 @@ import junit.framework.Test; @SuppressWarnings("JUnitTestCaseWithNoTests") public final class ArraysTest extends JsUnitTestBase { public static Test suite() throws Exception { - return createTestSuiteForFile("libraries/stdlib/test/ArraysTest.kt"); + return createTestSuiteForFile("libraries/stdlib/test/collections/ArraysTest.kt"); } } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java index dfb0184aee7..dde5815d3e2 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java @@ -56,16 +56,16 @@ public class CompileMavenGeneratedJSLibrary extends SingleFileTranslationTest { if (generatedJsLibraryDir.exists() && generatedJsLibraryDir.isDirectory()) { generateJavaScriptFiles(DEFAULT_ECMA_VERSIONS, "libraries/stdlib/test", - "ArraysTest.kt", + "collections/ArraysTest.kt", "dom/DomTest.kt", "js/MapTest.kt", "js/JsDomTest.kt", - "iterators/FunctionIteratorTest.kt", - "iterators/IteratorsTest.kt", + "collections/FunctionIteratorTest.kt", + "collections/IteratorsTest.kt", "GetOrElseTest.kt", - "ListTest.kt", - "SetTest.kt", - "StringTest.kt"); + "collections/ListTest.kt", + "collections/SetTest.kt", + "text/StringTest.kt"); } else { System.out.println("Warning " + generatedJsLibraryDir + " does not exist - I guess you've not run the maven build in library/ yet?"); diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibSetTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIterableTest.java similarity index 76% rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibSetTest.java rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIterableTest.java index 2182d0e2b0e..318173c01cc 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibSetTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIterableTest.java @@ -19,11 +19,9 @@ package org.jetbrains.k2js.test.semantics; import junit.framework.Test; @SuppressWarnings("JUnitTestCaseWithNoTests") -public final class StdLibSetTest extends JsUnitTestBase { +public final class StdLibIterableTest extends JsUnitTestBase { public static Test suite() throws Exception { - return createTestSuiteForFile("libraries/stdlib/test/SetTest.kt", - "SetTest.filter", - "SetTest.find"); + return createTestSuiteForFile("libraries/stdlib/test/collections/IterableTests.kt"); } } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIteratorsTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIteratorsTest.java index c8e6ad0b0a2..01973e5dd23 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIteratorsTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIteratorsTest.java @@ -22,7 +22,6 @@ import junit.framework.Test; @SuppressWarnings("JUnitTestCaseWithNoTests") public final class StdLibIteratorsTest extends JsUnitTestBase { public static Test suite() throws Exception { - return createTestSuiteForFile("libraries/stdlib/test/iterators/IteratorsTest.kt", - "IteratorsTest.requireNoNulls"); + return createTestSuiteForFile("libraries/stdlib/test/collections/IteratorsTest.kt"); } } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibListTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibListTest.java index 2f8aedddc18..e4ba148b70d 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibListTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibListTest.java @@ -22,6 +22,6 @@ import junit.framework.Test; @SuppressWarnings("JUnitTestCaseWithNoTests") public final class StdLibListTest extends JsUnitTestBase { public static Test suite() throws Exception { - return createTestSuiteForFile("libraries/stdlib/test/ListTest.kt"); + return createTestSuiteForFile("libraries/stdlib/test/collections/ListSpecificTest.kt"); } } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java index 218fa1b4918..5fb9726b89c 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java @@ -25,11 +25,11 @@ public class StdLibTestToJSTest extends StdLibTestBase { "dom/DomTest.kt", "js/MapJsTest.kt", "js/JsDomTest.kt", - "iterators/FunctionIteratorTest.kt", - "iterators/IteratorsTest.kt", + "collections/StreamTest.kt", + "collections/IteratorsTest.kt", "GetOrElseTest.kt", - "ListTest.kt", - "SetTest.kt", - "StringTest.kt"); + "collections/ListSpecificTest.kt", + "collections/IterableTests.kt", + "text/StringTest.kt"); } } diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java index 77d778790e7..610a5a7d862 100644 --- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java +++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java @@ -102,7 +102,6 @@ public abstract class Config { "/core/stringsCode.kt", "/stdlib/domCode.kt", "/stdlib/jutilCode.kt", - "/stdlib/JUMapsCode.kt", "/stdlib/testCode.kt" ); @@ -114,20 +113,30 @@ public abstract class Config { @NotNull public static final List STDLIB_FILE_NAMES = Arrays.asList( "/kotlin/Preconditions.kt", - "/kotlin/Iterators.kt", - "/kotlin/JUtil.kt", - "/kotlin/Arrays.kt", - "/kotlin/Lists.kt", - "/kotlin/Maps.kt", - "/kotlin/Exceptions.kt", - "/kotlin/IterablesSpecial.kt", + "/kotlin/Functions.kt", + "/kotlin/collections/JUtil.kt", + "/kotlin/collections/Iterators.kt", + "/kotlin/collections/Arrays.kt", + "/kotlin/collections/Maps.kt", + "/kotlin/collections/Exceptions.kt", + "/kotlin/collections/MutableCollections.kt", + "/kotlin/collections/Stream.kt", + "/kotlin/collections/AbstractIterator.kt", + "/generated/_Aggregates.kt", "/generated/_Arrays.kt", - "/generated/_Collections.kt", - "/generated/_Iterables.kt", - "/generated/_Iterators.kt", - "/kotlin/support/AbstractIterator.kt", + "/generated/_DownTo.kt", + "/generated/_Elements.kt", + "/generated/_Filtering.kt", + "/generated/_Generators.kt", + "/generated/_Guards.kt", + "/generated/_Mapping.kt", + "/generated/_Numeric.kt", + "/generated/_Ordering.kt", + "/generated/_Snapshots.kt", + "/generated/_Strings.kt", + "/generated/_Streams.kt", "/kotlin/Standard.kt", - "/kotlin/Strings.kt", + "/kotlin/text/Strings.kt", "/kotlin/dom/Dom.kt", "/kotlin/test/Test.kt" ); diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml index c4e3eb2ac8e..b72a1121203 100644 --- a/libraries/tools/kotlin-js-library/pom.xml +++ b/libraries/tools/kotlin-js-library/pom.xml @@ -49,33 +49,31 @@ - - - - - - - - - - - - + + + + + + + + + + - + - +