diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/DiagnosticClassGenerator.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/DiagnosticClassGenerator.kt similarity index 100% rename from analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/DiagnosticClassGenerator.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/DiagnosticClassGenerator.kt diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnostic.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLDiagnostic.kt similarity index 100% rename from analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnostic.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLDiagnostic.kt diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLDiagnosticConverter.kt similarity index 100% rename from analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLDiagnosticConverter.kt diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLParameterConversion.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLParameterConversion.kt similarity index 100% rename from analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLParameterConversion.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/HLParameterConversion.kt diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/Main.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/Main.kt similarity index 89% rename from analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/Main.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/Main.kt index 71fa9c8c226..570770c6a8e 100644 --- a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/Main.kt +++ b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/Main.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.JVM_DIAGNOSTICS_L import java.nio.file.Paths fun main() { - val rootPath = Paths.get("idea/idea-frontend-fir/src").toAbsolutePath() + val rootPath = Paths.get("analysis/analysis-api-fir/src").toAbsolutePath() val packageName = "org.jetbrains.kotlin.analysis.api.fir.diagnostics" DiagnosticClassGenerator.generate(rootPath, DIAGNOSTICS_LIST + JVM_DIAGNOSTICS_LIST, packageName) } diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/generatorUtils.kt similarity index 100% rename from analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/generatorUtils.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/generatorUtils.kt diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt similarity index 100% rename from analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/AbstractDiagnosticsDataClassRenderer.kt diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt similarity index 100% rename from analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/FirDiagnosticToKtDiagnosticConverterRenderer.kt diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt similarity index 100% rename from analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/KtDiagnosticClassImplementationRenderer.kt diff --git a/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt b/analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt similarity index 100% rename from analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt rename to analysis/analysis-api-fir/analysis-api-fir-generator/src/org/jetbrains/kotlin/analysis/api/fir/generator/rendererrs/KtDiagnosticClassRenderer.kt diff --git a/generators/analysis-api-generator/build.gradle.kts b/generators/analysis-api-generator/build.gradle.kts new file mode 100644 index 00000000000..b33ec95f25b --- /dev/null +++ b/generators/analysis-api-generator/build.gradle.kts @@ -0,0 +1,23 @@ +plugins { + kotlin("jvm") + id("jps-compatible") +} + +sourceSets { + "main" { java.srcDirs("main") } + "test" { projectDefault() } +} + +dependencies { + compile(kotlinStdlib("jdk8")) + + testCompile(projectTests(":generators:test-generator")) + testCompile(projectTests(":compiler:tests-common")) + testCompile(projectTests(":compiler:tests-spec")) + testCompile(projectTests("::analysis:low-level-api-fir")) + testCompile(projectTests(":analysis:analysis-api-fir")) + testCompile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } + testApiJUnit5() +} + +val generateFrontendApiTests by generator("org.jetbrains.kotlin.generators.tests.analysis.api.GenerateTestsKt") diff --git a/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateTests.kt b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateTests.kt new file mode 100644 index 00000000000..6ff72b53166 --- /dev/null +++ b/generators/analysis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/GenerateTests.kt @@ -0,0 +1,172 @@ +/* + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.generators.tests.analysis.api + +import org.jetbrains.kotlin.analysis.api.fir.AbstractReferenceResolveTest +import org.jetbrains.kotlin.analysis.api.fir.components.* +import org.jetbrains.kotlin.analysis.api.fir.scopes.AbstractFileScopeTest +import org.jetbrains.kotlin.analysis.api.fir.scopes.AbstractMemberScopeByFqNameTest +import org.jetbrains.kotlin.analysis.api.fir.symbols.AbstractSymbolByFqNameTest +import org.jetbrains.kotlin.analysis.api.fir.symbols.AbstractSymbolByPsiTest +import org.jetbrains.kotlin.analysis.api.fir.symbols.AbstractSymbolByReferenceTest +import org.jetbrains.kotlin.analysis.low.level.api.fir.* +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostic.AbstractDiagnosticTraversalCounterTest +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostic.AbstractFirContextCollectionTest +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostic.compiler.based.AbstractDiagnosisCompilerTestDataSpecTest +import org.jetbrains.kotlin.analysis.low.level.api.fir.diagnostic.compiler.based.AbstractDiagnosisCompilerTestDataTest +import org.jetbrains.kotlin.analysis.low.level.api.fir.file.structure.AbstractFileStructureTest +import org.jetbrains.kotlin.analysis.low.level.api.fir.resolve.AbstractInnerDeclarationsResolvePhaseTest +import org.jetbrains.kotlin.generators.util.TestGeneratorUtil +import org.jetbrains.kotlin.spec.utils.GeneralConfiguration +import org.jetbrains.kotlin.spec.utils.tasks.detectDirsWithTestsMapFileOnly +import org.jetbrains.kotlin.test.generators.generateTestGroupSuiteWithJUnit5 +import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestSpec + +fun main(args: Array) { + System.setProperty("java.awt.headless", "true") + + val excludedFirTestdataPattern = "^(.+)\\.fir\\.kts?\$" + + + generateTestGroupSuiteWithJUnit5(args) { + testGroup("analysis/analysis-api-fir/tests", "analysis/analysis-api/testData") { + testClass { + model("analysisSession/resolveCall") + } + + testClass { + model("memberScopeByFqName") + } + + testClass { + model("fileScopeTest", extension = "kt") + } + + testClass { + model("symbols/symbolByPsi") + } + + testClass { + model("symbols/symbolByFqName") + } + + testClass { + model("symbols/symbolByReference") + } + + testClass { + model("components/expectedExpressionType") + } + + testClass { + model("components/overridenDeclarations") + } + + testClass { + model("components/expressionType") + } + + testClass { + model("components/declarationRenderer") + } + + testClass { + model("referenceResolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) + } + + testClass { + model("components/importOptimizer", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) + } + } + + testGroup("analysis/low-level-api-fir/tests", "compiler/fir/raw-fir/psi2fir/testData") { + testClass { + model("rawBuilder", testMethod = "doTest") + } + } + + testGroup("analysis/low-level-api-fir/tests", "analysis/low-level-api-fir/testdata") { + testClass { + model("onAirResolve") + } + + testClass { + model("lazyResolve") + } + + testClass { + model("fileStructure") + } + + testClass { + model("fileStructure") + } + + testClass { + model("diagnosticTraversalCounter") + } + + testClass { + model("innerDeclarationsResolve") + } + + testClass { + model("partialRawBuilder", testMethod = "doRawFirTest") + } + + testClass { + model("getOrBuildFir") + } + } + + testGroup( + "analysis/low-level-api-fir/tests", + "compiler/fir/analysis-tests/testData", + ) { + testClass(suiteTestClassName = "DiagnosisCompilerFirTestdataTestGenerated") { + model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) + model("resolveWithStdlib", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) + } + } + + testGroup( + "analysis/low-level-api-fir/tests", + "compiler/testData", + ) { + testClass(suiteTestClassName = "DiagnosisCompilerTestFE10TestdataTestGenerated") { + model( + "diagnostics/tests", + excludedPattern = excludedFirTestdataPattern, + ) + model( + "diagnostics/testsWithStdLib", + excludedPattern = excludedFirTestdataPattern, + excludeDirs = listOf("native") + ) + } + } + + + testGroup("analysis/low-level-api-fir/tests", testDataRoot = GeneralConfiguration.SPEC_TESTDATA_PATH) { + testClass(suiteTestClassName = "FirIdeSpecTest") { + model( + "diagnostics", + excludeDirs = listOf("helpers") + detectDirsWithTestsMapFileOnly("diagnostics"), + excludedPattern = excludedFirTestdataPattern, + ) + } + } + testGroup(testsRoot = "compiler/fir/analysis-tests/tests-gen", testDataRoot = GeneralConfiguration.SPEC_TESTDATA_PATH) { + testClass { + model( + "diagnostics", + excludeDirs = listOf("helpers") + detectDirsWithTestsMapFileOnly("diagnostics"), + excludedPattern = excludedFirTestdataPattern + ) + } + } + } +} \ No newline at end of file diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index a485a90942b..0591f75b220 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -79,7 +79,7 @@ projectTest(parallel = true) { } val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTestsKt") { - dependsOn(":generators:frontend-api-generator:generateFrontendApiTests") + dependsOn(":generators:analysis-api-generator:generateFrontendApiTests") } val generateProtoBuf by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufKt", protobufSourceSet) diff --git a/generators/frontend-api-generator/build.gradle.kts b/generators/frontend-api-generator/build.gradle.kts index 9c08a0622c8..e69de29bb2d 100644 --- a/generators/frontend-api-generator/build.gradle.kts +++ b/generators/frontend-api-generator/build.gradle.kts @@ -1,23 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -sourceSets { - "main" { java.srcDirs("main") } - "test" { projectDefault() } -} - -dependencies { - compile(kotlinStdlib("jdk8")) - - testCompile(projectTests(":generators:test-generator")) - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":compiler:tests-spec")) - testCompile(projectTests("::analysis:low-level-api-fir")) - testCompile(projectTests(":analysis:analysis-api-fir")) - testCompile(intellijCoreDep()) { includeJars("intellij-core", "guava", rootProject = rootProject) } - testApiJUnit5() -} - -val generateFrontendApiTests by generator("org.jetbrains.kotlin.generators.tests.frontend.api.GenerateTestsKt") diff --git a/generators/frontend-api-generator/tests/org/jetbrains/kotlin/generators/tests/frontend/api/GenerateTests.kt b/generators/frontend-api-generator/tests/org/jetbrains/kotlin/generators/tests/frontend/api/GenerateTests.kt index 9c47bdc7b12..e69de29bb2d 100644 --- a/generators/frontend-api-generator/tests/org/jetbrains/kotlin/generators/tests/frontend/api/GenerateTests.kt +++ b/generators/frontend-api-generator/tests/org/jetbrains/kotlin/generators/tests/frontend/api/GenerateTests.kt @@ -1,174 +0,0 @@ -/* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.generators.tests.frontend.api - -import org.jetbrains.kotlin.generators.util.TestGeneratorUtil -import org.jetbrains.kotlin.idea.fir.frontend.api.AbstractReferenceResolveTest -import org.jetbrains.kotlin.idea.fir.frontend.api.components.* -import org.jetbrains.kotlin.idea.fir.frontend.api.fir.AbstractResolveCallTest -import org.jetbrains.kotlin.idea.fir.frontend.api.scopes.AbstractFileScopeTest -import org.jetbrains.kotlin.idea.fir.frontend.api.scopes.AbstractMemberScopeByFqNameTest -import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByFqNameTest -import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByPsiTest -import org.jetbrains.kotlin.idea.fir.frontend.api.symbols.AbstractSymbolByReferenceTest -import org.jetbrains.kotlin.idea.fir.low.level.api.* -import org.jetbrains.kotlin.idea.fir.low.level.api.diagnostic.AbstractDiagnosticTraversalCounterTest -import org.jetbrains.kotlin.idea.fir.low.level.api.diagnostic.AbstractFirContextCollectionTest -import org.jetbrains.kotlin.idea.fir.low.level.api.diagnostic.compiler.based.AbstractDiagnosisCompilerTestDataSpecTest -import org.jetbrains.kotlin.idea.fir.low.level.api.diagnostic.compiler.based.AbstractDiagnosisCompilerTestDataTest -import org.jetbrains.kotlin.idea.fir.low.level.api.file.structure.AbstractFileStructureTest -import org.jetbrains.kotlin.idea.fir.low.level.api.resolve.AbstractInnerDeclarationsResolvePhaseTest -import org.jetbrains.kotlin.spec.utils.GeneralConfiguration -import org.jetbrains.kotlin.spec.utils.tasks.detectDirsWithTestsMapFileOnly -import org.jetbrains.kotlin.test.generators.generateTestGroupSuiteWithJUnit5 -import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestSpec - -fun main(args: Array) { - System.setProperty("java.awt.headless", "true") - - val excludedFirTestdataPattern = "^(.+)\\.fir\\.kts?\$" - - - generateTestGroupSuiteWithJUnit5(args) { - - testGroup("idea/idea-frontend-fir/tests", "idea/idea-frontend-fir/testData") { - testClass { - model("analysisSession/resolveCall") - } - - testClass { - model("memberScopeByFqName") - } - - testClass { - model("fileScopeTest", extension = "kt") - } - - testClass { - model("symbols/symbolByPsi") - } - - testClass { - model("symbols/symbolByFqName") - } - - testClass { - model("symbols/symbolByReference") - } - - testClass { - model("components/expectedExpressionType") - } - - testClass { - model("components/overridenDeclarations") - } - - testClass { - model("components/expressionType") - } - - testClass { - model("components/declarationRenderer") - } - - testClass { - model("referenceResolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) - } - - testClass { - model("components/importOptimizer", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) - } - } - - testGroup("idea/idea-frontend-fir/idea-fir-low-level-api/tests", "compiler/fir/raw-fir/psi2fir/testData") { - testClass { - model("rawBuilder", testMethod = "doTest") - } - } - - testGroup("idea/idea-frontend-fir/idea-fir-low-level-api/tests", "idea/idea-frontend-fir/idea-fir-low-level-api/testdata") { - testClass { - model("onAirResolve") - } - - testClass { - model("lazyResolve") - } - - testClass { - model("fileStructure") - } - - testClass { - model("fileStructure") - } - - testClass { - model("diagnosticTraversalCounter") - } - - testClass { - model("innerDeclarationsResolve") - } - - testClass { - model("partialRawBuilder", testMethod = "doRawFirTest") - } - - testClass { - model("getOrBuildFir") - } - } - - testGroup( - "idea/idea-frontend-fir/idea-fir-low-level-api/tests", - "compiler/fir/analysis-tests/testData", - ) { - testClass(suiteTestClassName = "DiagnosisCompilerFirTestdataTestGenerated") { - model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) - model("resolveWithStdlib", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME) - } - } - - testGroup( - "idea/idea-frontend-fir/idea-fir-low-level-api/tests", - "compiler/testData", - ) { - testClass(suiteTestClassName = "DiagnosisCompilerTestFE10TestdataTestGenerated") { - model( - "diagnostics/tests", - excludedPattern = excludedFirTestdataPattern, - ) - model( - "diagnostics/testsWithStdLib", - excludedPattern = excludedFirTestdataPattern, - excludeDirs = listOf("native") - ) - } - } - - - testGroup("idea/idea-frontend-fir/idea-fir-low-level-api/tests", testDataRoot = GeneralConfiguration.SPEC_TESTDATA_PATH) { - testClass(suiteTestClassName = "FirIdeSpecTest") { - model( - "diagnostics", - excludeDirs = listOf("helpers") + detectDirsWithTestsMapFileOnly("diagnostics"), - excludedPattern = excludedFirTestdataPattern, - ) - } - } - testGroup(testsRoot = "compiler/fir/analysis-tests/tests-gen", testDataRoot = GeneralConfiguration.SPEC_TESTDATA_PATH) { - testClass { - model( - "diagnostics", - excludeDirs = listOf("helpers") + detectDirsWithTestsMapFileOnly("diagnostics"), - excludedPattern = excludedFirTestdataPattern - ) - } - } - } -} \ No newline at end of file diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/TagsExtractor.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/TagsExtractor.kt index 879df9a5d05..f8eacc5310e 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/TagsExtractor.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/util/TagsExtractor.kt @@ -11,7 +11,9 @@ private const val TAGS_FILE_NAME = "_tags.txt" private val PROHIBITED_SYMBOLS = listOf(' ', ',', '(', ')', '&', '|', '!') fun extractTagsFromDirectory(dir: File): List { - require(dir.isDirectory) + require(dir.isDirectory) { + "${dir.absolutePath} is not a directory" + } val tagsFile = dir.resolve(TAGS_FILE_NAME) if (!tagsFile.exists()) return emptyList() return tagsFile.readLines().filter { it.isNotBlank() }.onEach(::validateTag) diff --git a/settings.gradle b/settings.gradle index a157f2211b7..0bba1958c9a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -443,7 +443,7 @@ if (attachedIntellijVersion == "212") { // Latest available platform in scope of intellij "jvm-run-configurations/kotlin.jvm-run-configurations.iml" } -include ":generators:frontend-api-generator", +include ":generators:analysis-api-generator", ":analysis:low-level-api-fir", ":analysis:analysis-api-fir:analysis-api-fir-generator", ":analysis:analysis-api-fir",