diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
index 33cb9f586be7..f34d011b076a 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateEqualsAndHashcodeAction.kt
@@ -140,11 +140,11 @@ class KotlinGenerateEqualsAndHashcodeAction : KotlinGenerateMemberActionBase<Kot
     }
 
     private fun generateClassLiteralsNotEqual(paramName: String, targetClass: KtClassOrObject): String {
-        val defaultExpression = "$paramName?.javaClass != javaClass"
+        val defaultExpression = "javaClass != $paramName?.javaClass"
         if (!targetClass.languageVersionSettings.supportsFeature(LanguageFeature.BoundCallableReferences)) return defaultExpression
         return when (targetClass.platform) {
-            is JsPlatform -> "other == null || $paramName::class.js != this::class.js"
-            is TargetPlatform.Default -> "other == null || $paramName::class != this::class"
+            is JsPlatform -> "other == null || this::class.js != $paramName::class.js"
+            is TargetPlatform.Default -> "other == null || this::class != $paramName::class"
             else -> defaultExpression
         }
     }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/arrays.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/arrays.kt.after
index ebf0bb0b3675..e02b7825ab4a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/arrays.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/arrays.kt.after
@@ -9,7 +9,7 @@ class A(val n: IntArray, val s: Array<String>) {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as A
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt.after
index f491f3b1fe55..ed7b81a0f719 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/customAccessors.kt.after
@@ -6,7 +6,7 @@ class Test {
     var name: String = ""
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as Test
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/dataClassHasArrayProperty.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/dataClassHasArrayProperty.kt.after
index 4f612a747208..29e36f36ff9a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/dataClassHasArrayProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/dataClassHasArrayProperty.kt.after
@@ -3,7 +3,7 @@ import java.util.Arrays
 data class A(val a: IntArray) {
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as A
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt.after
index 135184e78fe4..4d778fc1f505 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/explicitDefaultAccessors.kt.after
@@ -7,7 +7,7 @@ class Test {
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
         return true
     }
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt.after
index 4d3fc193dcb8..2bf2fba5a016 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/genericClass.kt.after
@@ -5,7 +5,7 @@ class A<T>(val n: T) {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as A<*>
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/keepQuotes.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/keepQuotes.kt.after
index 3140e91c3aa1..84718fc80c77 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/keepQuotes.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/keepQuotes.kt.after
@@ -1,7 +1,7 @@
 class Example(val `in`: String, val `cl ass`: String, val `valid`: Boolean) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as Example
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt.after
index df1d50d95f08..312ecc38549b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVars.kt.after
@@ -7,7 +7,7 @@ class A(val n: Int, val s: String) {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as A
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsCommon.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsCommon.kt.after
index 5c3b22925438..f9875704b25f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsCommon.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsCommon.kt.after
@@ -8,7 +8,7 @@ class A(val n: Int, val s: String) {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other == null || other::class != this::class) return false
+        if (other == null || this::class != other::class) return false
 
         other as A
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsJS.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsJS.kt.after
index 76e1d3508146..5f4cb0bfe34c 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsJS.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsJS.kt.after
@@ -8,7 +8,7 @@ class A(val n: Int, val s: String) {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other == null || other::class.js != this::class.js) return false
+        if (other == null || this::class.js != other::class.js) return false
 
         other as A
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt.after
index f8c7f4a32fa7..d6cb1fd147ed 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsNullable.kt.after
@@ -7,7 +7,7 @@ class A(val n: Int?, val s: String) {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as A
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt.after
index 3d194ed47d7d..695ec214503a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/multipleVarsWithSuperClass.kt.after
@@ -12,7 +12,7 @@ class A(val n: Int, val s: String) : X() {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
         if (!super.equals(other)) return false
 
         other as A
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt.after
index eb233767dfd4..fddcabc62b07 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nameClash.kt.after
@@ -5,7 +5,7 @@ class A(val result: Int, val s: String) {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as A
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVars.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVars.kt.after
index ef9933bd63b5..b89df63a7985 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVars.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVars.kt.after
@@ -5,7 +5,7 @@ class A {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
         return true
     }
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsCommon.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsCommon.kt.after
index 92cacc966283..21405583b115 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsCommon.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsCommon.kt.after
@@ -6,7 +6,7 @@ class A {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other == null || other::class != this::class) return false
+        if (other == null || this::class != other::class) return false
         return true
     }
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsJS.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsJS.kt.after
index 3372a58291d8..1b0eea7128f1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsJS.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsJS.kt.after
@@ -6,7 +6,7 @@ class A {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other == null || other::class.js != this::class.js) return false
+        if (other == null || this::class.js != other::class.js) return false
         return true
     }
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsWithSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsWithSuperClass.kt.after
index 84942c006d50..b57fbda0f5ed 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsWithSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/noVarsWithSuperClass.kt.after
@@ -10,7 +10,7 @@ class A : X() {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
         if (!super.equals(other)) return false
         return true
     }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt.after
index 05fee20cd0cc..3840c5aa1ab5 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/nullableArrays.kt.after
@@ -9,7 +9,7 @@ class A(val n: IntArray?, val s: Array<String>?) {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as A
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt.after
index 1970177ca004..1de3d6cd7c27 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVar.kt.after
@@ -5,7 +5,7 @@ class A(val n: Int) {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as A
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt.after
index 7493fce059bf..3deb2a9dd59f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarNullable.kt.after
@@ -5,7 +5,7 @@ class A(val n: Int?) {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
 
         other as A
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt.after
index 7764d03a78ae..c93a2f42055b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithJavaSuperClass.kt.after
@@ -5,7 +5,7 @@ class A(val n: Int) : X() {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
         if (!super.equals(other)) return false
 
         other as A
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt.after
index bd6b50804c29..684d1338261c 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/equalsWithHashCode/singleVarWithSuperClass.kt.after
@@ -10,7 +10,7 @@ class A(val n: Int) : X() {
 
     <caret>override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
         if (!super.equals(other)) return false
 
         other as A