From 7c041d5c94c740f8083a6eeb72989ab421d98720 Mon Sep 17 00:00:00 2001
From: Agnieszka Paszek <lina2002@go2.pl>
Date: Fri, 15 Feb 2013 18:00:25 +0100
Subject: [PATCH] Added quickfix for PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT

---
 idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java  | 1 +
 .../afterProjectionOnNonClassTypeArgument1.kt               | 6 ++++++
 .../afterProjectionOnNonClassTypeArgument2.kt               | 6 ++++++
 .../beforeProjectionOnNonClassTypeArgument1.kt              | 6 ++++++
 .../beforeProjectionOnNonClassTypeArgument2.kt              | 6 ++++++
 5 files changed, 25 insertions(+)
 create mode 100644 idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument1.kt
 create mode 100644 idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument2.kt
 create mode 100644 idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument1.kt
 create mode 100644 idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument2.kt

diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
index 868ad7e50d2..f1775739d68 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
@@ -203,6 +203,7 @@ public class QuickFixes {
         factories.put(NESTED_CLASS_NOT_ALLOWED, AddModifierFix.createFactory(INNER_KEYWORD));
 
         factories.put(CONFLICTING_PROJECTION, RemoveModifierFix.createRemoveProjectionFactory(false));
+        factories.put(PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT, RemoveModifierFix.createRemoveProjectionFactory(false));
 
         factories.put(NOT_AN_ANNOTATION_CLASS, MakeClassAnAnnotationClassFix.createFactory());
 
diff --git a/idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument1.kt b/idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument1.kt
new file mode 100644
index 00000000000..9c334dfde6d
--- /dev/null
+++ b/idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument1.kt
@@ -0,0 +1,6 @@
+// "Remove 'out' modifier" "true"
+fun foo<T>(x : T) {}
+
+fun bar() {
+    foo<Int>(44)
+}
diff --git a/idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument2.kt b/idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument2.kt
new file mode 100644
index 00000000000..82c02bada2a
--- /dev/null
+++ b/idea/testData/quickfix/typeProjection/afterProjectionOnNonClassTypeArgument2.kt
@@ -0,0 +1,6 @@
+// "Remove 'in' modifier" "true"
+class A<T> {}
+
+class B {
+    var foo = A<<caret>Int>()
+}
diff --git a/idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument1.kt b/idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument1.kt
new file mode 100644
index 00000000000..8f45686d3d8
--- /dev/null
+++ b/idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument1.kt
@@ -0,0 +1,6 @@
+// "Remove 'out' modifier" "true"
+fun foo<T>(x : T) {}
+
+fun bar() {
+    foo<<caret>out Int>(44)
+}
diff --git a/idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument2.kt b/idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument2.kt
new file mode 100644
index 00000000000..92f33188295
--- /dev/null
+++ b/idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument2.kt
@@ -0,0 +1,6 @@
+// "Remove 'in' modifier" "true"
+class A<T> {}
+
+class B {
+    var foo = A<<caret>in Int>()
+}