Skip to content

Commit 1b511ee

Browse files
committed
fix: fix tests
1 parent 6ac7fbd commit 1b511ee

File tree

3 files changed

+26
-13
lines changed

3 files changed

+26
-13
lines changed

chapi-ast-java/src/main/kotlin/chapi/ast/javaast/JavaAnalyser.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ import chapi.ast.antlr.JavaLexer
44
import chapi.ast.antlr.JavaParser
55
import chapi.domain.core.CodeDataStruct
66
import chapi.domain.core.CodeContainer
7-
import chapi.parser.AnalysisMode
7+
import chapi.parser.ParseMode
88
import chapi.parser.TwoStepAnalyser
99
import org.antlr.v4.runtime.CharStreams
1010
import org.antlr.v4.runtime.CommonTokenStream
1111
import org.antlr.v4.runtime.tree.ParseTreeWalker
1212

1313
open class JavaAnalyser : TwoStepAnalyser() {
14-
override fun analysis(code: String, filePath: String, mode: AnalysisMode): CodeContainer {
15-
return when (mode) {
16-
AnalysisMode.Basic -> identFullInfo(code, filePath)
17-
AnalysisMode.Full -> identBasicInfo(code, filePath)
14+
override fun analysis(code: String, filePath: String, parseMode: ParseMode): CodeContainer {
15+
return when (parseMode) {
16+
ParseMode.Basic -> identFullInfo(code, filePath)
17+
ParseMode.Full -> identBasicInfo(code, filePath)
1818
}
1919
}
2020

chapi-ast-kotlin/src/main/kotlin/chapi/ast/kotlinast/KotlinAnalyser.kt

+18-5
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,30 @@ package chapi.ast.kotlinast
33
import chapi.ast.antlr.KotlinLexer
44
import chapi.ast.antlr.KotlinParser
55
import chapi.domain.core.CodeContainer
6-
import chapi.parser.AnalysisMode
6+
import chapi.parser.ParseMode
77
import chapi.parser.TwoStepAnalyser
88
import org.antlr.v4.runtime.CharStreams
99
import org.antlr.v4.runtime.CommonTokenStream
1010
import org.antlr.v4.runtime.tree.ParseTreeWalker
1111

12+
enum class AnalysisMode {
13+
Basic, Full
14+
}
15+
16+
// a compatible api for Analyser
17+
@Deprecated("use AnalysisMode move to Global instead", ReplaceWith("ParseMode"))
18+
fun KotlinAnalyser.analysis(code: String, filePath: String, mode: AnalysisMode): CodeContainer {
19+
return when (mode) {
20+
AnalysisMode.Basic -> analysis(code, filePath, ParseMode.Basic)
21+
AnalysisMode.Full -> analysis(code, filePath, ParseMode.Full)
22+
}
23+
}
24+
1225
class KotlinAnalyser: TwoStepAnalyser() {
13-
override fun analysis(code: String, filePath: String, mode: AnalysisMode): CodeContainer {
14-
val listener = when (mode) {
15-
AnalysisMode.Basic -> KotlinBasicIdentListener(filePath)
16-
AnalysisMode.Full -> KotlinFullIdentListener(filePath)
26+
override fun analysis(code: String, filePath: String, parseMode: ParseMode): CodeContainer {
27+
val listener = when (parseMode) {
28+
ParseMode.Basic -> KotlinBasicIdentListener(filePath)
29+
ParseMode.Full -> KotlinFullIdentListener(filePath)
1730
}
1831
val context = when (isKotlinScript(filePath)) {
1932
true -> this.parse(code).script()

chapi-domain/src/main/kotlin/chapi/parser/Analyser.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package chapi.parser
22

33
import chapi.domain.core.CodeContainer
44

5-
enum class AnalysisMode {
5+
enum class ParseMode {
66
Basic, Full
77
}
88

@@ -13,8 +13,8 @@ interface Analyser {
1313

1414
abstract class TwoStepAnalyser : Analyser {
1515
override fun analysis(code: String, filePath: String): CodeContainer {
16-
return this.analysis(code, filePath, AnalysisMode.Basic)
16+
return this.analysis(code, filePath, ParseMode.Basic)
1717
}
1818

19-
abstract fun analysis(code: String, filePath: String, mode: AnalysisMode = AnalysisMode.Basic): CodeContainer
19+
abstract fun analysis(code: String, filePath: String, parseMode: ParseMode = ParseMode.Basic): CodeContainer
2020
}

0 commit comments

Comments
 (0)