Fix warnings in scripting modules
This commit is contained in:
+3
-3
@@ -89,7 +89,7 @@ obj
|
|||||||
// assertThrows(NoSuchMethodException::class.java) {
|
// assertThrows(NoSuchMethodException::class.java) {
|
||||||
// invocator!!.invokeMethod(res1, "fn", 3)
|
// invocator!!.invokeMethod(res1, "fn", 3)
|
||||||
// }
|
// }
|
||||||
val res3 = invocator!!.invokeMethod(res1, "fn1", 3)
|
val res3 = invocator.invokeMethod(res1, "fn1", 3)
|
||||||
Assert.assertEquals(6, res3)
|
Assert.assertEquals(6, res3)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,10 +150,10 @@ obj
|
|||||||
val times = generateSequence {
|
val times = generateSequence {
|
||||||
val t0 = mxBeans.threadCpuTime()
|
val t0 = mxBeans.threadCpuTime()
|
||||||
|
|
||||||
val res1 = engine.eval(script)
|
engine.eval(script)
|
||||||
val t1 = mxBeans.threadCpuTime()
|
val t1 = mxBeans.threadCpuTime()
|
||||||
|
|
||||||
val res2 = engine.eval("eval(\"\"\"$script\"\"\", bnd)")
|
engine.eval("eval(\"\"\"$script\"\"\", bnd)")
|
||||||
val t2 = mxBeans.threadCpuTime()
|
val t2 = mxBeans.threadCpuTime()
|
||||||
|
|
||||||
Triple(t1 - t0, t2 - t1, t2 - t1)
|
Triple(t1 - t0, t2 - t1, t2 - t1)
|
||||||
|
|||||||
+3
-3
@@ -134,7 +134,7 @@ obj
|
|||||||
// assertThrows(NoSuchMethodException::class.java) {
|
// assertThrows(NoSuchMethodException::class.java) {
|
||||||
// invocator!!.invokeMethod(res1, "fn", 3)
|
// invocator!!.invokeMethod(res1, "fn", 3)
|
||||||
// }
|
// }
|
||||||
val res3 = invocator!!.invokeMethod(res1, "fn1", 3)
|
val res3 = invocator.invokeMethod(res1, "fn1", 3)
|
||||||
Assert.assertEquals(6, res3)
|
Assert.assertEquals(6, res3)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -218,10 +218,10 @@ obj
|
|||||||
val times = generateSequence {
|
val times = generateSequence {
|
||||||
val t0 = mxBeans.threadCpuTime()
|
val t0 = mxBeans.threadCpuTime()
|
||||||
|
|
||||||
val res1 = engine.eval(script)
|
engine.eval(script)
|
||||||
val t1 = mxBeans.threadCpuTime()
|
val t1 = mxBeans.threadCpuTime()
|
||||||
|
|
||||||
val res2 = engine.eval("eval(\"\"\"$script\"\"\", bnd)")
|
engine.eval("eval(\"\"\"$script\"\"\", bnd)")
|
||||||
val t2 = mxBeans.threadCpuTime()
|
val t2 = mxBeans.threadCpuTime()
|
||||||
|
|
||||||
Triple(t1 - t0, t2 - t1, t2 - t1)
|
Triple(t1 - t0, t2 - t1, t2 - t1)
|
||||||
|
|||||||
+1
-2
@@ -6,7 +6,6 @@
|
|||||||
package kotlin.script.experimental.intellij
|
package kotlin.script.experimental.intellij
|
||||||
|
|
||||||
import com.intellij.openapi.extensions.ExtensionPointName
|
import com.intellij.openapi.extensions.ExtensionPointName
|
||||||
import com.intellij.openapi.extensions.Extensions
|
|
||||||
import com.intellij.psi.PsiFile
|
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
|
* based on the reloaded definition should be reloaded automatically or using notification and explicit reload action
|
||||||
*/
|
*/
|
||||||
fun reloadScriptConfiguration(scriptFile: PsiFile, updateEditorWithoutNotification: Boolean = false) {
|
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) {
|
for (extension in extensions) {
|
||||||
extension.reloadScriptConfiguration(scriptFile, updateEditorWithoutNotification)
|
extension.reloadScriptConfiguration(scriptFile, updateEditorWithoutNotification)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -48,6 +48,7 @@ interface ScriptDefinitionsProvider {
|
|||||||
/**
|
/**
|
||||||
* The callback to update/add/remove script definitions after loading, if needed
|
* The callback to update/add/remove script definitions after loading, if needed
|
||||||
*/
|
*/
|
||||||
|
@Suppress("DEPRECATION") // To be replaced with -Xjvm-default=all-compatibility.
|
||||||
@JvmDefault
|
@JvmDefault
|
||||||
fun provideDefinitions(
|
fun provideDefinitions(
|
||||||
baseHostConfiguration: ScriptingHostConfiguration,
|
baseHostConfiguration: ScriptingHostConfiguration,
|
||||||
|
|||||||
Reference in New Issue
Block a user