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

Fix source compatibility with 183 platform

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-08-02 22:44:33 +03:00
parent 57963d2e03
commit c7a00971fe
11 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/internal/SearchNotPropertyCandidatesAction.kt
+1 -1
View File
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
class SearchNotPropertyCandidatesAction : AnAction() {
override fun actionPerformed(e: AnActionEvent?) {
override fun actionPerformed(e: AnActionEvent) {
val project = e?.project!!
val psiFile = e.getData(CommonDataKeys.PSI_FILE) as? KtFile ?: return
idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/AbstractCompletionBenchmarkAction.kt
+2 -2
View File
@@ -55,8 +55,8 @@ import javax.swing.JFileChooser
import javax.swing.JPanel
abstract class AbstractCompletionBenchmarkAction : AnAction() {
override fun actionPerformed(e: AnActionEvent?) {
val project = e?.project ?: return
override fun actionPerformed(e: AnActionEvent) {
val project = e.project ?: return
val benchmarkSink = CompletionBenchmarkSink.enableAndGet()
val scenario = createBenchmarkScenario(project, benchmarkSink) ?: return
idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/HighlightingBenchmarkAction.kt
+2 -2
View File
@@ -46,8 +46,8 @@ import javax.swing.JFileChooser
import kotlin.properties.Delegates
class HighlightingBenchmarkAction : AnAction() {
override fun actionPerformed(e: AnActionEvent?) {
val project = e?.project ?: return
override fun actionPerformed(e: AnActionEvent) {
val project = e.project ?: return
val settings = showSettingsDialog() ?: return
idea/src/org/jetbrains/kotlin/idea/actions/internal/benchmark/TopLevelCompletionBenchmark.kt
+1 -1
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.idea.actions.internal.benchmark
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.DialogBuilder
import com.intellij.psi.PsiWhiteSpace
@@ -66,7 +67,6 @@ class TopLevelCompletionBenchmarkAction : AbstractCompletionBenchmarkAction() {
return TopLevelCompletionBenchmarkScenario(ktFiles, settings, project, benchmarkSink, random)
}
data class Settings(val seed: Long, val lines: Int, val files: Int)
private fun showSettingsDialog(): Settings? {
idea/src/org/jetbrains/kotlin/idea/migration/CodeMigrationAction.kt
+2 -2
View File
@@ -8,10 +8,10 @@ package org.jetbrains.kotlin.idea.migration
import com.intellij.openapi.actionSystem.AnActionEvent
class CodeMigrationAction : CodeInspectionAction("Code Migration", "Code migration") {
override fun update(e: AnActionEvent?) {
override fun update(e: AnActionEvent) {
super.update(e)
val project = e?.project
val project = e.project
if (project != null) {
e.presentation.isEnabledAndVisible = CodeMigrationToggleAction.isEnabled(project)
}