From 1161685feec128e7f133e6af320d02dd47cdc350 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 25 Jun 2013 13:41:37 +0400 Subject: [PATCH] Move builtin class sources(*.jet) under IDEA module (should be removed completely later) Change marker filename which is used to find those sources via getResource --- .idea/artifacts/KotlinPlugin.xml | 2 +- build.xml | 2 +- .../jet/lang/types/lang/KotlinBuiltIns.java | 2 +- .../jetbrains/jet/asJava/LightClassUtil.java | 22 +++++-------------- .../builtins => idea/builtinsSrc}/jet/Any.jet | 0 .../builtinsSrc}/jet/Arrays.jet | 0 .../builtinsSrc}/jet/Collections.jet | 0 .../builtinsSrc}/jet/Enum.jet | 0 .../builtinsSrc}/jet/ExtensionFunctions.jet | 0 .../builtinsSrc}/jet/Functions.jet | 0 .../builtinsSrc}/jet/Iterators.jet | 0 .../builtinsSrc}/jet/KExtensionFunctions.jet | 0 .../builtinsSrc}/jet/KFunctions.jet | 0 .../builtinsSrc}/jet/KMemberFunctions.jet | 0 .../builtinsSrc}/jet/Library.jet | 0 .../builtinsSrc}/jet/Nothing.jet | 0 .../builtinsSrc}/jet/Numbers.jet | 0 .../builtinsSrc}/jet/Progressions.jet | 0 .../builtinsSrc}/jet/Ranges.jet | 0 .../builtinsSrc}/jet/Unit.jet | 0 20 files changed, 9 insertions(+), 19 deletions(-) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Any.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Arrays.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Collections.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Enum.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/ExtensionFunctions.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Functions.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Iterators.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/KExtensionFunctions.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/KFunctions.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/KMemberFunctions.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Library.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Nothing.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Numbers.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Progressions.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Ranges.jet (100%) rename {compiler/frontend/builtins => idea/builtinsSrc}/jet/Unit.jet (100%) diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml index 53cac94caf7..d5642184882 100644 --- a/.idea/artifacts/KotlinPlugin.xml +++ b/.idea/artifacts/KotlinPlugin.xml @@ -18,7 +18,7 @@ - + diff --git a/build.xml b/build.xml index 36a0929c27a..95fb1869d3e 100644 --- a/build.xml +++ b/build.xml @@ -107,7 +107,7 @@ - + diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index 21b85be0c39..a6df71e786b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -217,7 +217,7 @@ public class KotlinBuiltIns { @TestOnly private static File getInTestBuiltInPath(String path) { - return new File("compiler/frontend/builtins", path); + return new File("idea/builtinsSrc", path); } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java index 5b8b3afa28c..c49cdd4c103 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java @@ -20,7 +20,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; @@ -50,7 +49,7 @@ public class LightClassUtil { /** * Checks whether the given file is loaded from the location where Kotlin's built-in classes are defined. - * As of today, this is compiler/frontend/builtins/jet directory and files such as Any.jet, Nothing.jet etc. + * As of today, this is idea/builtinsSrc/jet directory and files such as Any.jet, Nothing.jet etc. * * Used to skip JetLightClass creation for built-ins, because built-in classes have no Java counterparts */ @@ -61,7 +60,6 @@ public class LightClassUtil { if (parent != null) { try { String jetVfsPathUrl = KotlinVfsUtil.convertFromUrl(KotlinBuiltIns.getBuiltInsDirUrl()); - String fileDirVfsUrl = parent.getUrl(); if (jetVfsPathUrl.equals(fileDirVfsUrl)) { return true; @@ -78,19 +76,10 @@ public class LightClassUtil { return false; } - /*package*/ static void logErrorWithOSInfo(@Nullable Throwable cause, @NotNull FqName fqName, @Nullable VirtualFile virtualFile) { - String path = virtualFile == null ? "" : virtualFile.getPath(); - LOG.error( - "Could not generate LightClass for " + fqName + " declared in " + path + "\n" + - "built-ins dir URL is " + KotlinBuiltIns.getBuiltInsDirUrl() + "\n" + - "System: " + SystemInfo.OS_NAME + " " + SystemInfo.OS_VERSION + " Java Runtime: " + SystemInfo.JAVA_RUNTIME_VERSION, - cause); - } - @Nullable /*package*/ static PsiClass findClass(@NotNull FqName fqn, @NotNull StubElement stub) { if (stub instanceof PsiClassStub && Comparing.equal(fqn.asString(), ((PsiClassStub) stub).getQualifiedName())) { - return (PsiClass)stub.getPsi(); + return (PsiClass) stub.getPsi(); } if (stub instanceof PsiClassStub || stub instanceof PsiFileStub) { @@ -226,8 +215,8 @@ public class LightClassUtil { private static PropertyAccessorsPsiMethods extractPropertyAccessors( @NotNull JetDeclaration jetDeclaration, - @Nullable PsiMethod specialGetter, @Nullable PsiMethod specialSetter) - { + @Nullable PsiMethod specialGetter, @Nullable PsiMethod specialSetter + ) { PsiMethod getterWrapper = specialGetter; PsiMethod setterWrapper = specialSetter; @@ -290,5 +279,6 @@ public class LightClassUtil { } } - private LightClassUtil() {} + private LightClassUtil() { + } } diff --git a/compiler/frontend/builtins/jet/Any.jet b/idea/builtinsSrc/jet/Any.jet similarity index 100% rename from compiler/frontend/builtins/jet/Any.jet rename to idea/builtinsSrc/jet/Any.jet diff --git a/compiler/frontend/builtins/jet/Arrays.jet b/idea/builtinsSrc/jet/Arrays.jet similarity index 100% rename from compiler/frontend/builtins/jet/Arrays.jet rename to idea/builtinsSrc/jet/Arrays.jet diff --git a/compiler/frontend/builtins/jet/Collections.jet b/idea/builtinsSrc/jet/Collections.jet similarity index 100% rename from compiler/frontend/builtins/jet/Collections.jet rename to idea/builtinsSrc/jet/Collections.jet diff --git a/compiler/frontend/builtins/jet/Enum.jet b/idea/builtinsSrc/jet/Enum.jet similarity index 100% rename from compiler/frontend/builtins/jet/Enum.jet rename to idea/builtinsSrc/jet/Enum.jet diff --git a/compiler/frontend/builtins/jet/ExtensionFunctions.jet b/idea/builtinsSrc/jet/ExtensionFunctions.jet similarity index 100% rename from compiler/frontend/builtins/jet/ExtensionFunctions.jet rename to idea/builtinsSrc/jet/ExtensionFunctions.jet diff --git a/compiler/frontend/builtins/jet/Functions.jet b/idea/builtinsSrc/jet/Functions.jet similarity index 100% rename from compiler/frontend/builtins/jet/Functions.jet rename to idea/builtinsSrc/jet/Functions.jet diff --git a/compiler/frontend/builtins/jet/Iterators.jet b/idea/builtinsSrc/jet/Iterators.jet similarity index 100% rename from compiler/frontend/builtins/jet/Iterators.jet rename to idea/builtinsSrc/jet/Iterators.jet diff --git a/compiler/frontend/builtins/jet/KExtensionFunctions.jet b/idea/builtinsSrc/jet/KExtensionFunctions.jet similarity index 100% rename from compiler/frontend/builtins/jet/KExtensionFunctions.jet rename to idea/builtinsSrc/jet/KExtensionFunctions.jet diff --git a/compiler/frontend/builtins/jet/KFunctions.jet b/idea/builtinsSrc/jet/KFunctions.jet similarity index 100% rename from compiler/frontend/builtins/jet/KFunctions.jet rename to idea/builtinsSrc/jet/KFunctions.jet diff --git a/compiler/frontend/builtins/jet/KMemberFunctions.jet b/idea/builtinsSrc/jet/KMemberFunctions.jet similarity index 100% rename from compiler/frontend/builtins/jet/KMemberFunctions.jet rename to idea/builtinsSrc/jet/KMemberFunctions.jet diff --git a/compiler/frontend/builtins/jet/Library.jet b/idea/builtinsSrc/jet/Library.jet similarity index 100% rename from compiler/frontend/builtins/jet/Library.jet rename to idea/builtinsSrc/jet/Library.jet diff --git a/compiler/frontend/builtins/jet/Nothing.jet b/idea/builtinsSrc/jet/Nothing.jet similarity index 100% rename from compiler/frontend/builtins/jet/Nothing.jet rename to idea/builtinsSrc/jet/Nothing.jet diff --git a/compiler/frontend/builtins/jet/Numbers.jet b/idea/builtinsSrc/jet/Numbers.jet similarity index 100% rename from compiler/frontend/builtins/jet/Numbers.jet rename to idea/builtinsSrc/jet/Numbers.jet diff --git a/compiler/frontend/builtins/jet/Progressions.jet b/idea/builtinsSrc/jet/Progressions.jet similarity index 100% rename from compiler/frontend/builtins/jet/Progressions.jet rename to idea/builtinsSrc/jet/Progressions.jet diff --git a/compiler/frontend/builtins/jet/Ranges.jet b/idea/builtinsSrc/jet/Ranges.jet similarity index 100% rename from compiler/frontend/builtins/jet/Ranges.jet rename to idea/builtinsSrc/jet/Ranges.jet diff --git a/compiler/frontend/builtins/jet/Unit.jet b/idea/builtinsSrc/jet/Unit.jet similarity index 100% rename from compiler/frontend/builtins/jet/Unit.jet rename to idea/builtinsSrc/jet/Unit.jet