From bade284622bca7b925d0decd9589e3bf821ab505 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Sun, 3 May 2020 14:25:14 +0200 Subject: [PATCH] Fix bug in ParserRuleContext.verbatimText --- orx-kotlin-parser/src/main/kotlin/ExtractProgram.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/orx-kotlin-parser/src/main/kotlin/ExtractProgram.kt b/orx-kotlin-parser/src/main/kotlin/ExtractProgram.kt index c2f0a8de..b4e37d8b 100644 --- a/orx-kotlin-parser/src/main/kotlin/ExtractProgram.kt +++ b/orx-kotlin-parser/src/main/kotlin/ExtractProgram.kt @@ -9,9 +9,12 @@ import org.antlr.v4.runtime.tree.ParseTreeWalker import org.openrndr.extra.kotlin.antlr.KotlinLexer import org.openrndr.extra.kotlin.antlr.KotlinParser import org.openrndr.extra.kotlin.antlr.KotlinParserBaseListener -import java.io.File fun ParserRuleContext.verbatimText(marginLeft: Int = 0, marginRight: Int = 0): String { + if (start == null || stop == null) { + return "" + } + val startIndex = start.startIndex + marginLeft val stopIndex = stop.stopIndex - marginRight val interval = Interval(startIndex, stopIndex) @@ -67,5 +70,5 @@ fun extractProgram(source: String, programIdentifier: String = "program"): Progr val lambdaExtractor = LambdaExtractor(ruleNames, programIdentifier) ParseTreeWalker.DEFAULT.walk(lambdaExtractor, root) - return ProgramSource(packageExtractor.result, importsExtractor.result?:"", lambdaExtractor.result?:"") + return ProgramSource(packageExtractor.result, importsExtractor.result ?: "", lambdaExtractor.result ?: "") }