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

JS: drop support of old library format

Browse Source
This commit is contained in:
Alexey Andreev
2017-01-30 19:24:42 +03:00
parent 82320bdf7d
commit 7192529733
37 changed files with 143 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.kt
+1 -2
View File
@@ -54,10 +54,9 @@ object TopDownAnalyzerFacadeForJS {
moduleContext: ModuleContext,
config: JsConfig
): JsAnalysisResult {
val allFiles = JsConfig.withJsLibAdded(files, config)
val analyzerForJs = createTopDownAnalyzerForJs(
moduleContext, trace,
FileBasedDeclarationProviderFactory(moduleContext.storageManager, allFiles),
FileBasedDeclarationProviderFactory(moduleContext.storageManager, files),
config.configuration.get(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS, LanguageVersionSettingsImpl.DEFAULT)
)
analyzerForJs.analyzeDeclarations(TopDownAnalysisMode.TopLevelDeclarations, files)
js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt
-10
View File
@@ -20,11 +20,8 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.diagnostics.Severity
import org.jetbrains.kotlin.js.PredefinedAnnotation.*
import org.jetbrains.kotlin.js.config.LibrarySourcesConfig
import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtSimpleNameExpression
import org.jetbrains.kotlin.resolve.diagnostics.DiagnosticSuppressor
import org.jetbrains.kotlin.resolve.diagnostics.FUNCTION_NO_BODY_ERRORS
@@ -50,10 +47,3 @@ class SuppressUninitializedErrorsForNativeDeclarations : DiagnosticSuppressor {
}
}
class SuppressWarningsFromExternalModules : DiagnosticSuppressor {
override fun isSuppressed(diagnostic: Diagnostic): Boolean {
val file = diagnostic.psiFile
return diagnostic.severity == Severity.WARNING &&
file is KtFile && file.getUserData(LibrarySourcesConfig.EXTERNAL_MODULE_NAME) != null
}
}
js/js.frontend/src/org/jetbrains/kotlin/js/config/JsConfig.java
+2 -20
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.js.config;
import com.google.common.collect.Lists;
import com.intellij.openapi.project.Project;
import com.intellij.util.SmartList;
import kotlin.collections.CollectionsKt;
@@ -29,7 +28,6 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentProvider;
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
import org.jetbrains.kotlin.js.resolve.JsPlatform;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration;
import org.jetbrains.kotlin.serialization.js.JsModuleDescriptor;
import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil;
@@ -39,7 +37,6 @@ import org.jetbrains.kotlin.utils.JsMetadataVersion;
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadata;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -50,7 +47,6 @@ public abstract class JsConfig {
private final Project project;
private final CompilerConfiguration configuration;
private final LockBasedStorageManager storageManager = new LockBasedStorageManager();
private final List<KtFile> sourceFilesFromLibraries = new SmartList<KtFile>();
@NotNull
protected final List<KotlinJavascriptMetadata> metadata = new SmartList<KotlinJavascriptMetadata>();
@@ -92,7 +88,7 @@ public abstract class JsConfig {
public abstract boolean checkLibFilesAndReportErrors(@NotNull Reporter report);
protected abstract void init(@NotNull List<KtFile> sourceFilesInLibraries, @NotNull List<KotlinJavascriptMetadata> metadata);
protected abstract void init(@NotNull List<KotlinJavascriptMetadata> metadata);
@NotNull
public List<JsModuleDescriptor<ModuleDescriptorImpl>> getModuleDescriptors() {
@@ -117,16 +113,10 @@ public abstract class JsConfig {
return moduleDescriptors;
}
@NotNull
private List<KtFile> getSourceFilesFromLibraries() {
init();
return sourceFilesFromLibraries;
}
private void init() {
if (initialized) return;
init(sourceFilesFromLibraries, metadata);
init(metadata);
initialized = true;
}
@@ -153,12 +143,4 @@ public abstract class JsConfig {
private static void setDependencies(ModuleDescriptorImpl module, List<ModuleDescriptorImpl> modules) {
module.setDependencies(CollectionsKt.plus(modules, JsPlatform.INSTANCE.getBuiltIns().getBuiltInsModule()));
}
@NotNull
public static Collection<KtFile> withJsLibAdded(@NotNull Collection<KtFile> files, @NotNull JsConfig config) {
Collection<KtFile> allFiles = Lists.newArrayList();
allFiles.addAll(files);
allFiles.addAll(config.getSourceFilesFromLibraries());
return allFiles;
}
}
js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java
+26 -85
View File
@@ -17,24 +17,20 @@
package org.jetbrains.kotlin.js.config;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.*;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.openapi.vfs.StandardFileSystems;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.openapi.vfs.VirtualFileSystem;
import com.intellij.util.PathUtil;
import com.intellij.util.io.URLUtil;
import kotlin.Unit;
import kotlin.jvm.functions.Function2;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.idea.KotlinFileType;
import org.jetbrains.kotlin.psi.KtFile;
import org.jetbrains.kotlin.utils.JsMetadataVersion;
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadata;
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils;
import org.jetbrains.kotlin.utils.LibraryUtils;
import java.io.File;
import java.util.Collections;
@@ -42,7 +38,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import static org.jetbrains.kotlin.utils.LibraryUtils.isOldKotlinJavascriptLibrary;
import static org.jetbrains.kotlin.utils.PathUtil.getKotlinPathsForDistDirectory;
public class LibrarySourcesConfig extends JsConfig {
@@ -52,7 +47,6 @@ public class LibrarySourcesConfig extends JsConfig {
public static final List<String> JS_KOTLIN_TEST =
Collections.singletonList(getKotlinPathsForDistDirectory().getJsKotlinTestJarPath().getAbsolutePath());
public static final Key<String> EXTERNAL_MODULE_NAME = Key.create("externalModule");
public static final String UNKNOWN_EXTERNAL_MODULE_NAME = "<unknown>";
public LibrarySourcesConfig(@NotNull Project project, @NotNull CompilerConfiguration configuration) {
@@ -65,11 +59,9 @@ public class LibrarySourcesConfig extends JsConfig {
}
@Override
protected void init(@NotNull final List<KtFile> sourceFilesInLibraries, @NotNull final List<KotlinJavascriptMetadata> metadata) {
protected void init(@NotNull final List<KotlinJavascriptMetadata> metadata) {
if (getLibraries().isEmpty()) return;
final PsiManager psiManager = PsiManager.getInstance(getProject());
JsConfig.Reporter report = new JsConfig.Reporter() {
@Override
public void error(@NotNull String message) {
@@ -77,18 +69,12 @@ public class LibrarySourcesConfig extends JsConfig {
}
};
Function2<String, VirtualFile, Unit> action = new Function2<String, VirtualFile, Unit>() {
Function1<VirtualFile, Unit> action = new Function1<VirtualFile, Unit>() {
@Override
public Unit invoke(String moduleName, VirtualFile file) {
if (moduleName != null) {
JetFileCollector jetFileCollector = new JetFileCollector(sourceFilesInLibraries, moduleName, psiManager);
VfsUtilCore.visitChildrenRecursively(file, jetFileCollector);
}
else {
String libraryPath = PathUtil.getLocalPath(file);
assert libraryPath != null : "libraryPath for " + file + " should not be null";
metadata.addAll(KotlinJavascriptMetadataUtils.loadMetadata(libraryPath));
}
public Unit invoke(VirtualFile file) {
String libraryPath = PathUtil.getLocalPath(file);
assert libraryPath != null : "libraryPath for " + file + " should not be null";
metadata.addAll(KotlinJavascriptMetadataUtils.loadMetadata(libraryPath));
return Unit.INSTANCE;
}
@@ -103,7 +89,7 @@ public class LibrarySourcesConfig extends JsConfig {
return checkLibFilesAndReportErrors(report, null);
}
private boolean checkLibFilesAndReportErrors(@NotNull JsConfig.Reporter report, @Nullable Function2<String, VirtualFile, Unit> action) {
private boolean checkLibFilesAndReportErrors(@NotNull JsConfig.Reporter report, @Nullable Function1<VirtualFile, Unit> action) {
List<String> libraries = getLibraries();
if (libraries.isEmpty()) {
return false;
@@ -135,73 +121,28 @@ public class LibrarySourcesConfig extends JsConfig {
return true;
}
String moduleName;
if (isOldKotlinJavascriptLibrary(filePath)) {
moduleName = LibraryUtils.getKotlinJsModuleName(filePath);
if (!modules.add(moduleName)) {
report.warning("Module \"" + moduleName + "\" is defined in more, than one file");
}
List<KotlinJavascriptMetadata> metadataList = KotlinJavascriptMetadataUtils.loadMetadata(filePath);
if (metadataList.isEmpty()) {
report.warning("'" + path + "' is not a valid Kotlin Javascript library");
continue;
}
else {
List<KotlinJavascriptMetadata> metadataList = KotlinJavascriptMetadataUtils.loadMetadata(filePath);
if (metadataList.isEmpty()) {
report.warning("'" + path + "' is not a valid Kotlin Javascript library");
continue;
}
for (KotlinJavascriptMetadata metadata : metadataList) {
if (!metadata.getVersion().isCompatible()) {
report.error("File '" + path + "' was compiled with an incompatible version of Kotlin. " +
"The binary version of its metadata is " + metadata.getVersion() +
", expected version is " + JsMetadataVersion.INSTANCE);
return true;
}
if (!modules.add(metadata.getModuleName())) {
for (KotlinJavascriptMetadata metadata : metadataList) {
if (!metadata.getVersion().isCompatible()) {
report.error("File '" + path + "' was compiled with an incompatible version of Kotlin. " +
"The binary version of its metadata is " + metadata.getVersion() +
", expected version is " + JsMetadataVersion.INSTANCE);
return true;
}
if (!modules.add(metadata.getModuleName())) {
report.warning("Module \"" + metadata.getModuleName() + "\" is defined in more, than one file");
}
}
moduleName = null;
}
}}
if (action != null) {
action.invoke(moduleName, file);
action.invoke(file);
}
}
return false;
}
private static KtFile getJetFileByVirtualFile(VirtualFile file, String moduleName, PsiManager psiManager) {
PsiFile psiFile = psiManager.findFile(file);
assert psiFile != null;
setupPsiFile(psiFile, moduleName);
return (KtFile) psiFile;
}
private static void setupPsiFile(PsiFile psiFile, String moduleName) {
psiFile.putUserData(EXTERNAL_MODULE_NAME, moduleName);
}
private static class JetFileCollector extends VirtualFileVisitor {
private final List<KtFile> jetFiles;
private final String moduleName;
private final PsiManager psiManager;
private JetFileCollector(List<KtFile> files, String name, PsiManager manager) {
moduleName = name;
psiManager = manager;
jetFiles = files;
}
@Override
public boolean visitFile(@NotNull VirtualFile file) {
if (!file.isDirectory() && StringUtil.notNullize(file.getExtension()).equalsIgnoreCase(KotlinFileType.EXTENSION)) {
jetFiles.add(getJetFileByVirtualFile(file, moduleName, psiManager));
}
return true;
}
}
}
js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionReader.kt
+5 -5
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.js.translate.context.Namer
import org.jetbrains.kotlin.js.translate.context.TranslationContext
import org.jetbrains.kotlin.js.translate.reference.CallExpressionTranslator
import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getExternalModuleName
import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getModuleName
import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
import org.jetbrains.kotlin.resolve.inline.InlineStrategy
import org.jetbrains.kotlin.utils.JsLibraryUtils
@@ -68,7 +68,7 @@ class FunctionReader(private val context: TranslationContext) {
val config = context.config as LibrarySourcesConfig
val libs = config.libraries.map { File(it) }
JsLibraryUtils.traverseJsLibraries(libs) { fileContent, path ->
JsLibraryUtils.traverseJsLibraries(libs) { fileContent, _ ->
var current = 0
while (true) {
@@ -113,9 +113,9 @@ class FunctionReader(private val context: TranslationContext) {
}
operator fun contains(descriptor: CallableDescriptor): Boolean {
val moduleName = getExternalModuleName(descriptor)
val moduleName = getModuleName(descriptor)
val currentModuleName = context.config.moduleId
return currentModuleName != moduleName && moduleName != null && moduleName in moduleNameToInfo.keys()
return currentModuleName != moduleName && moduleName in moduleNameToInfo.keys()
}
operator fun get(descriptor: CallableDescriptor): JsFunction = functionCache.get(descriptor)
@@ -123,7 +123,7 @@ class FunctionReader(private val context: TranslationContext) {
private fun readFunction(descriptor: CallableDescriptor): JsFunction? {
if (descriptor !in this) return null
val moduleName = getExternalModuleName(descriptor)
val moduleName = getModuleName(descriptor)
for (info in moduleNameToInfo[moduleName]) {
val function = readFunctionFromSource(descriptor, info)
js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java
-8
View File
@@ -104,14 +104,6 @@ public class AntTaskJsTest extends AbstractAntTaskTest {
doJsAntTest();
}
public void testSimpleWithStdlibAndAnotherLib() throws Exception {
doJsAntTest("jslib-example.js");
}
public void testSimpleWithStdlibAndFolderAsAnotherLib() throws Exception {
doJsAntTest("jslib-example.js");
}
public void testSimpleWithoutStdlibAndFolderAsAnotherLib() throws Exception {
doJsAntTest("jslib-example.js");
}
js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java
+1 -1
View File
@@ -74,7 +74,7 @@ public final class K2JSTranslator {
}
BindingTrace bindingTrace = analysisResult.getBindingTrace();
TopDownAnalyzerFacadeForJS.checkForErrors(JsConfig.withJsLibAdded(files, config), bindingTrace.getBindingContext());
TopDownAnalyzerFacadeForJS.checkForErrors(files, bindingTrace.getBindingContext());
ModuleDescriptor moduleDescriptor = analysisResult.getModuleDescriptor();
Diagnostics diagnostics = bindingTrace.getBindingContext().getDiagnostics();
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java
+3 -29
View File
@@ -17,15 +17,12 @@
package org.jetbrains.kotlin.js.translate.utils;
import com.intellij.openapi.util.Condition;
import com.intellij.psi.PsiElement;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.js.config.LibrarySourcesConfig;
import org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsKt;
import org.jetbrains.kotlin.js.translate.context.Namer;
import org.jetbrains.kotlin.js.translate.context.TranslationContext;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.KtExpression;
@@ -42,7 +39,6 @@ import java.util.List;
import java.util.Set;
import static org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.isNativeObject;
import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.*;
public final class JsDescriptorUtils {
@@ -164,24 +160,9 @@ public final class JsDescriptorUtils {
@NotNull
public static String getModuleName(@NotNull DeclarationDescriptor descriptor) {
String externalModuleName = getExternalModuleName(descriptor);
if (externalModuleName != null) return externalModuleName;
return getModuleNameFromDescriptorName(descriptor);
}
@Nullable
public static String getExternalModuleName(@NotNull DeclarationDescriptor descriptor) {
if (KotlinBuiltIns.isBuiltIn(descriptor)) return Namer.KOTLIN_LOWER_NAME;
PsiElement element = descriptorToDeclaration(descriptor);
if (element == null && descriptor instanceof PropertyAccessorDescriptor) {
element = descriptorToDeclaration(((PropertyAccessorDescriptor) descriptor).getCorrespondingProperty());
}
if (element == null) return getModuleNameFromDescriptorName(descriptor);
return element.getContainingFile().getUserData(LibrarySourcesConfig.EXTERNAL_MODULE_NAME);
ModuleDescriptor moduleDescriptor = DescriptorUtils.getContainingModule(findRealInlineDeclaration(descriptor));
String moduleName = moduleDescriptor.getName().asString();
return moduleName.substring(1, moduleName.length() - 1);
}
@NotNull
@@ -210,13 +191,6 @@ public final class JsDescriptorUtils {
return null;
}
private static String getModuleNameFromDescriptorName(@NotNull DeclarationDescriptor descriptor) {
ModuleDescriptor moduleDescriptor = DescriptorUtils.getContainingModule(findRealInlineDeclaration(descriptor));
String moduleName = moduleDescriptor.getName().asString();
return moduleName.substring(1, moduleName.length() - 1);
}
public static boolean isImmediateSubtypeOfError(@NotNull ClassDescriptor descriptor) {
if (!isExceptionClass(descriptor)) return false;
ClassDescriptor superClass = org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getSuperClassOrAny(descriptor);