diff --git a/src/Highlighter.php b/src/Highlighter.php index 843cf5b6..c81f7891 100644 --- a/src/Highlighter.php +++ b/src/Highlighter.php @@ -20,9 +20,11 @@ use Tempest\Highlight\Languages\Html\HtmlLanguage; use Tempest\Highlight\Languages\Http\HttpLanguage; use Tempest\Highlight\Languages\Ini\IniLanguage; +use Tempest\Highlight\Languages\Java\JavaLanguage; use Tempest\Highlight\Languages\JavaScript\JavaScriptLanguage; use Tempest\Highlight\Languages\Json\JsonLanguage; use Tempest\Highlight\Languages\Jsx\JsxLanguage; +use Tempest\Highlight\Languages\Kotlin\KotlinLanguage; use Tempest\Highlight\Languages\Markdown\MarkdownLanguage; use Tempest\Highlight\Languages\Nginx\NginxLanguage; use Tempest\Highlight\Languages\Php\PhpLanguage; @@ -80,8 +82,10 @@ public function __construct( ->addLanguage(new GraphqlLanguage()) ->addLanguage(new HtmlLanguage()) ->addLanguage(new HttpLanguage()) + ->addLanguage(new JavaLanguage()) ->addLanguage(new JavaScriptLanguage()) ->addLanguage(new JsonLanguage()) + ->addLanguage(new KotlinLanguage()) ->addLanguage(new MarkdownLanguage()) ->addLanguage(new NginxLanguage()) ->addLanguage(new PhpLanguage()) diff --git a/src/Languages/CLike/Patterns/CLikeCommentPattern.php b/src/Languages/CLike/Patterns/CLikeCommentPattern.php new file mode 100644 index 00000000..00704a71 --- /dev/null +++ b/src/Languages/CLike/Patterns/CLikeCommentPattern.php @@ -0,0 +1,27 @@ +\/\/[^\r\n]*|\/\*(?:[^*]++|\*(?!\/))*+\*\/)/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::COMMENT; + } +} diff --git a/src/Languages/CLike/Patterns/CLikeFunctionPattern.php b/src/Languages/CLike/Patterns/CLikeFunctionPattern.php new file mode 100644 index 00000000..0411ea91 --- /dev/null +++ b/src/Languages/CLike/Patterns/CLikeFunctionPattern.php @@ -0,0 +1,27 @@ +[A-Za-z_]\w*)(?=\s*\()'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::PROPERTY; + } +} diff --git a/src/Languages/CLike/Patterns/CLikeIncludePattern.php b/src/Languages/CLike/Patterns/CLikeIncludePattern.php new file mode 100644 index 00000000..a1aeb003 --- /dev/null +++ b/src/Languages/CLike/Patterns/CLikeIncludePattern.php @@ -0,0 +1,27 @@ +', output: '')] +#[PatternTest(input: '#include "local.h"', output: '"local.h"')] +final readonly class CLikeIncludePattern implements Pattern +{ + use IsPattern; + + public function getPattern(): string + { + return '/^[\t ]*#\s*(?:include_next|include)\s*(?<[^>\r\n]++>|"(?:\\\\.|[^"\\\\\r\n]++)*")/m'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::VALUE; + } +} diff --git a/src/Languages/CLike/Patterns/CLikeOperatorPattern.php b/src/Languages/CLike/Patterns/CLikeOperatorPattern.php new file mode 100644 index 00000000..1cdd54ce --- /dev/null +++ b/src/Languages/CLike/Patterns/CLikeOperatorPattern.php @@ -0,0 +1,27 @@ + b', output: '<=>')] +#[PatternTest(input: 'pointer->field', output: '->')] +final readonly class CLikeOperatorPattern implements Pattern +{ + use IsPattern; + + public function getPattern(): string + { + return '/(?<=>|->\*|<<=?|>>=?|\+\+|--|&&|\|\||==|!=|<=|>=|->|::|\.\*|\.\.\.|[-+*\/%&|^~!<>=]=?|[?:;,.{}()\[\]])/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::OPERATOR; + } +} diff --git a/src/Languages/CLike/Patterns/CLikePreprocessorKeywordPattern.php b/src/Languages/CLike/Patterns/CLikePreprocessorKeywordPattern.php new file mode 100644 index 00000000..a36e5c5e --- /dev/null +++ b/src/Languages/CLike/Patterns/CLikePreprocessorKeywordPattern.php @@ -0,0 +1,27 @@ +', output: 'include')] +final readonly class CLikePreprocessorKeywordPattern implements Pattern +{ + use IsPattern; + + public function getPattern(): string + { + return '/^[\t ]*#\s*(?include_next|include|define|undef|ifdef|ifndef|if|elif|else|endif|line|error|warning|pragma)\b/m'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::KEYWORD; + } +} diff --git a/src/Languages/Java/JavaLanguage.php b/src/Languages/Java/JavaLanguage.php new file mode 100644 index 00000000..f89ca7b3 --- /dev/null +++ b/src/Languages/Java/JavaLanguage.php @@ -0,0 +1,44 @@ +@[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::ATTRIBUTE; + } +} diff --git a/src/Languages/Java/Patterns/JavaFunctionPattern.php b/src/Languages/Java/Patterns/JavaFunctionPattern.php new file mode 100644 index 00000000..68f9349c --- /dev/null +++ b/src/Languages/Java/Patterns/JavaFunctionPattern.php @@ -0,0 +1,27 @@ +[A-Za-z_$][\w$]*)(?=\s*\()'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::PROPERTY; + } +} diff --git a/src/Languages/Java/Patterns/JavaKeywordPattern.php b/src/Languages/Java/Patterns/JavaKeywordPattern.php new file mode 100644 index 00000000..2a75ca2c --- /dev/null +++ b/src/Languages/Java/Patterns/JavaKeywordPattern.php @@ -0,0 +1,27 @@ +abstract|assert|break|case|catch|class|const|continue|default|do|else|enum|exports|extends|final|finally|for|goto|if|implements|import|instanceof|interface|module|native|new|non-sealed|open|opens|package|permits|private|protected|provides|public|record|requires|return|sealed|static|strictfp|super|switch|synchronized|this|throw|throws|to|transient|transitive|try|uses|volatile|when|while|with|yield)\b'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::KEYWORD; + } +} diff --git a/src/Languages/Java/Patterns/JavaLiteralPattern.php b/src/Languages/Java/Patterns/JavaLiteralPattern.php new file mode 100644 index 00000000..fe1522a9 --- /dev/null +++ b/src/Languages/Java/Patterns/JavaLiteralPattern.php @@ -0,0 +1,27 @@ +true|false|null)\b'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::LITERAL; + } +} diff --git a/src/Languages/Java/Patterns/JavaNamespacePattern.php b/src/Languages/Java/Patterns/JavaNamespacePattern.php new file mode 100644 index 00000000..419dd4a4 --- /dev/null +++ b/src/Languages/Java/Patterns/JavaNamespacePattern.php @@ -0,0 +1,27 @@ +[A-Za-z_$][\w$]*(?:\.[A-Za-z_$*][\w$*]*)*)'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::TYPE; + } +} diff --git a/src/Languages/Java/Patterns/JavaNumberPattern.php b/src/Languages/Java/Patterns/JavaNumberPattern.php new file mode 100644 index 00000000..872ce205 --- /dev/null +++ b/src/Languages/Java/Patterns/JavaNumberPattern.php @@ -0,0 +1,27 @@ +(?:0[xX][\dA-Fa-f](?:_?[\dA-Fa-f])*(?:\.[\dA-Fa-f](?:_?[\dA-Fa-f])*)?(?:[pP][+-]?\d(?:_?\d)*)?|0[bB][01](?:_?[01])*|0[0-7](?:_?[0-7])*|(?:\d(?:_?\d)*(?:\.\d(?:_?\d)*)?|\.\d(?:_?\d)*)(?:[eE][+-]?\d(?:_?\d)*)?)[fFdDlL]?)(?![\w.])/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::NUMBER; + } +} diff --git a/src/Languages/Java/Patterns/JavaStringPattern.php b/src/Languages/Java/Patterns/JavaStringPattern.php new file mode 100644 index 00000000..85f09a21 --- /dev/null +++ b/src/Languages/Java/Patterns/JavaStringPattern.php @@ -0,0 +1,28 @@ +"""(?:[^"\\\\]++|\\\\.|"(?!"")|""(?!"))*+"""|"(?:\\\\.|[^"\\\\\r\n]++)*"|\'(?:\\\\.|[^\'\\\\\r\n])\')/s'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::VALUE; + } +} diff --git a/src/Languages/Java/Patterns/JavaTypePattern.php b/src/Languages/Java/Patterns/JavaTypePattern.php new file mode 100644 index 00000000..ca3a8197 --- /dev/null +++ b/src/Languages/Java/Patterns/JavaTypePattern.php @@ -0,0 +1,27 @@ +boolean|byte|char|double|float|int|long|short|void|var|(?@(?:file|get|set|field|property|receiver|param|setparam|delegate):[A-Za-z_]\w*|@[A-Za-z_]\w*(?:\.[A-Za-z_]\w*)*)'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::ATTRIBUTE; + } +} diff --git a/src/Languages/Kotlin/Patterns/KotlinCallablePattern.php b/src/Languages/Kotlin/Patterns/KotlinCallablePattern.php new file mode 100644 index 00000000..95a6d259 --- /dev/null +++ b/src/Languages/Kotlin/Patterns/KotlinCallablePattern.php @@ -0,0 +1,27 @@ +(?<=::)[A-Za-z_]\w*|\b(?!(?:catch|for|if|when|while)\b)[A-Za-z_]\w*(?=\s*\())'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::PROPERTY; + } +} diff --git a/src/Languages/Kotlin/Patterns/KotlinKeywordPattern.php b/src/Languages/Kotlin/Patterns/KotlinKeywordPattern.php new file mode 100644 index 00000000..55262e6f --- /dev/null +++ b/src/Languages/Kotlin/Patterns/KotlinKeywordPattern.php @@ -0,0 +1,27 @@ +abstract|actual|annotation|as|break|by|catch|class|companion|const|constructor|continue|crossinline|data|delegate|do|dynamic|else|enum|expect|external|final|finally|for|fun|get|if|import|in|infix|init|inline|inner|interface|internal|is|lateinit|noinline|object|open|operator|out|override|package|private|protected|public|reified|return|sealed|set|super|suspend|tailrec|this|throw|try|typealias|typeof|val|value|var|vararg|when|where|while)\b'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::KEYWORD; + } +} diff --git a/src/Languages/Kotlin/Patterns/KotlinLiteralPattern.php b/src/Languages/Kotlin/Patterns/KotlinLiteralPattern.php new file mode 100644 index 00000000..b90e8bce --- /dev/null +++ b/src/Languages/Kotlin/Patterns/KotlinLiteralPattern.php @@ -0,0 +1,27 @@ +true|false|null)\b'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::LITERAL; + } +} diff --git a/src/Languages/Kotlin/Patterns/KotlinNamespacePattern.php b/src/Languages/Kotlin/Patterns/KotlinNamespacePattern.php new file mode 100644 index 00000000..e525a5f8 --- /dev/null +++ b/src/Languages/Kotlin/Patterns/KotlinNamespacePattern.php @@ -0,0 +1,27 @@ +[A-Za-z_]\w*(?:\.[A-Za-z_*][\w*]*)*)'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::TYPE; + } +} diff --git a/src/Languages/Kotlin/Patterns/KotlinNumberPattern.php b/src/Languages/Kotlin/Patterns/KotlinNumberPattern.php new file mode 100644 index 00000000..d805ec4d --- /dev/null +++ b/src/Languages/Kotlin/Patterns/KotlinNumberPattern.php @@ -0,0 +1,27 @@ +(?:0[xX][\dA-Fa-f](?:_?[\dA-Fa-f])*|0[bB][01](?:_?[01])*|(?:\d(?:_?\d)*(?:\.\d(?:_?\d)*)?|\.\d(?:_?\d)*)(?:[eE][+-]?\d(?:_?\d)*)?)(?:[uU][lL]?|[lL]|[fF])?)(?![\w.])/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::NUMBER; + } +} diff --git a/src/Languages/Kotlin/Patterns/KotlinOperatorPattern.php b/src/Languages/Kotlin/Patterns/KotlinOperatorPattern.php new file mode 100644 index 00000000..17ff9545 --- /dev/null +++ b/src/Languages/Kotlin/Patterns/KotlinOperatorPattern.php @@ -0,0 +1,27 @@ +===|!==|!!|==|!=|<=|>=|&&|\|\||\+\+|--|->|::|\?\.|\?:|\.\.<|\.\.|[-+*\/%&|^!<>=]=?|[?:;,.{}()\[\]])/'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::OPERATOR; + } +} diff --git a/src/Languages/Kotlin/Patterns/KotlinPropertyPattern.php b/src/Languages/Kotlin/Patterns/KotlinPropertyPattern.php new file mode 100644 index 00000000..5645c23b --- /dev/null +++ b/src/Languages/Kotlin/Patterns/KotlinPropertyPattern.php @@ -0,0 +1,27 @@ +[A-Za-z_]\w*)'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::VARIABLE; + } +} diff --git a/src/Languages/Kotlin/Patterns/KotlinStringPattern.php b/src/Languages/Kotlin/Patterns/KotlinStringPattern.php new file mode 100644 index 00000000..d387263d --- /dev/null +++ b/src/Languages/Kotlin/Patterns/KotlinStringPattern.php @@ -0,0 +1,28 @@ +"""(?:[^"]++|"(?!"")|""(?!"))*+"""|"(?:\\\\.|[^"\\\\\r\n]++)*"|\'(?:\\\\.|[^\'\\\\\r\n])\')/s'; + } + + public function getTokenType(): TokenTypeEnum + { + return TokenTypeEnum::VALUE; + } +} diff --git a/src/Languages/Kotlin/Patterns/KotlinTypePattern.php b/src/Languages/Kotlin/Patterns/KotlinTypePattern.php new file mode 100644 index 00000000..7a35cd9a --- /dev/null +++ b/src/Languages/Kotlin/Patterns/KotlinTypePattern.php @@ -0,0 +1,27 @@ +Any|Boolean|Byte|Char|Double|Float|Int|Long|Nothing|Number|Short|String|UByte|UInt|ULong|UShort|Unit|(?(String name, T payload, Instant createdAt) { + public Event { + if (name.isBlank()) { + throw new IllegalArgumentException("name must not be blank"); + } + } +} + +sealed interface Outcome permits Success, Failure {} + +record Success(String message) implements Outcome {} + +record Failure(Throwable cause) implements Outcome {} + +public final class EventFormatter { + private static final long MAX_EVENTS = 0xCAFE_F00DL; + + public List format(List> events) { + return events.stream() + .map(event -> """ + %s: %s + """.formatted(event.name(), event.payload())) + .toList(); + } + + public Outcome validate(Event event) { + return event == null + ? new Failure(new NullPointerException("event")) + : new Success("valid"); + } +} diff --git a/tests/Bench/Fixtures/kotlin.txt b/tests/Bench/Fixtures/kotlin.txt new file mode 100644 index 00000000..e5acc47f --- /dev/null +++ b/tests/Bench/Fixtures/kotlin.txt @@ -0,0 +1,36 @@ +package demo.highlight + +import java.time.Instant + +@JvmInline +value class EventId(val value: String) + +data class Event( + val id: EventId, + val name: String, + val payload: T, + val createdAt: Instant, +) + +sealed interface Outcome + +data class Success(val message: String) : Outcome + +data class Failure(val cause: Throwable) : Outcome + +typealias Handler = (Event) -> Outcome + +object EventFormatter { + private const val MAX_EVENTS = 0xCAFE_F00DuL + + fun format(events: List>): List = + events.map { event -> + """ + ${event.name}: ${event.payload} + """.trimIndent() + } + + fun validate(event: Event?): Outcome = + event?.let { Success("valid") } + ?: Failure(IllegalArgumentException("event")) +} diff --git a/tests/Bench/HighlighterBench.php b/tests/Bench/HighlighterBench.php index 154b03c3..eb61f9c8 100644 --- a/tests/Bench/HighlighterBench.php +++ b/tests/Bench/HighlighterBench.php @@ -30,8 +30,10 @@ final class HighlighterBench 'html' => 'html.txt', 'http' => 'http.txt', 'ini' => 'ini.txt', + 'java' => 'java.txt', 'javascript' => 'javascript.txt', 'json' => 'json.txt', + 'kotlin' => 'kotlin.txt', 'markdown' => 'markdown.txt', 'nginx' => 'nginx.txt', 'php' => 'php.txt', diff --git a/tests/Languages/Java/JavaLanguageTest.php b/tests/Languages/Java/JavaLanguageTest.php new file mode 100644 index 00000000..b4acfc4e --- /dev/null +++ b/tests/Languages/Java/JavaLanguageTest.php @@ -0,0 +1,110 @@ +assertContains('java', $highlighter->getSupportedLanguageNames()); + + $highlighter->parse('', 'java'); + + $this->assertInstanceOf(JavaLanguage::class, $highlighter->getCurrentLanguage()); + } + + #[Test] + #[DataProvider('provide_it_highlights_representative_syntax_cases')] + public function it_highlights_representative_syntax(string $source, string $expected): void + { + $highlighted = (new Highlighter())->parse($source, 'java'); + + $this->assertStringContainsString($expected, $highlighted); + } + + public static function provide_it_highlights_representative_syntax_cases(): iterable + { + yield 'package keyword' => ['package com.example;', 'package']; + yield 'package name' => ['package com.example;', 'com.example']; + yield 'import' => ['import java.util.List;', 'import']; + yield 'annotation' => ['@Override', '@Override']; + yield 'line comment' => ['// note', '// note']; + yield 'Javadoc' => ['/** note */', '/** note */']; + yield 'string' => ['"hello\\n"', '"hello\\n"']; + yield 'text block' => ['"""hello\nworld"""', '"""hello\nworld"""']; + yield 'character' => ["'x'", '\'x\'']; + yield 'number' => ['0xCAFE_F00DL', '0xCAFE_F00DL']; + yield 'keyword' => ['return', 'return']; + yield 'modifier' => ['public', 'public']; + yield 'built-in type' => ['int', 'int']; + yield 'class' => ['class Widget {}', 'Widget']; + yield 'interface' => ['interface Service {}', 'Service']; + yield 'enum' => ['enum Status {}', 'Status']; + yield 'record' => ['record Point(int x, int y) {}', 'Point']; + yield 'generic type' => ['class Box {}', 'T']; + yield 'literal' => ['return null;', 'null']; + yield 'method' => ['render();', 'render']; + yield 'lambda' => ['value -> value + 1', '->']; + yield 'operator' => ['left instanceof Widget', 'instanceof']; + yield 'punctuation' => ['return value;', ';']; + } + + #[Test] + public function it_escapes_html_and_strips_reserved_markers(): void + { + $source = "class Markup {\r\n" + . " String value = \"<©> ❷img src=x onerror=alert(1)❸ ❶❹❿\";\r" + . " String script = \"\";\r\n" + . "}\r\n"; + + $highlighted = (new Highlighter())->parse($source, 'java'); + $renderedSource = html_entity_decode(strip_tags($highlighted), ENT_QUOTES | ENT_HTML5); + + $expectedSource = str_replace(["\r\n", "\r"], "\n", str_replace(['❶', '❷', '❸', '❹', '❿'], '', $source)); + + $this->assertSame($expectedSource, $renderedSource); + $this->assertStringNotContainsString('\"\r\n" + . "}\r\n"; + + $highlighted = (new Highlighter())->parse($source, 'kotlin'); + $renderedSource = html_entity_decode(strip_tags($highlighted), ENT_QUOTES | ENT_HTML5); + + $expectedSource = str_replace(["\r\n", "\r"], "\n", str_replace(['❶', '❷', '❸', '❹', '❿'], '', $source)); + + $this->assertSame($expectedSource, $renderedSource); + $this->assertStringNotContainsString('