From 76096c5dca8020f990d1183a31ac24115cee4872 Mon Sep 17 00:00:00 2001 From: Boris Krylov Date: Wed, 13 Aug 2025 23:48:55 +0300 Subject: [PATCH] [syntax][json] regenerate bazel files and update API usage GitOrigin-RevId: bee5af4ebe72d7e40e0dce00fbd7933e7a46e1cf --- build/bazel-generated-file-list.txt | 1 + .../intellij/json/JsonLanguageDefinition.kt | 23 +++++++++++-------- json/syntax/BUILD.bazel | 8 +++++++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 0770113279fd..626348df9776 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -320,6 +320,7 @@ json json/backend json/backend/regexp json/backend/tests +json/syntax jupyter jvm/jvm-analysis-api jvm/jvm-analysis-impl diff --git a/json/src/com/intellij/json/JsonLanguageDefinition.kt b/json/src/com/intellij/json/JsonLanguageDefinition.kt index a30f8d05918c..5c4aa57b8738 100644 --- a/json/src/com/intellij/json/JsonLanguageDefinition.kt +++ b/json/src/com/intellij/json/JsonLanguageDefinition.kt @@ -4,26 +4,31 @@ package com.intellij.json import com.intellij.json.syntax.JsonSyntaxElementTypes import com.intellij.json.syntax.JsonSyntaxLexer import com.intellij.platform.syntax.LanguageSyntaxDefinition -import com.intellij.platform.syntax.lexer.Lexer -import com.intellij.platform.syntax.util.runtime.SyntaxGeneratedParserRuntime import com.intellij.platform.syntax.SyntaxElementTypeSet +import com.intellij.platform.syntax.lexer.Lexer +import com.intellij.platform.syntax.parser.SyntaxTreeBuilder import com.intellij.platform.syntax.syntaxElementTypeSetOf import com.intellij.platform.syntax.util.runtime.GrammarKitLanguageDefinition +import com.intellij.platform.syntax.util.runtime.SyntaxGeneratedParserRuntime class JsonLanguageDefinition : LanguageSyntaxDefinition, GrammarKitLanguageDefinition { - override fun getLexer(): Lexer { - return JsonSyntaxLexer() - } - private val jsonComments = syntaxElementTypeSetOf(JsonSyntaxElementTypes.LINE_COMMENT, JsonSyntaxElementTypes.BLOCK_COMMENT) - - override fun getCommentTokens(): SyntaxElementTypeSet = jsonComments - private val jsonPairedBraces = listOf( SyntaxGeneratedParserRuntime.BracePair(JsonSyntaxElementTypes.L_CURLY, JsonSyntaxElementTypes.R_CURLY, true), SyntaxGeneratedParserRuntime.BracePair(JsonSyntaxElementTypes.L_BRACKET, JsonSyntaxElementTypes.R_BRACKET, true), ) override fun getPairedBraces(): Collection = jsonPairedBraces + + override fun parse(builder: SyntaxTreeBuilder) { + throw UnsupportedOperationException("Unsupported operation - generated Parser.") + } + + override fun createLexer(): Lexer { + return JsonSyntaxLexer() + } + + override val comments: SyntaxElementTypeSet + get() = jsonComments } \ No newline at end of file diff --git a/json/syntax/BUILD.bazel b/json/syntax/BUILD.bazel index 9dcae05b06c6..51932760367f 100644 --- a/json/syntax/BUILD.bazel +++ b/json/syntax/BUILD.bazel @@ -1,6 +1,13 @@ ### auto-generated section `build intellij.json.syntax` start +load("//build:compiler-options.bzl", "create_kotlinc_options") load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") +create_kotlinc_options( + name = "custom_syntax", + x_no_call_assertions = True, + x_no_param_assertions = True +) + jvm_resources( name = "syntax_resources", files = glob(["resources/**/*"]), @@ -12,6 +19,7 @@ jvm_library( module_name = "intellij.json.syntax", visibility = ["//visibility:public"], srcs = glob(["gen/**/*.kt", "gen/**/*.java", "src/**/*.kt", "src/**/*.java"], allow_empty = True), + kotlinc_opts = ":custom_syntax", deps = [ "@lib//:kotlin-stdlib", "//platform/syntax/syntax-api:syntax",