diff --git a/annotations/com/android/tools/idea/gradle/output/parser/annotations.xml b/annotations/com/android/tools/idea/gradle/output/parser/annotations.xml deleted file mode 100644 index 997853125f4..00000000000 --- a/annotations/com/android/tools/idea/gradle/output/parser/annotations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/annotations/com/intellij/codeInsight/editorActions/annotations.xml b/annotations/com/intellij/codeInsight/editorActions/annotations.xml index 59fe9e5fcd9..b56280e0a63 100644 --- a/annotations/com/intellij/codeInsight/editorActions/annotations.xml +++ b/annotations/com/intellij/codeInsight/editorActions/annotations.xml @@ -19,13 +19,6 @@ name='com.intellij.codeInsight.editorActions.CopyPastePostProcessor T extractTransferableData(java.awt.datatransfer.Transferable) 0'> - - - - - @@ -42,12 +35,6 @@ name='com.intellij.codeInsight.editorActions.CopyPastePostProcessor java.util.List<T> collectTransferableData(com.intellij.psi.PsiFile, com.intellij.openapi.editor.Editor, int[], int[]) 3'> - - - - - @@ -171,13 +158,6 @@ - - - - - @@ -210,13 +190,6 @@ name='com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase java.util.List<com.intellij.openapi.util.TextRange> expandToWholeLine(java.lang.CharSequence, com.intellij.openapi.util.TextRange, boolean) 0'> - - - - - diff --git a/annotations/com/intellij/codeInsight/intention/annotations.xml b/annotations/com/intellij/codeInsight/intention/annotations.xml index e715e9e8785..86aad02a30a 100644 --- a/annotations/com/intellij/codeInsight/intention/annotations.xml +++ b/annotations/com/intellij/codeInsight/intention/annotations.xml @@ -1,10 +1,4 @@ - - - - - diff --git a/annotations/com/intellij/codeInsight/lookup/annotations.xml b/annotations/com/intellij/codeInsight/lookup/annotations.xml index 9c0946b6ea6..ad56f92d849 100644 --- a/annotations/com/intellij/codeInsight/lookup/annotations.xml +++ b/annotations/com/intellij/codeInsight/lookup/annotations.xml @@ -93,12 +93,6 @@ name='com.intellij.codeInsight.lookup.LookupElementDecorator void renderElement(com.intellij.codeInsight.lookup.LookupElementPresentation) 0'> - - - - - diff --git a/annotations/com/intellij/codeInsight/unwrap/annotations.xml b/annotations/com/intellij/codeInsight/unwrap/annotations.xml index d1c4ac95a8d..a9e4308ead1 100644 --- a/annotations/com/intellij/codeInsight/unwrap/annotations.xml +++ b/annotations/com/intellij/codeInsight/unwrap/annotations.xml @@ -3,12 +3,6 @@ name='com.intellij.codeInsight.unwrap.RangeSplitter java.util.List<com.intellij.openapi.util.TextRange> split(com.intellij.openapi.util.TextRange, java.util.List<com.intellij.openapi.util.TextRange>)'> - - - - - diff --git a/annotations/com/intellij/codeInspection/annotations.xml b/annotations/com/intellij/codeInspection/annotations.xml index 88e163e023b..72a673705f8 100644 --- a/annotations/com/intellij/codeInspection/annotations.xml +++ b/annotations/com/intellij/codeInspection/annotations.xml @@ -1,9 +1,4 @@ - - - - - diff --git a/annotations/com/intellij/debugger/actions/annotations.xml b/annotations/com/intellij/debugger/actions/annotations.xml index b0e4938b1d5..bc287495079 100644 --- a/annotations/com/intellij/debugger/actions/annotations.xml +++ b/annotations/com/intellij/debugger/actions/annotations.xml @@ -1,10 +1,4 @@ - - - - - diff --git a/annotations/com/intellij/debugger/engine/annotations.xml b/annotations/com/intellij/debugger/engine/annotations.xml index fa2842eab8c..60d5c9b4253 100644 --- a/annotations/com/intellij/debugger/engine/annotations.xml +++ b/annotations/com/intellij/debugger/engine/annotations.xml @@ -2,13 +2,6 @@ - - - - - diff --git a/annotations/com/intellij/ide/hierarchy/annotations.xml b/annotations/com/intellij/ide/hierarchy/annotations.xml index e1446d89acb..17d82ed0b29 100644 --- a/annotations/com/intellij/ide/hierarchy/annotations.xml +++ b/annotations/com/intellij/ide/hierarchy/annotations.xml @@ -8,23 +8,7 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/annotations/com/intellij/ide/hierarchy/type/annotations.xml b/annotations/com/intellij/ide/hierarchy/type/annotations.xml deleted file mode 100644 index c4ea5ef9544..00000000000 --- a/annotations/com/intellij/ide/hierarchy/type/annotations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/annotations/com/intellij/ide/util/treeView/smartTree/annotations.xml b/annotations/com/intellij/ide/util/treeView/smartTree/annotations.xml deleted file mode 100644 index 1b85de98c44..00000000000 --- a/annotations/com/intellij/ide/util/treeView/smartTree/annotations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/annotations/com/intellij/openapi/util/annotations.xml b/annotations/com/intellij/openapi/util/annotations.xml index 9a818132493..ddd5f721b29 100644 --- a/annotations/com/intellij/openapi/util/annotations.xml +++ b/annotations/com/intellij/openapi/util/annotations.xml @@ -3,22 +3,7 @@ name='com.intellij.openapi.util.Conditions com.intellij.openapi.util.Condition<T> or(com.intellij.openapi.util.Condition<T>, com.intellij.openapi.util.Condition<T>)'> - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/annotations/com/intellij/platform/annotations.xml b/annotations/com/intellij/platform/annotations.xml index 4d50b6072ed..34a4f049e87 100644 --- a/annotations/com/intellij/platform/annotations.xml +++ b/annotations/com/intellij/platform/annotations.xml @@ -1,10 +1,4 @@ - - - - - diff --git a/annotations/com/intellij/psi/search/searches/annotations.xml b/annotations/com/intellij/psi/search/searches/annotations.xml index 9a49c51ad91..bd78f677e25 100644 --- a/annotations/com/intellij/psi/search/searches/annotations.xml +++ b/annotations/com/intellij/psi/search/searches/annotations.xml @@ -19,26 +19,13 @@ name='com.intellij.psi.search.searches.OverridingMethodsSearch com.intellij.util.Query<com.intellij.psi.PsiMethod> search(com.intellij.psi.PsiMethod, com.intellij.psi.search.SearchScope, boolean)'> - - - - - - - - - - - diff --git a/annotations/com/intellij/refactoring/annotations.xml b/annotations/com/intellij/refactoring/annotations.xml index 0f8aa80e314..22a0de1e35d 100644 --- a/annotations/com/intellij/refactoring/annotations.xml +++ b/annotations/com/intellij/refactoring/annotations.xml @@ -1,10 +1,4 @@ - - - - - diff --git a/annotations/com/intellij/refactoring/move/annotations.xml b/annotations/com/intellij/refactoring/move/annotations.xml index cedcd6882be..231e4000320 100644 --- a/annotations/com/intellij/refactoring/move/annotations.xml +++ b/annotations/com/intellij/refactoring/move/annotations.xml @@ -7,13 +7,6 @@ name='com.intellij.refactoring.move.MoveHandlerDelegate boolean isValidTarget(com.intellij.psi.PsiElement, com.intellij.psi.PsiElement[]) 1'> - - - - - diff --git a/annotations/com/intellij/refactoring/move/moveFilesOrDirectories/annotations.xml b/annotations/com/intellij/refactoring/move/moveFilesOrDirectories/annotations.xml index 605fb44fd8b..99ae43b418a 100644 --- a/annotations/com/intellij/refactoring/move/moveFilesOrDirectories/annotations.xml +++ b/annotations/com/intellij/refactoring/move/moveFilesOrDirectories/annotations.xml @@ -1,11 +1,4 @@ - - - - - diff --git a/annotations/com/intellij/refactoring/rename/annotations.xml b/annotations/com/intellij/refactoring/rename/annotations.xml index 443386dab53..a2b4d20814d 100644 --- a/annotations/com/intellij/refactoring/rename/annotations.xml +++ b/annotations/com/intellij/refactoring/rename/annotations.xml @@ -1,11 +1,4 @@ - - - - - @@ -22,13 +15,6 @@ name='com.intellij.refactoring.rename.RenamePsiElementProcessor void findExistingNameConflicts(com.intellij.psi.PsiElement, java.lang.String, com.intellij.util.containers.MultiMap<com.intellij.psi.PsiElement,java.lang.String>, java.util.Map<com.intellij.psi.PsiElement,java.lang.String>) 2'> - - - - - diff --git a/annotations/com/intellij/refactoring/safeDelete/annotations.xml b/annotations/com/intellij/refactoring/safeDelete/annotations.xml deleted file mode 100644 index 364c50d8893..00000000000 --- a/annotations/com/intellij/refactoring/safeDelete/annotations.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/annotations/com/intellij/testFramework/fixtures/annotations.xml b/annotations/com/intellij/testFramework/fixtures/annotations.xml index 79625be7be6..fa0a39200a5 100644 --- a/annotations/com/intellij/testFramework/fixtures/annotations.xml +++ b/annotations/com/intellij/testFramework/fixtures/annotations.xml @@ -6,11 +6,6 @@ name='com.intellij.testFramework.fixtures.CodeInsightTestFixture com.intellij.openapi.vfs.VirtualFile copyDirectoryToProject(java.lang.String, java.lang.String)'> - - - - - diff --git a/annotations/com/intellij/ui/classFilter/annotations.xml b/annotations/com/intellij/ui/classFilter/annotations.xml deleted file mode 100644 index 0fc23f66db4..00000000000 --- a/annotations/com/intellij/ui/classFilter/annotations.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/annotations/com/intellij/xdebugger/settings/annotations.xml b/annotations/com/intellij/xdebugger/settings/annotations.xml deleted file mode 100644 index c18942d0d39..00000000000 --- a/annotations/com/intellij/xdebugger/settings/annotations.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/MethodTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/MethodTransformer.java index 62b56f1e72a..45f4acddc5c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/MethodTransformer.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/MethodTransformer.java @@ -16,14 +16,11 @@ package org.jetbrains.kotlin.codegen.optimization.transformer; -import kotlin.jvm.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.org.objectweb.asm.tree.MethodNode; import org.jetbrains.org.objectweb.asm.tree.analysis.*; public abstract class MethodTransformer { - - @KotlinSignature("fun runAnalyzer(analyzer: Analyzer, internalClassName: String, node: MethodNode): Array?>") @NotNull protected static Frame[] runAnalyzer( @NotNull Analyzer analyzer, @@ -38,7 +35,6 @@ public abstract class MethodTransformer { } } - @KotlinSignature("fun analyze(internalClassName: String, node: MethodNode, interpreter: Interpreter): Array?>") @NotNull protected static Frame[] analyze( @NotNull String internalClassName, @@ -48,5 +44,5 @@ public abstract class MethodTransformer { return runAnalyzer(new Analyzer(interpreter), internalClassName, node); } - abstract public void transform(@NotNull String internalClassName, @NotNull MethodNode methodNode); + public abstract void transform(@NotNull String internalClassName, @NotNull MethodNode methodNode); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallElement.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallElement.java index f968dbc8578..39614698f4a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallElement.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallElement.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.psi; -import kotlin.jvm.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -29,7 +28,6 @@ public interface JetCallElement extends JetElement { @Nullable JetValueArgumentList getValueArgumentList(); - @KotlinSignature("fun getValueArguments(): List") @NotNull List getValueArguments(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java index d9e674578aa..bdb28503ccb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.resolve; import com.google.common.collect.ImmutableMap; import com.intellij.psi.PsiElement; -import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; @@ -108,13 +107,11 @@ public interface BindingContext { WritableSlice SHORT_REFERENCE_TO_COMPANION_OBJECT = new BasicWritableSlice(DO_NOTHING); - @KotlinSignature("val RESOLVED_CALL: WritableSlice>") WritableSlice> RESOLVED_CALL = new BasicWritableSlice>(DO_NOTHING); WritableSlice, TailRecursionKind> TAIL_RECURSION_CALL = Slices.createSimpleSlice(); WritableSlice CONSTRAINT_SYSTEM_COMPLETER = new BasicWritableSlice(DO_NOTHING); WritableSlice CALL = new BasicWritableSlice(DO_NOTHING); - @KotlinSignature("val AMBIGUOUS_REFERENCE_TARGET: WritableSlice>") WritableSlice> AMBIGUOUS_REFERENCE_TARGET = new BasicWritableSlice>(DO_NOTHING); diff --git a/compiler/testData/codegen/notNullAssertions/A.java b/compiler/testData/codegen/notNullAssertions/A.java index 631e18c33ac..fefb390887b 100644 --- a/compiler/testData/codegen/notNullAssertions/A.java +++ b/compiler/testData/codegen/notNullAssertions/A.java @@ -1,4 +1,3 @@ -import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; public class A { @@ -8,27 +7,22 @@ public class A { @NotNull public static final String STATIC_NULL = null; - @KotlinSignature("fun foo() : String") public String foo() { return null; } - @KotlinSignature("fun staticFoo() : String") public static String staticFoo() { return null; } - @KotlinSignature("fun plus(a: A) : A") public A plus(A a) { return null; } - @KotlinSignature("fun inc() : A") public A inc() { return null; } - @KotlinSignature("fun get(o: Any) : Any") public Object get(Object o) { return null; } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java index 41dadb70bd6..c14d99e9df1 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.descriptors; -import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.types.JetType; @@ -32,7 +31,6 @@ public interface CallableDescriptor extends DeclarationDescriptorWithVisibility, @Nullable ReceiverParameterDescriptor getDispatchReceiverParameter(); - @KotlinSignature("fun getTypeParameters(): List") @NotNull List getTypeParameters(); @@ -49,7 +47,6 @@ public interface CallableDescriptor extends DeclarationDescriptorWithVisibility, @Override CallableDescriptor substitute(@NotNull TypeSubstitutor substitutor); - @KotlinSignature("fun getValueParameters(): List") @NotNull List getValueParameters(); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptor.java index 33b905c74da..15b3467c78c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptor.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.descriptors; -import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.annotations.Annotated; @@ -38,7 +37,7 @@ public interface DeclarationDescriptor extends Annotated, Named { @Nullable DeclarationDescriptor substitute(@NotNull TypeSubstitutor substitutor); - @KotlinSignature("fun accept(visitor: DeclarationDescriptorVisitor, data: D): R") R accept(DeclarationDescriptorVisitor visitor, D data); + void acceptVoid(DeclarationDescriptorVisitor visitor); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorVisitor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorVisitor.java index c14922815b7..30abe3e37f4 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorVisitor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorVisitor.java @@ -16,10 +16,7 @@ package org.jetbrains.kotlin.descriptors; -import kotlin.jvm.KotlinSignature; - public interface DeclarationDescriptorVisitor { - R visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, D data); R visitPackageViewDescriptor(PackageViewDescriptor descriptor, D data); @@ -32,7 +29,6 @@ public interface DeclarationDescriptorVisitor { R visitClassDescriptor(ClassDescriptor descriptor, D data); - @KotlinSignature("fun visitModuleDeclaration(descriptor: ModuleDescriptor, data: D): R") R visitModuleDeclaration(ModuleDescriptor descriptor, D data); R visitConstructorDescriptor(ConstructorDescriptor constructorDescriptor, D data); diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java index 96664485522..1da08be46fa 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.resolve; import kotlin.CollectionsKt; import kotlin.Unit; -import kotlin.jvm.KotlinSignature; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -499,9 +498,7 @@ public class OverridingUtil { return maxVisibility; } - @NotNull - @KotlinSignature("fun getTopmostOverridenDescriptors(originalDescriptor: CallableDescriptor): List") public static List getTopmostOverridenDescriptors(@NotNull CallableDescriptor originalDescriptor) { return DFS.dfs( Collections.singletonList(originalDescriptor), @@ -525,38 +522,6 @@ public class OverridingUtil { ); } - public static boolean traverseOverridenDescriptors( - @NotNull CallableDescriptor originalDescriptor, - @NotNull final Function1 handler - ) { - return DFS.dfs( - Collections.singletonList(originalDescriptor), - new DFS.Neighbors() { - @NotNull - @Override - public Iterable getNeighbors(CallableDescriptor current) { - return current.getOverriddenDescriptors(); - } - }, - new DFS.AbstractNodeHandler() { - private boolean result = true; - - @Override - public boolean beforeChildren(CallableDescriptor current) { - if (!handler.invoke(current)) { - result = false; - } - return result; - } - - @Override - public Boolean result() { - return result; - } - } - ); - } - public interface DescriptorSink { void addFakeOverride(@NotNull CallableMemberDescriptor fakeOverride); diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/JetType.java b/core/descriptors/src/org/jetbrains/kotlin/types/JetType.java index c7e1ee24c98..2903e2275ce 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/JetType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/JetType.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.types; -import kotlin.jvm.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; @@ -30,7 +29,8 @@ import java.util.List; * @see JetTypeChecker#isSubtypeOf(JetType, JetType) */ public interface JetType extends Annotated { - @NotNull TypeConstructor getConstructor(); + @NotNull + TypeConstructor getConstructor(); @NotNull @ReadOnly @@ -49,7 +49,6 @@ public interface JetType extends Annotated { @Override boolean equals(Object other); - @KotlinSignature("fun getCapability(capabilityClass: Class): T?") @Nullable T getCapability(@NotNull Class capabilityClass); diff --git a/core/util.runtime/src/org/jetbrains/kotlin/utils/DFS.java b/core/util.runtime/src/org/jetbrains/kotlin/utils/DFS.java index 341a83fa77f..46833dcdc57 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/utils/DFS.java +++ b/core/util.runtime/src/org/jetbrains/kotlin/utils/DFS.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.utils; -import kotlin.jvm.KotlinSignature; import org.jetbrains.annotations.NotNull; import java.util.*; @@ -78,17 +77,14 @@ public class DFS { } public interface NodeHandler { - @KotlinSignature("fun beforeChildren(current: N): Boolean") boolean beforeChildren(N current); - @KotlinSignature("fun afterChildren(current: N): Unit") void afterChildren(N current); R result(); } public interface Neighbors { - @KotlinSignature("fun getNeighbors(current: N): Iterable") @NotNull Iterable getNeighbors(N current); } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java index bec97b6e119..0426c4c08bf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java @@ -34,7 +34,6 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.ui.components.JBList; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; -import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.asJava.AsJavaPackage; @@ -260,7 +259,6 @@ public class JetRefactoringUtil { return "class " + classOrObject.getName(); } - @KotlinSignature("fun checkParametersInMethodHierarchy(parameter: PsiParameter): MutableCollection?") @Nullable public static Collection checkParametersInMethodHierarchy(@NotNull PsiParameter parameter) { PsiMethod method = (PsiMethod)parameter.getDeclarationScope(); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java index bf9c62ab3c5..26cc70e7971 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java @@ -31,7 +31,6 @@ import com.intellij.ui.table.JBTable; import com.intellij.usageView.UsageInfo; import com.intellij.usages.UsageViewPresentation; import com.intellij.usages.impl.UsagePreviewPanel; -import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; @@ -119,9 +118,9 @@ class KotlinOverridingDialog extends DialogWrapper { return "#org.jetbrains.kotlin.idea.refactoring.safeDelete.KotlinOverridingDialog"; } - @KotlinSignature("fun getSelected(): ArrayList") - public ArrayList getSelected() { - ArrayList result = new ArrayList(); + @NotNull + public List getSelected() { + List result = new ArrayList(); for (int i = 0; i < myChecked.length; i++) { if (myChecked[i]) { result.add(myOverridingMethods.get(i)); diff --git a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin_Data.java b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin_Data.java index 78844a8228a..11a6e3ac613 100644 --- a/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin_Data.java +++ b/idea/testData/editor/quickDoc/JavaMethodUsedInKotlin_Data.java @@ -1,10 +1,7 @@ -import jet.runtime.typeinfo.KotlinSignature; - class Test { /** * Java Method */ - @KotlinSignature("fun foo(param: String): Array") public static Object[] foo(String param) { return new Object[0]; } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java index 5e44e95ad6e..069c4b8de96 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java @@ -20,7 +20,6 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsFunction; import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer; import com.intellij.util.SmartList; -import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; @@ -44,7 +43,6 @@ import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDe import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getSupertypesWithoutFakes; public class DeclarationBodyVisitor extends TranslatorVisitor { - @KotlinSignature("val result: MutableList") protected final List result; protected final List staticResult; protected final List enumEntryList = new SmartList();