MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[groovy] gdsl: use standard way of obtaining classloader & small updates

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2016-03-29 13:38:27 +03:00
parent 6c0a07ab19
commit 6d39198b84
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslExecutor.groovy
+4 -4
View File
@@ -129,7 +129,7 @@ abstract class GroovyDslExecutor extends Script implements GdslScopeMethods, Gds
ctx.put(DslPointcut.BOUND, null)
if (pair.first.isApplicable(descriptor, ctx)) {
def generator = new CustomMembersGenerator(descriptor, psiType, ctx.get(DslPointcut.BOUND))
doRun(pair, generator)
doRun(generator, pair.second)
holder.addHolder(generator.membersHolder)
}
}
@@ -137,8 +137,8 @@ abstract class GroovyDslExecutor extends Script implements GdslScopeMethods, Gds
}
@CompileStatic(TypeCheckingMode.SKIP)
private void doRun(Pair<ContextFilter, Closure> pair, CustomMembersGenerator generator) {
use(cats) { generator.with pair.second }
private void doRun(CustomMembersGenerator generator, Closure closure) {
use(cats) { generator.with closure }
}
String toString() { "${super.toString()}; file = $fileName"; }
@@ -146,7 +146,7 @@ abstract class GroovyDslExecutor extends Script implements GdslScopeMethods, Gds
public static GroovyDslExecutor createAndRunExecutor(String text, String fileName) {
def configuration = new CompilerConfiguration()
configuration.scriptBaseClass = GroovyDslExecutor.name
def shell = new GroovyShell(this.class.classLoader, configuration)
def shell = new GroovyShell(configuration)
def script = shell.parse(text, StringUtil.sanitizeJavaIdentifier(fileName)) as GroovyDslExecutor
script.fileName = fileName
script.run()