Google Git
Sign in
pigweed / third_party / github / JetBrains / kotlin / refs/heads/upstream/bobko/rr/f6c4ffa847a9
commitf6c4ffa847a9618a0c052d1aa5d7986642ac1eff[log] [tgz]
authorNikita Bobko <nikita.bobko@jetbrains.com>Mon Apr 22 16:35:03 2024 +0200
committerNikita Bobko <nikita.bobko@jetbrains.com>Wed Apr 24 17:33:42 2024 +0200
tree70363a5d872bdfdafcb8757b7ec8dfba9be64683
parentcadc7f4dce3bb7a115cea64198821fe3b33a0556 [diff]
[FIR] Properly handle vararg remapping even if ConeInapplicableCandidateError

^KT-67609 Fixed
Review: https://jetbrains.team/p/kt/reviews/15692/timeline

Other related tests:
- compiler/testData/diagnostics/tests/inference/builderInference/invalidateKeys.kt
- compiler/testData/diagnostics/tests/inference/builderInference/regresssions/exponentialErrorsInCSInitial.kt
- compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/stubTypeReceiverRestriction.kt
- compiler/testData/diagnostics/tests/inference/builderInference/stubTypes/stubTypeReceiverRestrictionDisabled.kt
- compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt
- compiler/testData/diagnostics/tests/varargs
- compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsInDifferentPositions.kt
- compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.kt

Related tests in intellij:
- org.jetbrains.fir.uast.test.FirLegacyUastResolveEverythingTestGenerated.testAnnotationComplex
- org.jetbrains.fir.uast.test.FirUastApiTest$Legacy.testAnnotationComplex
- org.jetbrains.kotlin.idea.k2.codeinsight.fixes.HighLevelQuickFixTestGenerated$ReplaceWithArrayCallInAnnotation.testReplaceSingleElementInNamedForm
- org.jetbrains.kotlin.idea.k2.codeinsight.fixes.HighLevelQuickFixTestGenerated$ReplaceWithArrayCallInAnnotation.testReplaceForbiddenAssignmentWithArrayLiteral
- org.jetbrains.kotlin.idea.k2.codeinsight.fixes.HighLevelQuickFixTestGenerated$SurroundWithArrayOfForNamedArgumentsToVarargs.testSimpleNamedArgumentToVararg
- org.jetbrains.kotlin.idea.k2.codeinsight.fixes.HighLevelQuickFixTestGenerated$SurroundWithArrayOfForNamedArgumentsToVarargs.testSurroundWithSpreadForConstructorCall
- org.jetbrains.kotlin.idea.k2.codeinsight.fixes.HighLevelQuickFixTestGenerated$SurroundWithArrayOfForNamedArgumentsToVarargs.testOnlyShortenInsertedArrayOfCall
- org.jetbrains.kotlin.idea.k2.codeinsight.fixes.HighLevelQuickFixTestGenerated$SurroundWithArrayOfForNamedArgumentsToVarargs.testReplaceToArrayOfPrimitiveTypes
- org.jetbrains.fir.uast.test.FirLegacyUastDeclarationTestGenerated.testAnnotationComplex
- org.jetbrains.fir.uast.test.FirLegacyUastTypesTestGenerated.testAnnotationComplex
- org.jetbrains.fir.uast.test.FirLegacyUastValuesTestGenerated.testAnnotationComplex

Cause of the exception: ConeInapplicableCandidateError happens
(calleeReference.isError is true) and because of that handleVarargs
wasn't invoked => two arguments were not wrapped into
FirVarargArgumentsExpression.

The fix is to call handleVarargs even when error happens.

The tricky part of the implementation is that happy-case
(buildResolvedArgumentList/FirResolvedArgumentList) and error-case
(buildArgumentListForErrorCall/FirResolvedArgumentListForErrorCall) have
different format for argToParam mappings.

error-case mapping expects to contain null for problematic arguments.
That's what buildArgumentListForErrorCall was responsible for. After
this commit, the logic became backed into remapArgumentsWithVararg and
handleVarargs (which changed its name). And logic for
buildArgumentListForErrorCall and buildResolvedArgumentList became
uniform

argumentList variable inside remapArgumentsWithVararg got extracted
two stacktraces up into a parameter

'instanceof FirErrorNamedReference' check got replaced with
'instanceof FirResolvedErrorReference'. If I don't do this, then
REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_FUNCTION gets reporeted in
more tests. I don't know what's the difference between
FirErrorNamedReference and FirResolvedErrorReference, but I assume that
it essentially was a duck typing

The change in FirAnnotationValueConverter is needed to keep
FirUastApiTest$Legacy.testAnnotationComplex green. FIR for red code now
have a different structure. A parameter in code like this:
    foo(varargParameter = nonArrayExpression)
is now parsed as FirSpreadArgumentExpression. See the implementation
of remapArgumentsWithVararg. All named arguments are implicitly wrapped
into a FirSpreadArgumentExpression (which makes some sense)
47 files changed
tree: 70363a5d872bdfdafcb8757b7ec8dfba9be64683
  1. .fleet/
  2. .idea/
  3. .space/
  4. analysis/
  5. annotations/
  6. ant/
  7. benchmarks/
  8. build-common/
  9. compiler/
  10. core/
  11. dependencies/
  12. docs/
  13. generators/
  14. gradle/
  15. idea/
  16. jps/
  17. js/
  18. kotlin-js-store/
  19. kotlin-native/
  20. libraries/
  21. license/
  22. native/
  23. plugins/
  24. prepare/
  25. repo/
  26. resources/
  27. scripts/
  28. spec-docs/
  29. test-instrumenter/
  30. tests/
  31. third-party/
  32. wasm/
  33. .gitattributes
  34. .gitignore
  35. build.gradle.kts
  36. ChangeLog.md
  37. CODE_OF_CONDUCT.md
  38. gradle.properties
  39. gradlew
  40. gradlew.bat
  41. ReadMe.md
  42. SECURITY.md
  43. settings.gradle
ReadMe.md

official project TeamCity (simple build status) Maven Central GitHub license Revved up by Develocity

Kotlin Programming Language

Welcome to Kotlin!
It is an open-source, statically typed programming language supported and developed by JetBrains and open-source contributors.

Some handy links:

Kotlin Multiplatform capabilities

Support for multiplatform programming is one of Kotlin’s key benefits. It reduces time spent writing and maintaining the same code for different platforms while retaining the flexibility and benefits of native programming.

Editing Kotlin

Build environment requirements

This repository is using Gradle toolchains feature to select and auto-provision required JDKs from AdoptOpenJdk project.

Alternatively, it is still possible to only provide required JDKs via environment variables (see gradle.properties for supported variable names). To ensure Gradle uses only JDKs from environmental variables - disable Gradle toolchain auto-detection by passing -Porg.gradle.java.installations.auto-detect=false option (or put it into $GRADLE_USER_HOME/gradle.properties).

On Windows you might need to add long paths setting to the repo:

git config core.longpaths true

Building

The project is built with Gradle. Run Gradle to build the project and to run the tests using the following command on Unix/macOS:

./gradlew <tasks-and-options>

or the following command on Windows:

gradlew <tasks-and-options>

On the first project configuration gradle will download and setup the dependencies on

  • intellij-core is a part of command line compiler and contains only necessary APIs.
  • idea-full is a full blown IntelliJ IDEA Community Edition to be used in the plugin module.

These dependencies are quite large, so depending on the quality of your internet connection you might face timeouts getting them. In this case, you can increase timeout by specifying the following command line parameters on the first run:

./gradlew -Dhttp.socketTimeout=60000 -Dhttp.connectionTimeout=60000

Important gradle tasks

  • clean - clean build results
  • dist - assembles the compiler distribution into dist/kotlinc/ folder
  • install - build and install all public artifacts into local maven repository
  • coreLibsTest - build and run stdlib, reflect and kotlin-test tests
  • gradlePluginTest - build and run gradle plugin tests
  • compilerTest - build and run all compiler tests

To reproduce TeamCity build use -Pteamcity=true flag. Local builds don't run proguard and have jar compression disabled by default.

OPTIONAL: Some artifacts, mainly Maven plugin ones, are built separately with Maven. Refer to libraries/ReadMe.md for details.

To build Kotlin/Native, see kotlin-native/README.md.

Working with the project in IntelliJ IDEA

It is recommended to use the latest released version of Intellij IDEA (Community or Ultimate Edition). You can download IntelliJ IDEA here.

After cloning the project, import the project in IntelliJ by choosing the project directory in the Open project dialog.

For handy work with compiler tests it's recommended to use Kotlin Compiler Test Helper

Dependency verification

We have a dependencies verification feature enabled in the repository for all Gradle builds. Gradle will check hashes (md5 and sha256) of used dependencies and will fail builds with Dependency verification failed errors when local artifacts are absent or have different hashes listed in the verification-metadata.xml file.

It's expected that verification-metadata.xml should only be updated with the commits that modify the build. There are some tips how to perform such updates:

  • Delete components section of verification-metadata.xml to avoid stockpiling of old unused dependencies. You may use the following command:
#macOS
sed -i '' -e '/<components>/,/<\/components>/d' gradle/verification-metadata.xml
#Linux & Git for Windows
sed -i -e '/<components>/,/<\/components>/d' gradle/verification-metadata.xml
  • Re-generate dependencies with Gradle's --write-verification-metadata command (verify update relates to your changes)
./gradlew -i --write-verification-metadata sha256,md5 -Pkotlin.native.enabled=true resolveDependencies

resolveDependencies task resolves dependencies for all platforms including dependencies downloaded by plugins.

Keep in mind:

  • If you’re adding a dependency with OS mentioned in an artifact name (darwin, mac, osx, linux, windows), remember to add them to implicitDependencies configuration or update resolveDependencies task if needed. resolveDependencies should resolve all dependencies including dependencies for different platforms.
  • If you have a local.properties file in your Kotlin project folder, make sure that it doesn't contain kotlin.native.enabled=false. Otherwise, native-only dependencies may not be added to the verification metadata. This is because local.properties has higher precedence than the -Pkotlin.native.enabled=true specified in the Gradle command.

Using -dev versions

We publish -dev versions frequently.

For -dev versions you can use the list of available versions and include this maven repository:

maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")

License

Kotlin is distributed under the terms of the Apache License (Version 2.0). See license folder for details.

Contributing

Please be sure to review Kotlin's contributing guidelines to learn how to help the project.