From 0a2f04444a7cf9e23c8d54ca06f56975e04682d4 Mon Sep 17 00:00:00 2001 From: LEPILLER Julien Date: Wed, 15 May 2019 13:21:32 +0200 Subject: [PATCH] Update for newer dependencies. --- build.xml | 181 ++++-------------- .../cli/jvm/compiler/JetCoreEnvironment.java | 24 ++- .../resolve/lazy/IdentitySmartPointer.java | 5 + .../JetCodeBlockModificationListener.java | 2 +- .../asJava/KotlinJavaFileStubProvider.java | 5 +- ...otlinLightClassForExplicitDeclaration.java | 2 +- .../jet/asJava/StubClassBuilder.java | 4 +- .../java/util/concurrent/annotations.xml | 10 - 8 files changed, 71 insertions(+), 162 deletions(-) diff --git a/build.xml b/build.xml index b71942d..1d5f46b 100644 --- a/build.xml +++ b/build.xml @@ -108,52 +108,46 @@ - - + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + + + + + - - - - - + + + + + - - - - - + + - - - - - - - - - - + + + + + @@ -278,109 +272,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (kotlinc.internal.com.intellij.lang.ASTNode); } - - -keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); - } - - -keepclassmembers class * { - ** toString(); - ** hashCode(); - } - ]]> - - + diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java index 880a288..c786c7b 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java @@ -16,6 +16,12 @@ package org.jetbrains.jet.cli.jvm.compiler; +import com.intellij.openapi.fileTypes.PlainTextFileType; +import com.intellij.psi.augment.PsiAugmentProvider; +import com.intellij.psi.compiled.ClassFileDecompilers; +import com.intellij.codeInsight.ContainerProvider; +import com.intellij.lang.jvm.facade.JvmElementProvider; +import com.intellij.psi.PsiElementFinder; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.core.CoreApplicationEnvironment; import com.intellij.core.CoreJavaFileManager; @@ -72,7 +78,15 @@ public class JetCoreEnvironment { this.configuration = configuration.copy(); this.configuration.setReadOnly(true); + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ContainerProvider.EP_NAME, + ContainerProvider.class); + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ClassFileDecompilers.EP_NAME, + ClassFileDecompilers.Decompiler.class); + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), PsiAugmentProvider.EP_NAME, + PsiAugmentProvider.class); + this.applicationEnvironment = new JavaCoreApplicationEnvironment(parentDisposable); + applicationEnvironment.registerFileType(PlainTextFileType.INSTANCE, "xml"); applicationEnvironment.registerFileType(JetFileType.INSTANCE, "kt"); applicationEnvironment.registerFileType(JetFileType.INSTANCE, "kts"); applicationEnvironment.registerFileType(JetFileType.INSTANCE, "ktm"); @@ -81,7 +95,15 @@ public class JetCoreEnvironment { applicationEnvironment.registerParserDefinition(new JavaParserDefinition()); applicationEnvironment.registerParserDefinition(new JetParserDefinition()); - projectEnvironment = new JavaCoreProjectEnvironment(parentDisposable, applicationEnvironment); + projectEnvironment = new JavaCoreProjectEnvironment(parentDisposable, applicationEnvironment) { + @Override + protected void preregisterServices() { + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getArea(myProject), + JvmElementProvider.EP_NAME, JvmElementProvider.class); + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getArea(myProject), + PsiElementFinder.EP_NAME, PsiElementFinder.class); + } + }; MockProject project = projectEnvironment.getProject(); project.registerService(JetScriptDefinitionProvider.class, new JetScriptDefinitionProvider()); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/IdentitySmartPointer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/IdentitySmartPointer.java index dca7927..e5310b3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/IdentitySmartPointer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/IdentitySmartPointer.java @@ -56,4 +56,9 @@ public class IdentitySmartPointer implements SmartPsiEleme public Segment getRange() { return element.getTextRange(); } + + @Override + public Segment getPsiRange() { + return element.getTextRange(); + } } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java index 863ebfd..1d99aaa 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java @@ -55,7 +55,7 @@ public class JetCodeBlockModificationListener implements PsiTreeChangePreprocess case CHILDREN_CHANGED: // general childrenChanged() event after each change - if (!event.isGenericChildrenChange()) { + if (!event.isGenericChange()) { processChange(event.getParent(), event.getParent(), null); } break; diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java index 73ef03d..1b80776 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java @@ -167,7 +167,7 @@ public class KotlinJavaFileStubProvider implements CachedValueProvider visitor) { throw new UnsupportedOperationException("Shall not be called!"); } }; @@ -67,7 +67,7 @@ public class StubClassBuilder extends ClassBuilder { @Override public void defineClass(PsiElement origin, int version, int access, String name, @Nullable String signature, String superName, String[] interfaces) { assert v == null : "defineClass() called twice?"; - v = new StubBuildingVisitor(null, EMPTY_STRATEGY, parent, access); + v = new StubBuildingVisitor(null, EMPTY_STRATEGY, parent, access, name); super.defineClass(origin, version, access, name, signature, superName, interfaces); diff --git a/jdk-annotations/java/util/concurrent/annotations.xml b/jdk-annotations/java/util/concurrent/annotations.xml index a6681b0..c47e09d 100644 --- a/jdk-annotations/java/util/concurrent/annotations.xml +++ b/jdk-annotations/java/util/concurrent/annotations.xml @@ -1,14 +1,4 @@ - - - - - - - - - - -- 2.21.0