Project code style clean-up

Author: waleedyaseen

src/main/kotlin/io/runescript/plugin/ide/RsGotoClassContributor.kt

@@ -41,7 +41,7 @@ class RsGotoClassContributor : ChooseByNameContributorEx, GotoClassContributor {
         return (item as? RsScript)?.qualifiedName
     }
 
-    override fun getQualifiedNameSeparator(): String? {
+    override fun getQualifiedNameSeparator(): String {
         return "|"
     }
 

src/main/kotlin/io/runescript/plugin/ide/codeInsight/controlFlow/RsControlFlow.kt

@@ -26,11 +26,6 @@ class RsControlFlow(private val instructions: Array<Instruction>) : ControlFlow
         return reachableElements.contains(element)
     }
 
-    fun isReachable(instruction: Instruction): Boolean {
-        require(instruction === instructions[instruction.num()])
-        return reachable.get(instruction.num())
-    }
-
     override fun getInstructions(): Array<Instruction> {
         return instructions
     }

src/main/kotlin/io/runescript/plugin/ide/configurable/RsLanguageSettingsProvider.kt

@@ -2,17 +2,13 @@ package io.runescript.plugin.ide.doc
 
 import com.intellij.lang.documentation.DocumentationSettings
 import com.intellij.openapi.editor.colors.TextAttributesKey
-import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.openapi.editor.richcopy.HtmlSyntaxInfoUtil
-import com.intellij.openapi.project.Project
 import io.runescript.plugin.ide.highlight.RsSyntaxHighlighterColors
-import io.runescript.plugin.lang.RuneScript
 
-class RsDocumentationGenerator(private val project: Project) {
+class RsDocumentationGenerator {
 
     private val builder = StringBuilder()
 
-
     fun appendLParen() {
         appendHighlighted("(", RsSyntaxHighlighterColors.PARENTHESIS)
     }
@@ -29,31 +25,13 @@ class RsDocumentationGenerator(private val project: Project) {
         appendHighlighted(keyword, RsSyntaxHighlighterColors.KEYWORD)
     }
 
-    fun appendHighlighted(value: String, attributes: TextAttributes) {
-        HtmlSyntaxInfoUtil.appendStyledSpan(
-                builder,
-                attributes,
-                value,
-                DocumentationSettings.getHighlightingSaturation(false)
-        )
-    }
-
     fun appendHighlighted(keyword: String, attributes: TextAttributesKey) {
+        @Suppress("UnstableApiUsage")
         HtmlSyntaxInfoUtil.appendStyledSpan(
-                builder,
-                attributes,
-                keyword,
-                DocumentationSettings.getHighlightingSaturation(false)
-        )
-    }
-
-    fun appendCode(code: String) {
-        HtmlSyntaxInfoUtil.appendHighlightedByLexerAndEncodedAsHtmlCodeSnippet(
-                builder,
-                project,
-                RuneScript,
-                code,
-                DocumentationSettings.getHighlightingSaturation(false)
+            builder,
+            attributes,
+            keyword,
+            DocumentationSettings.getHighlightingSaturation(false)
         )
     }
 

src/main/kotlin/io/runescript/plugin/ide/doc/RsDocumentationGenerator.kt

@@ -1,7 +1,6 @@
 package io.runescript.plugin.ide.doc
 
 import com.intellij.lang.documentation.AbstractDocumentationProvider
-import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import io.runescript.plugin.ide.highlight.RsSyntaxHighlighterColors
 import io.runescript.plugin.lang.psi.*
@@ -23,7 +22,7 @@ class RsDocumentationProvider : AbstractDocumentationProvider() {
         }
         when (element) {
             is RsLocalVariableExpression -> {
-                val builder = element.project.createDocumentationGenerator()
+                val builder = createDocumentationGenerator()
                 val type = when (val parent = element.parent) {
                     is RsParameter -> (parent.typeName ?: parent.arrayTypeLiteral)!!.text
                     is RsLocalVariableDeclarationStatement -> parent.defineType.text.substring(4)
@@ -40,7 +39,7 @@ class RsDocumentationProvider : AbstractDocumentationProvider() {
             }
 
             is RsScript -> {
-                val builder = element.project.createDocumentationGenerator()
+                val builder = createDocumentationGenerator()
                 builder.appendHighlighted(element.qualifiedName, RsSyntaxHighlighterColors.SCRIPT_DECLARATION)
                 builder.appendLParen()
                 var appendComma = false
@@ -69,7 +68,7 @@ class RsDocumentationProvider : AbstractDocumentationProvider() {
             }
 
             is RsOpCommand -> {
-                val builder = element.project.createDocumentationGenerator()
+                val builder = createDocumentationGenerator()
                 builder.appendHighlighted(element.commandHeader.text, RsSyntaxHighlighterColors.SCRIPT_DECLARATION)
                 builder.appendLParen()
                 var appendComma = false
@@ -101,5 +100,5 @@ class RsDocumentationProvider : AbstractDocumentationProvider() {
         }
     }
 
-    private fun Project.createDocumentationGenerator() = RsDocumentationGenerator(this)
+    private fun createDocumentationGenerator() = RsDocumentationGenerator()
 }

src/main/kotlin/io/runescript/plugin/ide/doc/RsDocumentationProvider.kt

@@ -23,7 +23,7 @@ import javax.swing.JComponent
 class RsBuildProcessAdapter(
     private val instance: RsBuildInstance,
     private val buildProgressListener: BuildProgressListener,
-    val future: CompletableFuture<Any>
+    private val future: CompletableFuture<Any>
 ) : ProcessAdapter() {
     private val instantReader = BuildOutputInstantReaderImpl(
         instance.buildId,
@@ -41,6 +41,7 @@ class RsBuildProcessAdapter(
         buildContentDescriptor.isActivateToolWindowWhenFailed = true
         buildContentDescriptor.isNavigateToError = ThreeState.UNSURE
 
+        @Suppress("UnstableApiUsage")
         val buildDescriptor = DefaultBuildDescriptor(instance.buildId, instance.project.name, instance.workDirectory, System.currentTimeMillis())
             .withContentDescriptor { buildContentDescriptor }
             .withRestartAction(StopProcessAction("Stop", "Stop", instance.processHandler))

src/main/kotlin/io/runescript/plugin/ide/execution/build/RsBuildProcessAdapter.kt

@@ -12,8 +12,8 @@ import com.intellij.openapi.project.Project
 class RsRunConfiguration(project: Project, factory: ConfigurationFactory?, name: String?)
     : RunConfigurationBase<RsRunConfigurationOptions>(project, factory, name) {
 
-    override fun getState(executor: Executor, environment: ExecutionEnvironment): RunProfileState? {
-        return RsRunConfigurationRunState(environment)
+    override fun getState(executor: Executor, environment: ExecutionEnvironment): RunProfileState {
+        return RsRunConfigurationRunState()
     }
 
     override fun getConfigurationEditor(): SettingsEditor<out RunConfiguration> {

src/main/kotlin/io/runescript/plugin/ide/execution/run/RsRunConfiguration.kt

@@ -4,7 +4,7 @@ import com.intellij.openapi.options.SettingsEditor
 import com.intellij.ui.dsl.builder.panel
 import javax.swing.JComponent
 
-class RsRunConfigurationEditor() : SettingsEditor<RsRunConfiguration>() {
+class RsRunConfigurationEditor : SettingsEditor<RsRunConfiguration>() {
 
 
     override fun applyEditorTo(s: RsRunConfiguration) {

src/main/kotlin/io/runescript/plugin/ide/execution/run/RsRunConfigurationEditor.kt

@@ -3,10 +3,9 @@ package io.runescript.plugin.ide.execution.run
 import com.intellij.execution.ExecutionResult
 import com.intellij.execution.Executor
 import com.intellij.execution.configurations.RunProfileState
-import com.intellij.execution.runners.ExecutionEnvironment
 import com.intellij.execution.runners.ProgramRunner
 
-class RsRunConfigurationRunState(private val environment: ExecutionEnvironment) : RunProfileState {
+class RsRunConfigurationRunState : RunProfileState {
     override fun execute(executor: Executor?, runner: ProgramRunner<*>): ExecutionResult? {
         return null
     }

src/main/kotlin/io/runescript/plugin/ide/execution/run/RsRunConfigurationRunState.kt

@@ -6,5 +6,4 @@ import io.runescript.plugin.ide.formatter.RsFormatterContext
 import io.runescript.plugin.ide.formatter.blocks.RsBlock
 
 class RsBracedBlock(context: RsFormatterContext, node: ASTNode)
-    : RsBlock(context, node, Indent.getNoneIndent(), null, null) {
-}
+    : RsBlock(context, node, Indent.getNoneIndent(), null, null)