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

Now using Kotlin setting instead of Java one

Browse Source
This commit is contained in:
Alexander Podkhalyuzin
2019-11-05 11:57:08 +03:00
parent efaf779133
commit 722f7ff056
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/ActualImportFix.kt
+4 -3
View File
@@ -5,17 +5,18 @@
package org.jetbrains.kotlin.idea.quickfix package org.jetbrains.kotlin.idea.quickfix
import com.intellij.codeInsight.CodeInsightSettings
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.codeInsight.KotlinCodeInsightWorkspaceSettings
import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.psi.KtSimpleNameExpression
internal class ImportFix(expression: KtSimpleNameExpression): AbstractImportFix(expression, MyFactory) { internal class ImportFix(expression: KtSimpleNameExpression): AbstractImportFix(expression, MyFactory) {
override fun fixSilently(editor: Editor): Boolean { override fun fixSilently(editor: Editor): Boolean {
if (!CodeInsightSettings.getInstance().ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY) return false
if (isOutdated()) return false if (isOutdated()) return false
val element = element ?: return false val element = element ?: return false
val addImportAction = createAction(element.project, editor, element) val project = element.project
if (!KotlinCodeInsightWorkspaceSettings.getInstance(project).addUnambiguousImportsOnTheFly) return false
val addImportAction = createAction(project, editor, element)
if (addImportAction.isUnambiguous()) { if (addImportAction.isUnambiguous()) {
addImportAction.execute() addImportAction.execute()
return true return true