phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lang-test] Use processing stages only in BaseParsingHelper

Browse Source
This commit is contained in:
Clément Fournier
2020-01-10 17:54:14 +01:00
parent b763a980ec
commit db1a8d7649
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/ParserCornersTest.java
View File

@ -23,7 +23,7 @@ public class ParserCornersTest {
private static final String MULTICATCH = "public class Foo { public void bar() { "
+ "try { System.out.println(); } catch (RuntimeException | IOException e) {} } }";
private final JavaParsingHelper java = JavaParsingHelper.WITH_PROCESSING.withResourceContext(ParserCornersTest.class);
private final JavaParsingHelper java = JavaParsingHelper.JUST_PARSE.withResourceContext(ParserCornersTest.class);
private final JavaParsingHelper java8 = java.withDefaultVersion("1.8");
private final JavaParsingHelper java4 = java.withDefaultVersion("1.4");
private final JavaParsingHelper java5 = java.withDefaultVersion("1.5");

47
pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseParsingHelper.kt
View File

@ -8,6 +8,7 @@ import net.sourceforge.pmd.lang.LanguageVersion
import net.sourceforge.pmd.lang.LanguageVersionHandler
import net.sourceforge.pmd.lang.ParserOptions
import net.sourceforge.pmd.lang.ast.AstAnalysisContext;
import net.sourceforge.pmd.lang.ast.AstProcessingStage
import net.sourceforge.pmd.lang.ast.Node
import net.sourceforge.pmd.lang.ast.RootNode
import org.apache.commons.io.IOUtils
@ -105,36 +106,42 @@ abstract class BaseParsingHelper<Self : BaseParsingHelper<Self, T>, T : RootNode
* so.
*/
@JvmOverloads
open fun parse(sourceCode: String, version: String? = null): T {
fun parse(sourceCode: String, version: String? = null): T {
val lversion = if (version == null) defaultVersion else getVersion(version)
val handler = lversion.languageVersionHandler
val options = params.parserOptions ?: handler.defaultParserOptions
val parser = handler.getParser(options)
val rootNode = rootClass.cast(parser.parse(null, StringReader(sourceCode)))
if (params.doProcess) {
if (!handler.processingStages.isEmpty()) {
var astAnalysisContext = object : AstAnalysisContext {
override fun getTypeResolutionClassLoader() : ClassLoader {
return javaClass.classLoader
}
override fun getLanguageVersion() : LanguageVersion {
return lversion
}
}
handler.processingStages.forEach {
it.processAST(rootNode, astAnalysisContext)
}
} else {
handler.getQualifiedNameResolutionFacade(javaClass.classLoader).start(rootNode)
handler.getSymbolFacade(javaClass.classLoader).start(rootNode)
handler.dataFlowFacade.start(rootNode)
handler.getTypeResolutionFacade(javaClass.classLoader).start(rootNode)
handler.multifileFacade.start(rootNode)
}
postProcessing(handler, lversion, rootNode)
}
return rootNode
}
/**
* Select the processing stages that this should run in [postProcessing],
* by default runs everything.
*/
protected open fun selectProcessingStages(handler: LanguageVersionHandler): List<AstProcessingStage<*>> =
handler.processingStages
/**
* Called only if [Params.doProcess] is true.
*/
protected open fun postProcessing(handler: LanguageVersionHandler, lversion: LanguageVersion, rootNode: T?) {
val astAnalysisContext = object : AstAnalysisContext {
override fun getTypeResolutionClassLoader(): ClassLoader = javaClass.classLoader
override fun getLanguageVersion(): LanguageVersion = lversion
}
val stages = selectProcessingStages(handler).sortedWith(Comparator { o1, o2 -> o1.compare(o2) })
stages.forEach {
it.processAST(rootNode, astAnalysisContext)
}
}
/**
* Fetches and [parse]s the [resource] using the context defined for this
* instance (by default uses this class' classloader, but can be configured