From 221d5dee76a89dc040b78abce5703ab45e03b8b7 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 20 Mar 2023 17:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rhino/src/main/java/com/script/rhino/JSAdapter.kt        | 1 +
 rhino/src/main/java/com/script/rhino/JavaAdapter.kt      | 1 +
 .../src/main/java/com/script/rhino/RhinoScriptEngine.kt  | 9 ++++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rhino/src/main/java/com/script/rhino/JSAdapter.kt b/rhino/src/main/java/com/script/rhino/JSAdapter.kt
index 3930e34c5..e68a02c12 100644
--- a/rhino/src/main/java/com/script/rhino/JSAdapter.kt
+++ b/rhino/src/main/java/com/script/rhino/JSAdapter.kt
@@ -68,6 +68,7 @@ import org.mozilla.javascript.Function
  * @author A. Sundararajan
  * @since 1.6
  */
+@Suppress("unused", "UNUSED_PARAMETER")
 class JSAdapter private constructor(val adaptee: Scriptable) : Scriptable, Function {
     private var prototype: Scriptable? = null
     private var parent: Scriptable? = null
diff --git a/rhino/src/main/java/com/script/rhino/JavaAdapter.kt b/rhino/src/main/java/com/script/rhino/JavaAdapter.kt
index 548710594..de93cb418 100644
--- a/rhino/src/main/java/com/script/rhino/JavaAdapter.kt
+++ b/rhino/src/main/java/com/script/rhino/JavaAdapter.kt
@@ -50,6 +50,7 @@ import org.mozilla.javascript.Function
  * @author A. Sundararajan
  * @since 1.6
  */
+@Suppress("UNUSED_PARAMETER")
 internal class JavaAdapter private constructor(private val engine: Invocable) : ScriptableObject(),
     Function {
     override fun getClassName(): String {
diff --git a/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt b/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt
index 14066983d..260b276d4 100644
--- a/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt
+++ b/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt
@@ -43,6 +43,7 @@ import java.security.*
  * @author A. Sundararajan
  * @since 1.6
  */
+@Suppress("MemberVisibilityCanBePrivate")
 class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
     var accessContext: AccessControlContext? = null
     private var topLevel: RhinoTopLevel? = null
@@ -120,12 +121,11 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
             val localScope = if (thiz1 != null) thiz1 as Scriptable else engineScope
             val obj = ScriptableObject.getProperty(localScope, name) as? Function
                 ?: throw NoSuchMethodException("no such method: $name")
-            val func = obj
-            var scope = func.parentScope
+            var scope = obj.parentScope
             if (scope == null) {
                 scope = engineScope
             }
-            val result = func.call(cx, scope, localScope, wrapArguments(args as? Array<Any?>))
+            val result = obj.call(cx, scope, localScope, wrapArguments(args as? Array<Any?>))
             var11 = unwrapReturnValue(result)!!
         } catch (re: RhinoException) {
             val line = if (re.lineNumber() == 0) -1 else re.lineNumber()
@@ -299,7 +299,9 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
         }
     }
 
+    @Suppress("unused")
     companion object {
+
         private const val DEBUG = false
 
         @Language("js")
@@ -324,6 +326,7 @@ class RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
 
         init {
             ContextFactory.initGlobal(object : ContextFactory() {
+
                 override fun makeContext(): Context {
                     val cx = super.makeContext()
                     cx.languageVersion = 200