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

Move JetCodeFragment-related logic to JetIntentionActionsFactory

Browse Source
This commit is contained in:
Alexey Sedunov
2014-10-29 16:21:31 +03:00
parent 850f1ebccd
commit 59e4325fc0
5 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt
+13 -2
View File
@@ -18,7 +18,18 @@ package org.jetbrains.jet.plugin.quickfix
import com.intellij.codeInsight.intention.IntentionAction
import org.jetbrains.jet.lang.diagnostics.Diagnostic
import org.jetbrains.jet.lang.psi.JetCodeFragment
import java.util.Collections
public trait JetIntentionActionsFactory {
public fun createActions(diagnostic: Diagnostic): List<IntentionAction>
// TODO: Replace with trait when all subclasses are translated to Kotlin
public abstract class JetIntentionActionsFactory {
protected open fun isApplicableForCodeFragment(): Boolean = false
protected abstract fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction>
public fun createActions(diagnostic: Diagnostic): List<IntentionAction> {
if (diagnostic.getPsiElement().getContainingFile() is JetCodeFragment && !isApplicableForCodeFragment()) {
return Collections.emptyList()
}
return doCreateActions(diagnostic)
}
}
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java
+1 -1
View File
@@ -191,7 +191,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction<JetFunction>
return new JetIntentionActionsFactory() {
@NotNull
@Override
public List<IntentionAction> createActions(@NotNull Diagnostic diagnostic) {
protected List<IntentionAction> doCreateActions(@NotNull Diagnostic diagnostic) {
List<IntentionAction> actions = new LinkedList<IntentionAction>();
JetFunction function = QuickFixUtil.getParentElementOfType(diagnostic, JetFunction.class);
idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class ChangeVariableTypeFix extends JetIntentionAction<JetVariableDeclara
return new JetIntentionActionsFactory() {
@NotNull
@Override
public List<IntentionAction> createActions(@NotNull Diagnostic diagnostic) {
protected List<IntentionAction> doCreateActions(@NotNull Diagnostic diagnostic) {
List<IntentionAction> actions = new LinkedList<IntentionAction>();
JetProperty property = QuickFixUtil.getParentElementOfType(diagnostic, JetProperty.class);
idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.kt
+3 -12
View File
@@ -18,20 +18,11 @@ package org.jetbrains.jet.plugin.quickfix
import com.intellij.codeInsight.intention.IntentionAction
import org.jetbrains.jet.lang.diagnostics.Diagnostic
import org.jetbrains.jet.lang.psi.JetCodeFragment
import java.util.Collections
import org.jetbrains.jet.utils.addToStdlib.singletonOrEmptyList
public abstract class JetSingleIntentionActionFactory : JetIntentionActionsFactory {
public abstract fun createAction(diagnostic: Diagnostic): IntentionAction?
public abstract class JetSingleIntentionActionFactory : JetIntentionActionsFactory() {
protected abstract fun createAction(diagnostic: Diagnostic): IntentionAction?
override fun createActions(diagnostic: Diagnostic): List<IntentionAction> {
if (diagnostic.getPsiElement().getContainingFile() is JetCodeFragment && !isApplicableForCodeFragment()) {
return Collections.emptyList()
}
return createAction(diagnostic).singletonOrEmptyList()
}
public fun isApplicableForCodeFragment(): Boolean = false
final override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> = createAction(diagnostic).singletonOrEmptyList()
}
idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java
+2 -2
View File
@@ -36,10 +36,10 @@ import java.util.LinkedList;
import java.util.List;
//TODO: should use change signature to deal with cases of multiple overridden descriptors
public class QuickFixFactoryForTypeMismatchError implements JetIntentionActionsFactory {
public class QuickFixFactoryForTypeMismatchError extends JetIntentionActionsFactory {
@NotNull
@Override
public List<IntentionAction> createActions(@NotNull Diagnostic diagnostic) {
protected List<IntentionAction> doCreateActions(@NotNull Diagnostic diagnostic) {
List<IntentionAction> actions = new LinkedList<IntentionAction>();
DiagnosticWithParameters2<JetExpression, JetType, JetType> diagnosticWithParameters = Errors.TYPE_MISMATCH.cast(diagnostic);