Merge pull request #35 from elm-tooling/warning-fixes

Fixes for the warnings

Author: ahankinson

src/main/kotlin/org/elm/ide/actions/ElmExternalReviewAction.kt

@@ -6,19 +6,17 @@ import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.actionSystem.PlatformDataKeys
-import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VirtualFile
 import org.elm.ide.notifications.showBalloon
 import org.elm.lang.core.ElmFileType
 import org.elm.openapiext.saveAllDocuments
-import org.elm.workspace.*
 import org.elm.workspace.commandLineTools.makeProject
 import org.elm.workspace.compiler.findEntrypoints
-
-private val log = logger<ElmExternalReviewAction>()
+import org.elm.workspace.elmToolchain
+import org.elm.workspace.elmWorkspace
 
 class ElmExternalReviewAction : AnAction() {
 

src/main/kotlin/org/elm/ide/actions/ElmExternalReviewWatchmodeAction.kt

@@ -6,7 +6,6 @@ import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.actionSystem.PlatformDataKeys
-import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
@@ -19,8 +18,6 @@ import org.elm.workspace.compiler.findEntrypoints
 import org.elm.workspace.elmToolchain
 import org.elm.workspace.elmWorkspace
 
-private val log = logger<ElmExternalReviewAction>()
-
 class ElmExternalReviewWatchmodeAction : AnAction() {
 
     override fun update(e: AnActionEvent) {

src/main/kotlin/org/elm/ide/color/ElmColorProvider.kt

@@ -98,7 +98,7 @@ class ElmColorProvider : ElementColorProvider {
             element.project,
             command,
             // This is the message that the JavaColorProvider uses, value copied from JavaBundle.properties
-            "Change color",
+            "Change Color",
             null, // groupId
             document
         )

src/main/kotlin/org/elm/ide/color/ElmColorSettingsPage.kt

@@ -7,7 +7,7 @@ import org.elm.ide.icons.ElmIcons
 
 class ElmColorSettingsPage : ColorSettingsPage {
 
-    private val ATTRS = ElmColor.values().map { it.attributesDescriptor }.toTypedArray()
+    private val ATTRS = ElmColor.entries.map { it.attributesDescriptor }.toTypedArray()
 
     override fun getDisplayName() =
         "Elm"

src/main/kotlin/org/elm/ide/folding/ElmFoldingBuilder.kt

@@ -19,7 +19,7 @@ import org.elm.lang.core.psi.elements.*
 
 class ElmFoldingBuilder : FoldingBuilderEx(), DumbAware {
 
-    override fun getPlaceholderText(node: ASTNode): String? {
+    override fun getPlaceholderText(node: ASTNode): String {
         return when (node.elementType) {
             BLOCK_COMMENT, DOC_COMMENT -> {
                 val nl = node.text.indexOf('\n')

src/main/kotlin/org/elm/ide/formatter/settings/ElmCodeStyleSettingsProvider.kt

@@ -39,7 +39,7 @@ class ElmLanguageCodeStyleSettingsProvider : LanguageCodeStyleSettingsProvider()
 
     // If we ever add formatting support, we'll probably want to return a plain
     // `SmartIndentOptionsEditor()` rather than this custom one.
-    override fun getIndentOptionsEditor(): IndentOptionsEditor? = ElmOptionsEditor()
+    override fun getIndentOptionsEditor(): IndentOptionsEditor = ElmOptionsEditor()
 }
 
 

src/main/kotlin/org/elm/ide/highlight/ElmSyntaxHighlightAnnotator.kt

@@ -131,7 +131,7 @@ class ElmSyntaxHighlightAnnotator : Annotator {
         }
 
         val qid = element.valueQID
-        if (qid != null && qid.isQualified == true) {
+        if (qid != null && qid.isQualified) {
             qid.qualifiers.forEach {
                 applyColor(it, ElmColor.EXTERNAL_MODULE)
             }
@@ -146,7 +146,7 @@ class ElmSyntaxHighlightAnnotator : Annotator {
         val parentFunction = PsiTreeUtil.getParentOfType(
             element,
             ElmFunctionDeclarationLeft::class.java
-        );
+        )
         if (parentFunction != null) {
             if (parentFunction.isTopLevel) {
                 applyColor(element, ElmColor.FUNCTION_ARGUMENT)
@@ -159,7 +159,7 @@ class ElmSyntaxHighlightAnnotator : Annotator {
         val anonymousFunction = PsiTreeUtil.getParentOfType(
             element,
             ElmAnonymousFunctionExpr::class.java
-        );
+        )
         if (anonymousFunction != null) {
             applyColor(element, ElmColor.INLINE_FUNCTION_ARGUMENT)
             return
@@ -168,7 +168,7 @@ class ElmSyntaxHighlightAnnotator : Annotator {
         val unionPattern = PsiTreeUtil.getParentOfType(
             element,
             ElmUnionPattern::class.java
-        );
+        )
         if (unionPattern != null) {
             applyColor(element, ElmColor.PATTERN_ARGUMENT)
             return

src/main/kotlin/org/elm/ide/icons/ElmIcons.kt

@@ -9,9 +9,6 @@ object ElmIcons {
     /** Basic file icon, matching the rest of IntelliJ's file icons */
     val FILE = getIcon("elm-file.png")
 
-    /** Monochromatic Elm icon suitable for toolwindow (it's also smaller than the normal icons */
-    val TOOL_WINDOW = getIcon("elm-toolwindow.png")
-
     /** Colorful Elm icon */
     val COLORFUL = getIcon("elm-colorful.png")
 
@@ -23,7 +20,6 @@ object ElmIcons {
     // STRUCTURE VIEW ICONS
 
     val FUNCTION = getIcon("function.png")
-    val VALUE = getIcon("value.png")
     val UNION_TYPE = getIcon("type.png")
     val TYPE_ALIAS = getIcon("type.png")
 

src/main/kotlin/org/elm/ide/inspections/ElmInspectionSuppressor.kt

@@ -44,7 +44,7 @@ class ElmInspectionSuppressor : InspectionSuppressor {
 
     private class SuppressInspectionFix(
             id: String
-    ) : AbstractBatchSuppressByNoInspectionCommentFix(id, /* replaceOthers = */ id == SuppressionUtil.ALL) {
+    ) : AbstractBatchSuppressByNoInspectionCommentFix(id, /* replaceOtherSuppressionIds = */ id == SuppressionUtil.ALL) {
 
         init {
             text = when (id) {