Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
baaa3ef5
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
baaa3ef5
编写于
10月 11, 2015
作者:
A
Alexander Udalov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove KotlinSignature annotations from project code
上级
b378969a
变更
36
隐藏空白更改
内联
并排
Showing
36 changed file
with
7 addition
and
370 deletion
+7
-370
annotations/com/android/tools/idea/gradle/output/parser/annotations.xml
...m/android/tools/idea/gradle/output/parser/annotations.xml
+0
-9
annotations/com/intellij/codeInsight/editorActions/annotations.xml
...ns/com/intellij/codeInsight/editorActions/annotations.xml
+0
-27
annotations/com/intellij/codeInsight/intention/annotations.xml
...ations/com/intellij/codeInsight/intention/annotations.xml
+0
-6
annotations/com/intellij/codeInsight/lookup/annotations.xml
annotations/com/intellij/codeInsight/lookup/annotations.xml
+0
-6
annotations/com/intellij/codeInsight/unwrap/annotations.xml
annotations/com/intellij/codeInsight/unwrap/annotations.xml
+0
-6
annotations/com/intellij/codeInspection/annotations.xml
annotations/com/intellij/codeInspection/annotations.xml
+0
-5
annotations/com/intellij/debugger/actions/annotations.xml
annotations/com/intellij/debugger/actions/annotations.xml
+0
-6
annotations/com/intellij/debugger/engine/annotations.xml
annotations/com/intellij/debugger/engine/annotations.xml
+0
-7
annotations/com/intellij/ide/hierarchy/annotations.xml
annotations/com/intellij/ide/hierarchy/annotations.xml
+0
-16
annotations/com/intellij/ide/hierarchy/type/annotations.xml
annotations/com/intellij/ide/hierarchy/type/annotations.xml
+0
-8
annotations/com/intellij/ide/util/treeView/smartTree/annotations.xml
.../com/intellij/ide/util/treeView/smartTree/annotations.xml
+0
-8
annotations/com/intellij/openapi/util/annotations.xml
annotations/com/intellij/openapi/util/annotations.xml
+0
-15
annotations/com/intellij/platform/annotations.xml
annotations/com/intellij/platform/annotations.xml
+0
-6
annotations/com/intellij/psi/search/searches/annotations.xml
annotations/com/intellij/psi/search/searches/annotations.xml
+0
-13
annotations/com/intellij/refactoring/annotations.xml
annotations/com/intellij/refactoring/annotations.xml
+0
-6
annotations/com/intellij/refactoring/move/annotations.xml
annotations/com/intellij/refactoring/move/annotations.xml
+0
-7
annotations/com/intellij/refactoring/move/moveFilesOrDirectories/annotations.xml
...j/refactoring/move/moveFilesOrDirectories/annotations.xml
+0
-7
annotations/com/intellij/refactoring/rename/annotations.xml
annotations/com/intellij/refactoring/rename/annotations.xml
+0
-14
annotations/com/intellij/refactoring/safeDelete/annotations.xml
...tions/com/intellij/refactoring/safeDelete/annotations.xml
+0
-98
annotations/com/intellij/testFramework/fixtures/annotations.xml
...tions/com/intellij/testFramework/fixtures/annotations.xml
+0
-5
annotations/com/intellij/ui/classFilter/annotations.xml
annotations/com/intellij/ui/classFilter/annotations.xml
+0
-8
annotations/com/intellij/xdebugger/settings/annotations.xml
annotations/com/intellij/xdebugger/settings/annotations.xml
+0
-9
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/MethodTransformer.java
...n/codegen/optimization/transformer/MethodTransformer.java
+1
-5
compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallElement.java
...frontend/src/org/jetbrains/kotlin/psi/JetCallElement.java
+0
-2
compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java
...tend/src/org/jetbrains/kotlin/resolve/BindingContext.java
+0
-3
compiler/testData/codegen/notNullAssertions/A.java
compiler/testData/codegen/notNullAssertions/A.java
+0
-6
core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java
.../org/jetbrains/kotlin/descriptors/CallableDescriptor.java
+0
-3
core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptor.java
...g/jetbrains/kotlin/descriptors/DeclarationDescriptor.java
+1
-2
core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorVisitor.java
...ains/kotlin/descriptors/DeclarationDescriptorVisitor.java
+0
-4
core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
...tors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
+0
-35
core/descriptors/src/org/jetbrains/kotlin/types/JetType.java
core/descriptors/src/org/jetbrains/kotlin/types/JetType.java
+2
-3
core/util.runtime/src/org/jetbrains/kotlin/utils/DFS.java
core/util.runtime/src/org/jetbrains/kotlin/utils/DFS.java
+0
-4
idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java
...jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java
+0
-2
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java
...n/idea/refactoring/safeDelete/KotlinOverridingDialog.java
+3
-4
idea/testData/editor/quickDoc/JavaMethodUsedInKotlin_Data.java
...testData/editor/quickDoc/JavaMethodUsedInKotlin_Data.java
+0
-3
js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java
...tlin/js/translate/declaration/DeclarationBodyVisitor.java
+0
-2
未找到文件。
annotations/com/android/tools/idea/gradle/output/parser/annotations.xml
已删除
100644 → 0
浏览文件 @
b378969a
<root>
<item
name=
'com.android.tools.idea.gradle.output.parser.PatternAwareOutputParser boolean parse(java.lang.String, com.android.tools.idea.gradle.output.parser.OutputLineReader, java.util.List<com.android.tools.idea.gradle.output.GradleMessage>)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun parse(line: String, reader: OutputLineReader, messages: MutableList<GradleMessage>): Boolean""
/>
</annotation>
</item>
</root>
\ No newline at end of file
annotations/com/intellij/codeInsight/editorActions/annotations.xml
浏览文件 @
baaa3ef5
...
...
@@ -19,13 +19,6 @@
name=
'com.intellij.codeInsight.editorActions.CopyPastePostProcessor T extractTransferableData(java.awt.datatransfer.Transferable) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.codeInsight.editorActions.CopyPastePostProcessor java.util.List<T> collectTransferableData(com.intellij.psi.PsiFile, com.intellij.openapi.editor.Editor, int[], int[])'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun collectTransferableData(file: PsiFile, editor: Editor, startOffsets: IntArray, endOffsets: IntArray): List<T>""
/>
</annotation>
</item>
<item
name=
'com.intellij.codeInsight.editorActions.CopyPastePostProcessor java.util.List<T> collectTransferableData(com.intellij.psi.PsiFile, com.intellij.openapi.editor.Editor, int[], int[]) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
@@ -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'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.codeInsight.editorActions.CopyPastePostProcessor java.util.List<T> extractTransferableData(java.awt.datatransfer.Transferable)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun extractTransferableData(content: Transferable): List<T>""
/>
</annotation>
</item>
<item
name=
'com.intellij.codeInsight.editorActions.CopyPastePostProcessor java.util.List<T> extractTransferableData(java.awt.datatransfer.Transferable) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
@@ -171,13 +158,6 @@
<item
name=
'com.intellij.codeInsight.editorActions.ExtendWordSelectionHandler boolean canSelect(com.intellij.psi.PsiElement) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.codeInsight.editorActions.ExtendWordSelectionHandler java.util.List<com.intellij.openapi.util.TextRange> select(com.intellij.psi.PsiElement, java.lang.CharSequence, int, com.intellij.openapi.editor.Editor)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List<TextRange>?""
/>
</annotation>
</item>
<item
name=
'com.intellij.codeInsight.editorActions.ExtendWordSelectionHandler java.util.List<com.intellij.openapi.util.TextRange> select(com.intellij.psi.PsiElement, java.lang.CharSequence, int, com.intellij.openapi.editor.Editor) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
@@ -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'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase java.util.List<com.intellij.openapi.util.TextRange> select(com.intellij.psi.PsiElement, java.lang.CharSequence, int, com.intellij.openapi.editor.Editor)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun select(e: PsiElement, editorText: CharSequence, cursorOffset: Int, editor: Editor): List<TextRange>?""
/>
</annotation>
</item>
<item
name=
'com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase java.util.List<com.intellij.openapi.util.TextRange> select(com.intellij.psi.PsiElement, java.lang.CharSequence, int, com.intellij.openapi.editor.Editor) 3'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
annotations/com/intellij/codeInsight/intention/annotations.xml
浏览文件 @
baaa3ef5
<root>
<item
name=
'com.intellij.codeInsight.intention.IntentionAction boolean isAvailable(com.intellij.openapi.project.Project, com.intellij.openapi.editor.Editor, com.intellij.psi.PsiFile)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun isAvailable(project: Project, editor: Editor, file: PsiFile): Boolean""
/>
</annotation>
</item>
<item
name=
'com.intellij.codeInsight.intention.PsiElementBaseIntentionAction boolean isAvailable(com.intellij.openapi.project.Project, com.intellij.openapi.editor.Editor, com.intellij.psi.PsiElement) 1'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
annotations/com/intellij/codeInsight/lookup/annotations.xml
浏览文件 @
baaa3ef5
...
...
@@ -93,12 +93,6 @@
name=
'com.intellij.codeInsight.lookup.LookupElementDecorator void renderElement(com.intellij.codeInsight.lookup.LookupElementPresentation) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.codeInsight.lookup.LookupElementRenderer void renderElement(T, com.intellij.codeInsight.lookup.LookupElementPresentation)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun renderElement(element: T?, presentation: LookupElementPresentation): Unit""
/>
</annotation>
</item>
<item
name=
'com.intellij.codeInsight.lookup.LookupElementRenderer void renderElement(T, com.intellij.codeInsight.lookup.LookupElementPresentation) 1'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
annotations/com/intellij/codeInsight/unwrap/annotations.xml
浏览文件 @
baaa3ef5
...
...
@@ -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>)'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.codeInsight.unwrap.ScopeHighlighter ScopeHighlighter(com.intellij.openapi.editor.Editor, com.intellij.util.NotNullFunction<com.intellij.psi.PsiElement,com.intellij.openapi.util.TextRange>)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun ScopeHighlighter(editor: Editor, ranger: NotNullFunction<PsiElement, TextRange>?)""
/>
</annotation>
</item>
<item
name=
'com.intellij.codeInsight.unwrap.ScopeHighlighter void highlight(com.intellij.psi.PsiElement, java.util.List<com.intellij.psi.PsiElement>) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
annotations/com/intellij/codeInspection/annotations.xml
浏览文件 @
baaa3ef5
<root>
<item
name=
'com.intellij.codeInspection.InspectionToolProvider java.lang.Class[] getInspectionClasses()'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun getInspectionClasses(): Array<Class<out Any?>>""
/>
</annotation>
</item>
<item
name=
'com.intellij.codeInspection.SuppressIntentionAction EMPTY_ARRAY'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
...
...
annotations/com/intellij/debugger/actions/annotations.xml
浏览文件 @
baaa3ef5
<root>
<item
name=
'com.intellij.debugger.actions.JvmSmartStepIntoHandler java.util.List<com.intellij.debugger.actions.SmartStepTarget> findSmartStepTargets(com.intellij.debugger.SourcePosition)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun findSmartStepTargets(position: SourcePosition): List<SmartStepTarget>""
/>
</annotation>
</item>
<item
name=
'com.intellij.debugger.actions.JvmSmartStepIntoHandler java.util.List<com.intellij.debugger.actions.SmartStepTarget> findSmartStepTargets(com.intellij.debugger.SourcePosition) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
annotations/com/intellij/debugger/engine/annotations.xml
浏览文件 @
baaa3ef5
...
...
@@ -2,13 +2,6 @@
<item
name=
'com.intellij.debugger.engine.DebugProcessImpl com.intellij.debugger.jdi.VirtualMachineProxyImpl getVirtualMachineProxy()'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.debugger.engine.FrameExtraVariablesProvider java.util.Set<com.intellij.debugger.engine.evaluation.TextWithImports> collectVariables(com.intellij.debugger.SourcePosition, com.intellij.debugger.engine.evaluation.EvaluationContext, java.util.Set<java.lang.String>)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun collectVariables(sourcePosition: SourcePosition?, evalContext: EvaluationContext?, alreadyCollected: Set<String>?): Set<TextWithImports>?""
/>
</annotation>
</item>
<item
name=
'com.intellij.debugger.engine.MethodFilter boolean locationMatches(com.intellij.debugger.engine.DebugProcessImpl, com.sun.jdi.Location) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
annotations/com/intellij/ide/hierarchy/annotations.xml
浏览文件 @
baaa3ef5
...
...
@@ -8,23 +8,7 @@
<item
name=
'com.intellij.ide.hierarchy.HierarchyBrowserBaseEx myBuilders'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.ide.hierarchy.HierarchyBrowserBaseEx void createTrees(java.util.Map<java.lang.String,javax.swing.JTree>)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun createTrees(trees: MutableMap<String, JTree>): Unit""
/>
</annotation>
</item>
<item
name=
'com.intellij.ide.hierarchy.HierarchyBrowserBaseEx void prependActions(com.intellij.openapi.actionSystem.DefaultActionGroup)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun prependActions(actionGroup: DefaultActionGroup): Unit""
/>
</annotation>
</item>
<item
name=
'com.intellij.ide.hierarchy.HierarchyNodeDescriptor myHighlightedText'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.ide.hierarchy.HierarchyProvider com.intellij.ide.hierarchy.HierarchyBrowser createHierarchyBrowser(com.intellij.psi.PsiElement)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun createHierarchyBrowser(target: PsiElement): HierarchyBrowser""
/>
</annotation>
</item>
</root>
\ No newline at end of file
annotations/com/intellij/ide/hierarchy/type/annotations.xml
已删除
100644 → 0
浏览文件 @
b378969a
<root>
<item
name=
'com.intellij.ide.hierarchy.type.TypeHierarchyBrowser void prependActions(com.intellij.openapi.actionSystem.DefaultActionGroup)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun prependActions(actionGroup: DefaultActionGroup): Unit""
/>
</annotation>
</item>
</root>
\ No newline at end of file
annotations/com/intellij/ide/util/treeView/smartTree/annotations.xml
已删除
100644 → 0
浏览文件 @
b378969a
<root>
<item
name=
'com.intellij.ide.util.treeView.smartTree.NodeProvider java.util.Collection<T> provideNodes(com.intellij.ide.util.treeView.smartTree.TreeElement)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun provideNodes(node: TreeElement): Collection<T>""
/>
</annotation>
</item>
</root>
\ No newline at end of file
annotations/com/intellij/openapi/util/annotations.xml
浏览文件 @
baaa3ef5
...
...
@@ -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>)'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.openapi.util.Key T get(com.intellij.openapi.util.UserDataHolder, T)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun get(holder: UserDataHolder?, defaultValue: T): T""
/>
</annotation>
</item>
<item
name=
'com.intellij.openapi.util.Key com.intellij.openapi.util.Key<T> create(java.lang.String)'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.openapi.util.Pair A getFirst()'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun getFirst(): A""
/>
</annotation>
</item>
<item
name=
'com.intellij.openapi.util.Pair B getSecond()'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun getSecond(): B""
/>
</annotation>
</item>
</root>
\ No newline at end of file
annotations/com/intellij/platform/annotations.xml
浏览文件 @
baaa3ef5
<root>
<item
name=
'com.intellij.platform.ProjectTemplatesFactory com.intellij.platform.ProjectTemplate[] createTemplates(java.lang.String, com.intellij.ide.util.projectWizard.WizardContext)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun createTemplates(group: String, context: WizardContext?): Array<out ProjectTemplate>""
/>
</annotation>
</item>
<item
name=
'com.intellij.platform.ProjectTemplatesFactory com.intellij.platform.ProjectTemplate[] createTemplates(java.lang.String, com.intellij.ide.util.projectWizard.WizardContext) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
annotations/com/intellij/psi/search/searches/annotations.xml
浏览文件 @
baaa3ef5
...
...
@@ -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)'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.psi.search.searches.ReferencesSearch com.intellij.util.Query<com.intellij.psi.PsiReference> search(com.intellij.psi.PsiElement)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun search(element: PsiElement): Query<PsiReference>""
/>
</annotation>
</item>
<item
name=
'com.intellij.psi.search.searches.ReferencesSearch com.intellij.util.Query<com.intellij.psi.PsiReference> search(com.intellij.psi.PsiElement, com.intellij.psi.search.SearchScope)'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun search(element: PsiElement, searchScope: SearchScope): Query<PsiReference>""
/>
</annotation>
</item>
<item
name=
'com.intellij.psi.search.searches.ReferencesSearch com.intellij.util.Query<com.intellij.psi.PsiReference> search(com.intellij.psi.PsiElement, com.intellij.psi.search.SearchScope, boolean)'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun search(element: PsiElement, searchScope: SearchScope, ignoreAccessScope: Boolean): Query<PsiReference>""
/>
</annotation>
</item>
<item
name=
'com.intellij.psi.search.searches.ReferencesSearch com.intellij.util.Query<com.intellij.psi.PsiReference> search(com.intellij.psi.search.searches.ReferencesSearch.SearchParameters)'
>
...
...
annotations/com/intellij/refactoring/annotations.xml
浏览文件 @
baaa3ef5
<root>
<item
name=
'com.intellij.refactoring.BaseRefactoringProcessor boolean preprocessUsages(com.intellij.openapi.util.Ref<com.intellij.usageView.UsageInfo[]>)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun preprocessUsages(refUsages: Ref<Array<UsageInfo>>): Boolean""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.BaseRefactoringProcessor myProject'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
...
...
annotations/com/intellij/refactoring/move/annotations.xml
浏览文件 @
baaa3ef5
...
...
@@ -7,13 +7,6 @@
name=
'com.intellij.refactoring.move.MoveHandlerDelegate boolean isValidTarget(com.intellij.psi.PsiElement, com.intellij.psi.PsiElement[]) 1'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.refactoring.move.MoveHandlerDelegate boolean tryToMove(com.intellij.psi.PsiElement, com.intellij.openapi.project.Project, com.intellij.openapi.actionSystem.DataContext, com.intellij.psi.PsiReference, com.intellij.openapi.editor.Editor)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun tryToMove(element: PsiElement, project: Project, dataContext: DataContext?, reference: PsiReference?, editor: Editor?): Boolean""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.move.MoveHandlerDelegate com.intellij.psi.PsiElement[] adjustForMove(com.intellij.openapi.project.Project, com.intellij.psi.PsiElement[], com.intellij.psi.PsiElement) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
annotations/com/intellij/refactoring/move/moveFilesOrDirectories/annotations.xml
浏览文件 @
baaa3ef5
<root>
<item
name=
'com.intellij.refactoring.move.moveFilesOrDirectories.MoveFileHandler java.util.List<com.intellij.usageView.UsageInfo> findUsages(com.intellij.psi.PsiFile, com.intellij.psi.PsiDirectory, boolean, boolean)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun findUsages(psiFile: PsiFile, newParent: PsiDirectory, searchInComments: Boolean, searchInNonJavaFiles: Boolean): List<UsageInfo>?""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.move.moveFilesOrDirectories.MoveFileHandler void prepareMovedFile(com.intellij.psi.PsiFile, com.intellij.psi.PsiDirectory, java.util.Map<com.intellij.psi.PsiElement,com.intellij.psi.PsiElement>) 0'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
annotations/com/intellij/refactoring/rename/annotations.xml
浏览文件 @
baaa3ef5
<root>
<item
name=
'com.intellij.refactoring.rename.RenamePsiElementProcessor void findCollisions(com.intellij.psi.PsiElement, java.lang.String, java.util.Map<? extends com.intellij.psi.PsiElement,java.lang.String>, java.util.List<com.intellij.usageView.UsageInfo>)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun findCollisions(element: PsiElement?, newName: String?, allRenames: Map<out PsiElement?, String>, result: MutableList<UsageInfo>): Unit""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.rename.RenamePsiElementProcessor void findCollisions(com.intellij.psi.PsiElement, java.lang.String, java.util.Map<? extends com.intellij.psi.PsiElement,java.lang.String>, java.util.List<com.intellij.usageView.UsageInfo>) 2'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
@@ -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'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.refactoring.rename.RenamePsiElementProcessor void prepareRenaming(com.intellij.psi.PsiElement, java.lang.String, java.util.Map<com.intellij.psi.PsiElement,java.lang.String>, com.intellij.psi.search.SearchScope)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun prepareRenaming(element: PsiElement?, newName: String?, allRenames: MutableMap<PsiElement, String>, scope: SearchScope): Unit""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.rename.RenamePsiElementProcessor void prepareRenaming(com.intellij.psi.PsiElement, java.lang.String, java.util.Map<com.intellij.psi.PsiElement,java.lang.String>, com.intellij.psi.search.SearchScope) 2'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
...
...
annotations/com/intellij/refactoring/safeDelete/annotations.xml
已删除
100644 → 0
浏览文件 @
b378969a
<root>
<item
name=
'com.intellij.refactoring.safeDelete.JavaSafeDeleteDelegate void createUsageInfoForParameter(com.intellij.psi.PsiReference, java.util.List<com.intellij.usageView.UsageInfo>, com.intellij.psi.PsiParameter, com.intellij.psi.PsiMethod)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun createUsageInfoForParameter(reference: PsiReference, usages: MutableList<UsageInfo>, parameter: PsiParameter, method: PsiMethod): Unit""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.JavaSafeDeleteProcessor java.util.Collection<? extends com.intellij.psi.PsiElement> getElementsToSearch(com.intellij.psi.PsiElement, com.intellij.openapi.module.Module, java.util.Collection<com.intellij.psi.PsiElement>)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun getElementsToSearch(element: PsiElement, module: Module?, allElementsToDelete: Collection<PsiElement>): Collection<out PsiElement>?""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate boolean handlesElement(com.intellij.psi.PsiElement)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun handlesElement(element: PsiElement): Boolean""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate boolean isToSearchForTextOccurrences(com.intellij.psi.PsiElement)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun isToSearchForTextOccurrences(element: PsiElement): Boolean""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate boolean isToSearchInComments(com.intellij.psi.PsiElement)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun isToSearchInComments(element: PsiElement): Boolean""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate com.intellij.refactoring.safeDelete.NonCodeUsageSearchInfo findUsages(com.intellij.psi.PsiElement, com.intellij.psi.PsiElement[], java.util.List<com.intellij.usageView.UsageInfo>)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun findUsages(element: PsiElement, allElementsToDelete: Array<out PsiElement>, result: MutableList<UsageInfo>): NonCodeUsageSearchInfo?""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate com.intellij.usageView.UsageInfo[] preprocessUsages(com.intellij.openapi.project.Project, com.intellij.usageView.UsageInfo[])'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun preprocessUsages(project: Project, usages: Array<out UsageInfo>): Array<UsageInfo>?""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate java.util.Collection<? extends com.intellij.psi.PsiElement> getElementsToSearch(com.intellij.psi.PsiElement, java.util.Collection<com.intellij.psi.PsiElement>)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun getElementsToSearch(element: PsiElement, allElementsToDelete: Collection<PsiElement>): Collection<out PsiElement>?""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate java.util.Collection<com.intellij.psi.PsiElement> getAdditionalElementsToDelete(com.intellij.psi.PsiElement, java.util.Collection<com.intellij.psi.PsiElement>, boolean)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun getAdditionalElementsToDelete(element: PsiElement, allElementsToDelete: Collection<PsiElement>, askUser: Boolean): MutableCollection<PsiElement>?""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate java.util.Collection<java.lang.String> findConflicts(com.intellij.psi.PsiElement, com.intellij.psi.PsiElement[])'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun findConflicts(element: PsiElement, allElementsToDelete: Array<out PsiElement>): MutableCollection<String>?""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate void prepareForDeletion(com.intellij.psi.PsiElement)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun prepareForDeletion(element: PsiElement): Unit""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate void setToSearchForTextOccurrences(com.intellij.psi.PsiElement, boolean)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun setToSearchForTextOccurrences(element: PsiElement, enabled: Boolean): Unit""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegate void setToSearchInComments(com.intellij.psi.PsiElement, boolean)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun setToSearchInComments(element: PsiElement, enabled: Boolean): Unit""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegateBase java.util.Collection<? extends com.intellij.psi.PsiElement> getElementsToSearch(com.intellij.psi.PsiElement, com.intellij.openapi.module.Module, java.util.Collection<com.intellij.psi.PsiElement>)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun getElementsToSearch(element: PsiElement, module: Module?, allElementsToDelete: Collection<PsiElement>): Collection<out PsiElement>?""
/>
</annotation>
</item>
<item
name=
'com.intellij.refactoring.safeDelete.SafeDeleteProcessorDelegateBase java.util.Collection<? extends com.intellij.psi.PsiElement> getElementsToSearch(com.intellij.psi.PsiElement, java.util.Collection<com.intellij.psi.PsiElement>)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun getElementsToSearch(element: PsiElement, allElementsToDelete: Collection<PsiElement>): Collection<out PsiElement>?""
/>
</annotation>
</item>
</root>
\ No newline at end of file
annotations/com/intellij/testFramework/fixtures/annotations.xml
浏览文件 @
baaa3ef5
...
...
@@ -6,11 +6,6 @@
name=
'com.intellij.testFramework.fixtures.CodeInsightTestFixture com.intellij.openapi.vfs.VirtualFile copyDirectoryToProject(java.lang.String, java.lang.String)'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
<item
name=
'com.intellij.testFramework.fixtures.CodeInsightTestFixture void assertPreferredCompletionItems(int, java.lang.String...)'
>
<annotation
name=
'jet.runtime.typeinfo.KotlinSignature'
>
<val
name=
"value"
val=
""fun assertPreferredCompletionItems(selected: Int, vararg expected: String)""
/>
</annotation>
</item>
<item
name=
'com.intellij.testFramework.fixtures.IdeaProjectTestFixture com.intellij.openapi.project.Project getProject()'
>
<annotation
name=
'org.jetbrains.annotations.NotNull'
/>
</item>
...
...
annotations/com/intellij/ui/classFilter/annotations.xml
已删除
100644 → 0
浏览文件 @
b378969a
<root>
<item
name=
'com.intellij.ui.classFilter.DebuggerClassFilterProvider java.util.List<com.intellij.ui.classFilter.ClassFilter> getFilters()'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun getFilters(): List<ClassFilter>?""
/>
</annotation>
</item>
</root>
\ No newline at end of file
annotations/com/intellij/xdebugger/settings/annotations.xml
已删除
100644 → 0
浏览文件 @
b378969a
<root>
<item
name=
'com.intellij.xdebugger.settings.XDebuggerSettings java.util.Collection<? extends com.intellij.openapi.options.Configurable> createConfigurables(com.intellij.xdebugger.settings.DebuggerSettingsCategory)'
>
<annotation
name=
'kotlin.jvm.KotlinSignature'
>
<val
name=
"value"
val=
""fun createConfigurables(category: DebuggerSettingsCategory): Collection<out Configurable?>""
/>
</annotation>
</item>
</root>
\ No newline at end of file
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/transformer/MethodTransformer.java
浏览文件 @
baaa3ef5
...
...
@@ -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 <V : Value?> runAnalyzer(analyzer: Analyzer<V>, internalClassName: String, node: MethodNode): Array<Frame<V>?>"
)
@NotNull
protected
static
<
V
extends
Value
>
Frame
<
V
>[]
runAnalyzer
(
@NotNull
Analyzer
<
V
>
analyzer
,
...
...
@@ -38,7 +35,6 @@ public abstract class MethodTransformer {
}
}
@KotlinSignature
(
"fun <V : Value?> analyze(internalClassName: String, node: MethodNode, interpreter: Interpreter<V>): Array<Frame<V>?>"
)
@NotNull
protected
static
<
V
extends
Value
>
Frame
<
V
>[]
analyze
(
@NotNull
String
internalClassName
,
...
...
@@ -48,5 +44,5 @@ public abstract class MethodTransformer {
return
runAnalyzer
(
new
Analyzer
<
V
>(
interpreter
),
internalClassName
,
node
);
}
abstract
public
void
transform
(
@NotNull
String
internalClassName
,
@NotNull
MethodNode
methodNode
);
public
abstract
void
transform
(
@NotNull
String
internalClassName
,
@NotNull
MethodNode
methodNode
);
}
compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallElement.java
浏览文件 @
baaa3ef5
...
...
@@ -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<out ValueArgument>"
)
@NotNull
List
<?
extends
ValueArgument
>
getValueArguments
();
...
...
compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java
浏览文件 @
baaa3ef5
...
...
@@ -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
<
JetReferenceExpression
,
ClassDescriptor
>
SHORT_REFERENCE_TO_COMPANION_OBJECT
=
new
BasicWritableSlice
<
JetReferenceExpression
,
ClassDescriptor
>(
DO_NOTHING
);
@KotlinSignature
(
"val RESOLVED_CALL: WritableSlice<Call, ResolvedCall<out CallableDescriptor>>"
)
WritableSlice
<
Call
,
ResolvedCall
<?>>
RESOLVED_CALL
=
new
BasicWritableSlice
<
Call
,
ResolvedCall
<?>>(
DO_NOTHING
);
WritableSlice
<
ResolvedCall
<?>,
TailRecursionKind
>
TAIL_RECURSION_CALL
=
Slices
.
createSimpleSlice
();
WritableSlice
<
JetElement
,
ConstraintSystemCompleter
>
CONSTRAINT_SYSTEM_COMPLETER
=
new
BasicWritableSlice
<
JetElement
,
ConstraintSystemCompleter
>(
DO_NOTHING
);
WritableSlice
<
JetElement
,
Call
>
CALL
=
new
BasicWritableSlice
<
JetElement
,
Call
>(
DO_NOTHING
);
@KotlinSignature
(
"val AMBIGUOUS_REFERENCE_TARGET: WritableSlice<JetExpression, Collection<DeclarationDescriptor>>"
)
WritableSlice
<
JetExpression
,
Collection
<?
extends
DeclarationDescriptor
>>
AMBIGUOUS_REFERENCE_TARGET
=
new
BasicWritableSlice
<
JetExpression
,
Collection
<?
extends
DeclarationDescriptor
>>(
DO_NOTHING
);
...
...
compiler/testData/codegen/notNullAssertions/A.java
浏览文件 @
baaa3ef5
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
;
}
...
...
core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java
浏览文件 @
baaa3ef5
...
...
@@ -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<TypeParameterDescriptor>"
)
@NotNull
List
<
TypeParameterDescriptor
>
getTypeParameters
();
...
...
@@ -49,7 +47,6 @@ public interface CallableDescriptor extends DeclarationDescriptorWithVisibility,
@Override
CallableDescriptor
substitute
(
@NotNull
TypeSubstitutor
substitutor
);
@KotlinSignature
(
"fun getValueParameters(): List<ValueParameterDescriptor>"
)
@NotNull
List
<
ValueParameterDescriptor
>
getValueParameters
();
...
...
core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptor.java
浏览文件 @
baaa3ef5
...
...
@@ -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 <R, D> accept(visitor: DeclarationDescriptorVisitor<R, D>, data: D): R"
)
<
R
,
D
>
R
accept
(
DeclarationDescriptorVisitor
<
R
,
D
>
visitor
,
D
data
);
void
acceptVoid
(
DeclarationDescriptorVisitor
<
Void
,
Void
>
visitor
);
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorVisitor.java
浏览文件 @
baaa3ef5
...
...
@@ -16,10 +16,7 @@
package
org.jetbrains.kotlin.descriptors
;
import
kotlin.jvm.KotlinSignature
;
public
interface
DeclarationDescriptorVisitor
<
R
,
D
>
{
R
visitPackageFragmentDescriptor
(
PackageFragmentDescriptor
descriptor
,
D
data
);
R
visitPackageViewDescriptor
(
PackageViewDescriptor
descriptor
,
D
data
);
...
...
@@ -32,7 +29,6 @@ public interface DeclarationDescriptorVisitor<R, D> {
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
);
...
...
core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
浏览文件 @
baaa3ef5
...
...
@@ -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<out CallableDescriptor>"
)
public
static
List
<?
extends
CallableDescriptor
>
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
<
CallableDescriptor
,
Boolean
>
handler
)
{
return
DFS
.
dfs
(
Collections
.
singletonList
(
originalDescriptor
),
new
DFS
.
Neighbors
<
CallableDescriptor
>()
{
@NotNull
@Override
public
Iterable
<?
extends
CallableDescriptor
>
getNeighbors
(
CallableDescriptor
current
)
{
return
current
.
getOverriddenDescriptors
();
}
},
new
DFS
.
AbstractNodeHandler
<
CallableDescriptor
,
Boolean
>()
{
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
);
...
...
core/descriptors/src/org/jetbrains/kotlin/types/JetType.java
浏览文件 @
baaa3ef5
...
...
@@ -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 <T : TypeCapability> getCapability(capabilityClass: Class<T>): T?"
)
@Nullable
<
T
extends
TypeCapability
>
T
getCapability
(
@NotNull
Class
<
T
>
capabilityClass
);
...
...
core/util.runtime/src/org/jetbrains/kotlin/utils/DFS.java
浏览文件 @
baaa3ef5
...
...
@@ -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
<
N
,
R
>
{
@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
<
N
>
{
@KotlinSignature
(
"fun getNeighbors(current: N): Iterable<N>"
)
@NotNull
Iterable
<?
extends
N
>
getNeighbors
(
N
current
);
}
...
...
idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java
浏览文件 @
baaa3ef5
...
...
@@ -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<out PsiElement>?"
)
@Nullable
public
static
Collection
<?
extends
PsiElement
>
checkParametersInMethodHierarchy
(
@NotNull
PsiParameter
parameter
)
{
PsiMethod
method
=
(
PsiMethod
)
parameter
.
getDeclarationScope
();
...
...
idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java
浏览文件 @
baaa3ef5
...
...
@@ -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<UsageInfo>"
)
public
Array
List
<
UsageInfo
>
getSelected
()
{
Array
List
<
UsageInfo
>
result
=
new
ArrayList
<
UsageInfo
>();
@
NotNull
public
List
<
UsageInfo
>
getSelected
()
{
List
<
UsageInfo
>
result
=
new
ArrayList
<
UsageInfo
>();
for
(
int
i
=
0
;
i
<
myChecked
.
length
;
i
++)
{
if
(
myChecked
[
i
])
{
result
.
add
(
myOverridingMethods
.
get
(
i
));
...
...
idea/testData/editor/quickDoc/JavaMethodUsedInKotlin_Data.java
浏览文件 @
baaa3ef5
import
jet.runtime.typeinfo.KotlinSignature
;
class
Test
{
/**
* Java Method
*/
@KotlinSignature
(
"fun foo(param: String): Array<out Any>"
)
public
static
Object
[]
foo
(
String
param
)
{
return
new
Object
[
0
];
}
...
...
js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java
浏览文件 @
baaa3ef5
...
...
@@ -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
<
Void
>
{
@KotlinSignature
(
"val result: MutableList<JsPropertyInitializer>"
)
protected
final
List
<
JsPropertyInitializer
>
result
;
protected
final
List
<
JsPropertyInitializer
>
staticResult
;
protected
final
List
<
JsPropertyInitializer
>
enumEntryList
=
new
SmartList
<
JsPropertyInitializer
>();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录