diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt
new file mode 100644
index 00000000000..c54d4a571c9
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt
@@ -0,0 +1,9 @@
+package test
+
+fun foo(n: Int, <caret>f: (Int) -> Unit) {
+    println(n)
+}
+
+fun bar() {
+    foo(10) { n -> println(n) }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt.after b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt.after
new file mode 100644
index 00000000000..350b3da9eac
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt.after
@@ -0,0 +1,9 @@
+package test
+
+fun foo(n: Int) {
+    println(n)
+}
+
+fun bar() {
+    foo(10)
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt
new file mode 100644
index 00000000000..f820d67cfa8
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt
@@ -0,0 +1,9 @@
+package test
+
+fun String.foo(n: Int, <caret>f: (Int) -> Unit) {
+    println(n)
+}
+
+fun bar() {
+    "".foo(10) { n -> println(n) }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt.after b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt.after
new file mode 100644
index 00000000000..a6239eae2c9
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt.after
@@ -0,0 +1,9 @@
+package test
+
+fun String.foo(n: Int) {
+    println(n)
+}
+
+fun bar() {
+    "".foo(10)
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt
new file mode 100644
index 00000000000..aff447251ee
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt
@@ -0,0 +1,7 @@
+package test
+
+class A(val <caret>name: String)
+
+fun bar() {
+    println(A("").name)
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt.messages
new file mode 100644
index 00000000000..2a8da6e9443
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt.messages
@@ -0,0 +1 @@
+method A.getName() has 1 usage that is not safe to delete.
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt
new file mode 100644
index 00000000000..b7510933fb4
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt
@@ -0,0 +1,7 @@
+package test
+
+class A(val <caret>name: String)
+
+fun bar() {
+    println(A(""))
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt.after b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt.after
new file mode 100644
index 00000000000..9c6cfcba117
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt.after
@@ -0,0 +1,7 @@
+package test
+
+class A()
+
+fun bar() {
+    println(A())
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java
new file mode 100644
index 00000000000..d6fc0a00151
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java
@@ -0,0 +1,13 @@
+package test;
+
+class A {
+    void bar() {
+        TestPackage.foo(
+                10, new Function1<Integer, Unit>() {
+                    public Unit invoke(Integer n) {
+                        System.out.println(n);
+                    }
+                }
+        );
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java.after b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java.after
new file mode 100644
index 00000000000..8601f25cef2
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.java.after
@@ -0,0 +1,9 @@
+package test;
+
+class A {
+    void bar() {
+        TestPackage.foo(
+                10
+        );
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt
new file mode 100644
index 00000000000..c54d4a571c9
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt
@@ -0,0 +1,9 @@
+package test
+
+fun foo(n: Int, <caret>f: (Int) -> Unit) {
+    println(n)
+}
+
+fun bar() {
+    foo(10) { n -> println(n) }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt.after b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt.after
new file mode 100644
index 00000000000..350b3da9eac
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt.after
@@ -0,0 +1,9 @@
+package test
+
+fun foo(n: Int) {
+    println(n)
+}
+
+fun bar() {
+    foo(10)
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java
new file mode 100644
index 00000000000..7d0fced67a0
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java
@@ -0,0 +1,13 @@
+package test;
+
+class A {
+    void bar() {
+        TestPackage.foo(
+                "", 10, new Function1<Integer, Unit>() {
+                    public Unit invoke(Integer n) {
+                        System.out.println(n);
+                    }
+                }
+        );
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java.after b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java.after
new file mode 100644
index 00000000000..8cdaf7860c9
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.java.after
@@ -0,0 +1,9 @@
+package test;
+
+class A {
+    void bar() {
+        TestPackage.foo(
+                "", 10
+        );
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt
new file mode 100644
index 00000000000..f820d67cfa8
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt
@@ -0,0 +1,9 @@
+package test
+
+fun String.foo(n: Int, <caret>f: (Int) -> Unit) {
+    println(n)
+}
+
+fun bar() {
+    "".foo(10) { n -> println(n) }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt.after b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt.after
new file mode 100644
index 00000000000..a6239eae2c9
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt.after
@@ -0,0 +1,9 @@
+package test
+
+fun String.foo(n: Int) {
+    println(n)
+}
+
+fun bar() {
+    "".foo(10)
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.java b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.java
new file mode 100644
index 00000000000..21f9e7543b1
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.java
@@ -0,0 +1,7 @@
+package test;
+
+class B {
+    void bar() {
+        System.out.println(new A("").getName());
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt
new file mode 100644
index 00000000000..aff447251ee
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt
@@ -0,0 +1,7 @@
+package test
+
+class A(val <caret>name: String)
+
+fun bar() {
+    println(A("").name)
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt.messages
new file mode 100644
index 00000000000..0c33455c162
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt.messages
@@ -0,0 +1 @@
+method A.getName() has 2 usages that are not safe to delete.
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java
new file mode 100644
index 00000000000..ef265063167
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java
@@ -0,0 +1,7 @@
+package test;
+
+class B {
+    void bar() {
+        System.out.println(new A(""));
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java.after b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java.after
new file mode 100644
index 00000000000..3d765b92811
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.java.after
@@ -0,0 +1,7 @@
+package test;
+
+class B {
+    void bar() {
+        System.out.println(new A());
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt
new file mode 100644
index 00000000000..b7510933fb4
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt
@@ -0,0 +1,7 @@
+package test
+
+class A(val <caret>name: String)
+
+fun bar() {
+    println(A(""))
+}
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt.after b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt.after
new file mode 100644
index 00000000000..9c6cfcba117
--- /dev/null
+++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt.after
@@ -0,0 +1,7 @@
+package test
+
+class A()
+
+fun bar() {
+    println(A())
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java
index 07fc17862a9..d33d1e4aa49 100644
--- a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java
@@ -798,6 +798,26 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
             doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt");
         }
         
+        @TestMetadata("lambdaArg.kt")
+        public void testLambdaArg() throws Exception {
+            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt");
+        }
+        
+        @TestMetadata("lambdaArgExt.kt")
+        public void testLambdaArgExt() throws Exception {
+            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt");
+        }
+        
+        @TestMetadata("propertyParam1.kt")
+        public void testPropertyParam1() throws Exception {
+            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt");
+        }
+        
+        @TestMetadata("propertyParam2.kt")
+        public void testPropertyParam2() throws Exception {
+            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt");
+        }
+        
         @TestMetadata("safeUsages1.kt")
         public void testSafeUsages1() throws Exception {
             doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt");
@@ -896,6 +916,16 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
             doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt");
         }
         
+        @TestMetadata("lambdaArg.kt")
+        public void testLambdaArg() throws Exception {
+            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt");
+        }
+        
+        @TestMetadata("lambdaArgExt.kt")
+        public void testLambdaArgExt() throws Exception {
+            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt");
+        }
+        
         @TestMetadata("mixedHierarchy1.kt")
         public void testMixedHierarchy1() throws Exception {
             doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt");
@@ -926,6 +956,16 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
             doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt");
         }
         
+        @TestMetadata("propertyParam1.kt")
+        public void testPropertyParam1() throws Exception {
+            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt");
+        }
+        
+        @TestMetadata("propertyParam2.kt")
+        public void testPropertyParam2() throws Exception {
+            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt");
+        }
+        
         @TestMetadata("safeUsages1.kt")
         public void testSafeUsages1() throws Exception {
             doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt");