From 5f0171aa040648501523ec4e42a77c9d5e2577dd Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 5 Jun 2015 22:22:41 +0300
Subject: [PATCH] Added two more inspections based on existing intentions

---
 idea/src/META-INF/plugin.xml                       | 14 ++++++++++++++
 .../RemoveCurlyBracesFromTemplateIntention.kt      | 13 ++++++++-----
 .../SimplifyBooleanWithConstantsIntention.kt       | 11 +++++++----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 9fbfbed53a2..ccca40e7c8d 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -988,6 +988,20 @@
         level="WEAK WARNING"
         />
 
+      <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateInspection"
+                       displayName="Remove redundant curly braces in string template"
+                       groupName="Kotlin"
+                       enabledByDefault="true"
+                       level="WEAK WARNING"
+          />
+
+      <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.SimplifyBooleanWithConstantsInspection"
+                       displayName="Simplify boolean expression with constants"
+                       groupName="Kotlin"
+                       enabledByDefault="true"
+                       level="WEAK WARNING"
+          />
+
     <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.UnusedSymbolInspection"
         displayName="Unused Symbol"
         groupName="Kotlin"
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt
index 159803fa182..3f7b2265207 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt
@@ -17,12 +17,15 @@
 package org.jetbrains.kotlin.idea.intentions
 
 import com.intellij.openapi.editor.Editor
-import org.jetbrains.kotlin.psi.JetBlockStringTemplateEntry
-import org.jetbrains.kotlin.psi.JetSimpleNameExpression
-import org.jetbrains.kotlin.psi.JetPsiFactory
-import java.util.regex.*
-import org.jetbrains.kotlin.psi.JetStringTemplateEntryWithExpression
 import org.jetbrains.kotlin.idea.core.replaced
+import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
+import org.jetbrains.kotlin.psi.JetBlockStringTemplateEntry
+import org.jetbrains.kotlin.psi.JetPsiFactory
+import org.jetbrains.kotlin.psi.JetSimpleNameExpression
+import org.jetbrains.kotlin.psi.JetStringTemplateEntryWithExpression
+import java.util.regex.Pattern
+
+public class RemoveCurlyBracesFromTemplateInspection : IntentionBasedInspection<JetBlockStringTemplateEntry>(RemoveCurlyBracesFromTemplateIntention())
 
 public class RemoveCurlyBracesFromTemplateIntention : JetSelfTargetingOffsetIndependentIntention<JetBlockStringTemplateEntry>(javaClass(), "Remove curly braces") {
     override fun isApplicableTo(element: JetBlockStringTemplateEntry): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
index 67a4bfecf3d..1fcb4609d61 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
@@ -17,15 +17,18 @@
 package org.jetbrains.kotlin.idea.intentions
 
 import com.intellij.openapi.editor.Editor
-import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.kotlin.resolve.CompileTimeConstantUtils
-import org.jetbrains.kotlin.resolve.DelegatingBindingTrace
 import com.intellij.psi.tree.IElementType
 import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.core.copied
 import org.jetbrains.kotlin.idea.core.replaced
-import org.jetbrains.kotlin.idea.caches.resolve.analyze
+import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
+import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.resolve.CompileTimeConstantUtils
+import org.jetbrains.kotlin.resolve.DelegatingBindingTrace
+
+public class SimplifyBooleanWithConstantsInspection : IntentionBasedInspection<JetBinaryExpression>(SimplifyBooleanWithConstantsIntention())
 
 public class SimplifyBooleanWithConstantsIntention : JetSelfTargetingOffsetIndependentIntention<JetBinaryExpression>(javaClass(), "Simplify boolean expression") {