jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings in scripting modules

Browse Source
This commit is contained in:
Alexander Udalov
2021-07-25 17:27:54 +02:00
parent b9dd73220c
commit 1599a049aa
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/examples/kotlin-jsr223-daemon-local-eval-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt
View File

@@ -89,7 +89,7 @@ obj
// assertThrows(NoSuchMethodException::class.java) {
// invocator!!.invokeMethod(res1, "fn", 3)
// }
val res3 = invocator!!.invokeMethod(res1, "fn1", 3)
val res3 = invocator.invokeMethod(res1, "fn1", 3)
Assert.assertEquals(6, res3)
}
@@ -150,10 +150,10 @@ obj
val times = generateSequence {
val t0 = mxBeans.threadCpuTime()
val res1 = engine.eval(script)
engine.eval(script)
val t1 = mxBeans.threadCpuTime()
val res2 = engine.eval("eval(\"\"\"$script\"\"\", bnd)")
engine.eval("eval(\"\"\"$script\"\"\", bnd)")
val t2 = mxBeans.threadCpuTime()
Triple(t1 - t0, t2 - t1, t2 - t1)

6
libraries/examples/kotlin-jsr223-local-example/src/test/kotlin/org/jetbrains/kotlin/script/jsr223/KotlinJsr223ScriptEngineIT.kt
View File

@@ -134,7 +134,7 @@ obj
// assertThrows(NoSuchMethodException::class.java) {
// invocator!!.invokeMethod(res1, "fn", 3)
// }
val res3 = invocator!!.invokeMethod(res1, "fn1", 3)
val res3 = invocator.invokeMethod(res1, "fn1", 3)
Assert.assertEquals(6, res3)
}
@@ -218,10 +218,10 @@ obj
val times = generateSequence {
val t0 = mxBeans.threadCpuTime()
val res1 = engine.eval(script)
engine.eval(script)
val t1 = mxBeans.threadCpuTime()
val res2 = engine.eval("eval(\"\"\"$script\"\"\", bnd)")
engine.eval("eval(\"\"\"$script\"\"\", bnd)")
val t2 = mxBeans.threadCpuTime()
Triple(t1 - t0, t2 - t1, t2 - t1)

3
libraries/scripting/intellij/src/kotlin/script/experimental/intellij/scriptConfigurationTools.kt
View File

@@ -6,7 +6,6 @@
package kotlin.script.experimental.intellij
import com.intellij.openapi.extensions.ExtensionPointName
import com.intellij.openapi.extensions.Extensions
import com.intellij.psi.PsiFile
/**
@@ -16,7 +15,7 @@ import com.intellij.psi.PsiFile
* based on the reloaded definition should be reloaded automatically or using notification and explicit reload action
*/
fun reloadScriptConfiguration(scriptFile: PsiFile, updateEditorWithoutNotification: Boolean = false) {
val extensions = Extensions.getArea(scriptFile.project).getExtensionPoint(IdeScriptConfigurationControlFacade.EP_NAME).extensions
val extensions = scriptFile.project.extensionArea.getExtensionPoint(IdeScriptConfigurationControlFacade.EP_NAME).extensions
for (extension in extensions) {
extension.reloadScriptConfiguration(scriptFile, updateEditorWithoutNotification)
}

1
libraries/scripting/intellij/src/kotlin/script/experimental/intellij/scriptDefinitionProvider.kt
View File

@@ -48,6 +48,7 @@ interface ScriptDefinitionsProvider {
/**
* The callback to update/add/remove script definitions after loading, if needed
*/
@Suppress("DEPRECATION") // To be replaced with -Xjvm-default=all-compatibility.
@JvmDefault
fun provideDefinitions(
baseHostConfiguration: ScriptingHostConfiguration,