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

201: Update to 201.5985.32

Browse Source
This commit is contained in:
Nikolay Krasko
2020-03-04 12:26:07 +03:00
parent 7c86911f44
commit 1afd3d929a
14 changed files with 134 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/MockExternalAnnotationsManager.kt.201
+62
View File
@@ -0,0 +1,62 @@
/*
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.cli.jvm.compiler
import com.intellij.codeInsight.ExternalAnnotationsManager
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.*
class MockExternalAnnotationsManager : ExternalAnnotationsManager() {
override fun chooseAnnotationsPlace(element: PsiElement): AnnotationPlace = AnnotationPlace.NOWHERE
override fun chooseAnnotationsPlaceNoUi(element: PsiElement): AnnotationPlace = AnnotationPlace.NOWHERE
override fun isExternalAnnotationWritable(listOwner: PsiModifierListOwner, annotationFQN: String): Boolean = false
override fun isExternalAnnotation(annotation: PsiAnnotation): Boolean = false
override fun findExternalAnnotationsFiles(listOwner: PsiModifierListOwner): List<PsiFile>? = null
override fun findExternalAnnotation(listOwner: PsiModifierListOwner, annotationFQN: String): PsiAnnotation? = null
override fun findExternalAnnotations(listOwner: PsiModifierListOwner): Array<out PsiAnnotation>? = null
override fun annotateExternally(
listOwner: PsiModifierListOwner,
annotationFQName: String,
fromFile: PsiFile,
value: Array<out PsiNameValuePair>?
) {
throw UnsupportedOperationException("not implemented")
}
override fun deannotate(listOwner: PsiModifierListOwner, annotationFQN: String): Boolean {
throw UnsupportedOperationException("not implemented")
}
override fun editExternalAnnotation(
listOwner: PsiModifierListOwner,
annotationFQN: String,
value: Array<out PsiNameValuePair>?
): Boolean {
throw UnsupportedOperationException("not implemented")
}
override fun hasAnnotationRootsForFile(file: VirtualFile): Boolean = false
override fun findDefaultConstructorExternalAnnotations(aClass: PsiClass, annotationFQN: String): List<PsiAnnotation> = emptyList()
override fun findDefaultConstructorExternalAnnotations(aClass: PsiClass): List<PsiAnnotation> = emptyList()
override fun findExternalAnnotations(listOwner: PsiModifierListOwner, annotationFQN: String): List<PsiAnnotation> = emptyList()
}
gradle/versions.properties.201
+1 -1
View File
@@ -1,4 +1,4 @@
versions.intellijSdk=201.5259.13-EAP-SNAPSHOT
versions.intellijSdk=201.5985.32-EAP-SNAPSHOT
versions.androidBuildTools=r23.0.1
versions.idea.NodeJS=193.6494.7
versions.jar.asm-all=7.0.1
idea/build.gradle.kts
+6 -2
View File
@@ -91,7 +91,11 @@ dependencies {
compileOnly(commonDep("org.jetbrains", "markdown"))
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("IntelliLang"))
if (Platform[201].orHigher()) {
compileOnly(intellijPluginDep("platform-langInjection"))
} else {
compileOnly(intellijPluginDep("IntelliLang"))
}
compileOnly(intellijPluginDep("copyright"))
compileOnly(intellijPluginDep("properties"))
compileOnly(intellijPluginDep("java-i18n"))
@@ -141,7 +145,7 @@ dependencies {
testRuntime(project(it))
}
testCompile(intellijPluginDep("IntelliLang"))
testCompile(intellijPluginDep(if (Platform[201].orHigher()) "platform-langInjection" else "IntelliLang"))
testCompile(intellijPluginDep("copyright"))
testCompile(intellijPluginDep("properties"))
testCompile(intellijPluginDep("java-i18n"))
idea/idea-android/build.gradle.kts
+5 -1
View File
@@ -59,7 +59,11 @@ dependencies {
testRuntime(intellijPluginDep("coverage"))
testRuntime(intellijPluginDep("gradle"))
testRuntime(intellijPluginDep("Groovy"))
testRuntime(intellijPluginDep("IntelliLang"))
if (Platform[201].orHigher()) {
testRuntime(intellijPluginDep("platform-langInjection"))
} else {
testRuntime(intellijPluginDep("IntelliLang"))
}
testRuntime(intellijPluginDep("java-decompiler"))
testRuntime(intellijPluginDep("java-i18n"))
testRuntime(intellijPluginDep("junit"))
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/kotlinResolverUtil.kt
+1 -1
View File
@@ -27,7 +27,7 @@ fun suggestNativeDebug(projectPath: String) {
val project = ProjectManager.getInstance().openProjects.firstOrNull { it.basePath == projectPath } ?: return
PluginsAdvertiser.NOTIFICATION_GROUP.createNotification(
PluginsAdvertiser.DISPLAY_ID,
"Plugins Suggestion",
"Native Debug provides debugger for Kotlin/Native",
NotificationType.INFORMATION, null
).addAction(object : NotificationAction("Install") {
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/kotlinResolverUtil.kt.192
+1 -1
View File
@@ -26,7 +26,7 @@ fun suggestNativeDebug(projectPath: String) {
val project = ProjectManager.getInstance().openProjects.firstOrNull { it.basePath == projectPath } ?: return
PluginsAdvertiser.NOTIFICATION_GROUP.createNotification(
PluginsAdvertiser.DISPLAY_ID,
"Plugins Suggestion",
"Native Debug provides debugger for Kotlin/Native",
NotificationType.INFORMATION, null
).addAction(object : NotificationAction("Install") {
idea/idea-jvm/build.gradle.kts
+5 -1
View File
@@ -22,7 +22,11 @@ dependencies {
compileOnly(intellijPluginDep("testng"))
compileOnly(intellijPluginDep("coverage"))
compileOnly(intellijPluginDep("java-decompiler"))
compileOnly(intellijPluginDep("IntelliLang"))
if (Platform[201].orHigher()) {
compileOnly(intellijPluginDep("platform-langInjection"))
} else {
compileOnly(intellijPluginDep("IntelliLang"))
}
compileOnly(intellijPluginDep("copyright"))
compileOnly(intellijPluginDep("properties"))
compileOnly(intellijPluginDep("java-i18n"))
idea/resources/META-INF/plugin.xml.201
+1 -1
View File
@@ -13,7 +13,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
<version>@snapshot@</version>
<vendor url="http://www.jetbrains.com">JetBrains</vendor>
<idea-version since-build="201.4515.1" until-build="202.*"/>
<idea-version since-build="201.5985.32" until-build="202.*"/>
<depends>com.intellij.modules.platform</depends>
idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/compat.kt.201
+9 -9
View File
@@ -14,16 +14,16 @@ import com.intellij.psi.PsiMember
import com.intellij.psi.PsiMethod
// BUNCH: 193
typealias HierarchyNodeDescriptor = com.intellij.ide.hierarchy.newAPI.HierarchyNodeDescriptor
typealias HierarchyTreeStructure = com.intellij.ide.hierarchy.newAPI.HierarchyTreeStructure
typealias CallHierarchyBrowserBase = com.intellij.ide.hierarchy.newAPI.CallHierarchyBrowserBase
typealias HierarchyScopeType = com.intellij.ide.hierarchy.newAPI.HierarchyScopeType
typealias HierarchyBrowserBaseEx = com.intellij.ide.hierarchy.newAPI.HierarchyBrowserBaseEx
typealias MethodHierarchyBrowserBase = com.intellij.ide.hierarchy.newAPI.MethodHierarchyBrowserBase
typealias HierarchyNodeDescriptor = com.intellij.ide.hierarchy.HierarchyNodeDescriptor
typealias HierarchyTreeStructure = com.intellij.ide.hierarchy.HierarchyTreeStructure
typealias CallHierarchyBrowserBase = com.intellij.ide.hierarchy.CallHierarchyBrowserBase
typealias HierarchyScopeType = String
typealias HierarchyBrowserBaseEx = com.intellij.ide.hierarchy.HierarchyBrowserBaseEx
typealias MethodHierarchyBrowserBase = com.intellij.ide.hierarchy.MethodHierarchyBrowserBase
fun getCallerTypeCompat() = CallHierarchyBrowserBase.getCallerType()
fun getCalleeTypeCompat() = CallHierarchyBrowserBase.getCalleeType()
fun getMethodTypeCompat() = MethodHierarchyBrowserBase.getMethodType()
fun getCallerTypeCompat(): String = CallHierarchyBrowserBase.CALLER_TYPE
fun getCalleeTypeCompat(): String = CallHierarchyBrowserBase.CALLEE_TYPE
fun getMethodTypeCompat(): String = MethodHierarchyBrowserBase.METHOD_TYPE
fun createCallerMethodsTreeStructure(project: Project, method: PsiMethod, scopeType: String): CallerMethodsTreeStructure {
return CallerMethodsTreeStructure(project, method as PsiMember, scopeType)
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.kt
+1 -2
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.openapi.vfs.VfsUtil
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiFile
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
import com.intellij.util.ArrayUtil
import com.intellij.util.PathUtil
import junit.framework.ComparisonFailure
@@ -343,7 +342,7 @@ abstract class AbstractQuickFixMultiFileTest : KotlinLightCodeInsightFixtureTest
TestCase.fail("Action '$text' is available (but must not) in test $testFilePath")
}
CodeInsightTestFixtureImpl.invokeIntention(action, file, editor, action.text)
invokeIntentionCompat(action, file, editor)
if (!shouldBeAvailableAfterExecution) {
val afterAction = findActionByPattern(pattern, getAvailableActions())
idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt
+16
View File
@@ -0,0 +1,16 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.quickfix
import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiFile
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
// BUNCH: 193
fun invokeIntentionCompat(action: IntentionAction, file: PsiFile, editor: Editor) {
CodeInsightTestFixtureImpl.invokeIntention(action, file, editor, action.text)
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/compat.kt.201
+16
View File
@@ -0,0 +1,16 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.quickfix
import com.intellij.codeInsight.intention.IntentionAction
import com.intellij.openapi.editor.Editor
import com.intellij.psi.PsiFile
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
// BUNCH: 193
fun invokeIntentionCompat(action: IntentionAction, file: PsiFile, editor: Editor) {
CodeInsightTestFixtureImpl.invokeIntention(action, file, editor)
}
j2k/build.gradle.kts
+5 -1
View File
@@ -60,7 +60,11 @@ dependencies {
testRuntime(intellijPluginDep("smali"))
testRuntime(intellijPluginDep("junit"))
testRuntime(intellijPluginDep("testng"))
testRuntime(intellijPluginDep("IntelliLang"))
if (Platform[201].orHigher()) {
testRuntime(intellijPluginDep("platform-langInjection"))
} else {
testRuntime(intellijPluginDep("IntelliLang"))
}
testRuntime(intellijPluginDep("testng"))
testRuntime(intellijPluginDep("copyright"))
testRuntime(intellijPluginDep("properties"))
plugins/android-extensions/android-extensions-idea/build.gradle.kts
+5 -1
View File
@@ -49,7 +49,11 @@ dependencies {
testRuntime(project(":kotlinx-serialization-ide-plugin"))
testRuntime(project(":plugins:lint"))
testRuntime(intellijPluginDep("junit"))
testRuntime(intellijPluginDep("IntelliLang"))
if (Platform[201].orHigher()) {
testRuntime(intellijPluginDep("platform-langInjection"))
} else {
testRuntime(intellijPluginDep("IntelliLang"))
}
testRuntime(intellijPluginDep("properties"))
testRuntime(intellijPluginDep("java-i18n"))
testRuntime(intellijPluginDep("gradle"))