Snap for 11249892 from 95c1ccb9e184144df10dc9be43beba162dfb1829 to studio-hedgehog-release
Change-Id: I70b8383c7ac0eadb8f278c29bb3e964f33c090fa
diff --git a/.idea/libraries/kotlinc_allopen_compiler_plugin.xml b/.idea/libraries/kotlinc_allopen_compiler_plugin.xml
index 0b6b056..d9c479f 100644
--- a/.idea/libraries/kotlinc_allopen_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_allopen_compiler_plugin.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.allopen-compiler-plugin" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:allopen-compiler-plugin-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:allopen-compiler-plugin-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/1.9.21-release-633/allopen-compiler-plugin-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/1.9.22-release-704/allopen-compiler-plugin-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/1.9.21-release-633/allopen-compiler-plugin-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/allopen-compiler-plugin-for-ide/1.9.22-release-704/allopen-compiler-plugin-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_analysis_api_providers.xml b/.idea/libraries/kotlinc_analysis_api_providers.xml
index 52890dd..4242060 100644
--- a/.idea/libraries/kotlinc_analysis_api_providers.xml
+++ b/.idea/libraries/kotlinc_analysis_api_providers.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.analysis-api-providers" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:analysis-api-providers-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:analysis-api-providers-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-api-providers-for-ide/1.9.21-release-633/analysis-api-providers-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-api-providers-for-ide/1.9.22-release-704/analysis-api-providers-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-api-providers-for-ide/1.9.21-release-633/analysis-api-providers-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-api-providers-for-ide/1.9.22-release-704/analysis-api-providers-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_analysis_project_structure.xml b/.idea/libraries/kotlinc_analysis_project_structure.xml
index a8c7b82..4a09642 100644
--- a/.idea/libraries/kotlinc_analysis_project_structure.xml
+++ b/.idea/libraries/kotlinc_analysis_project_structure.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.analysis-project-structure" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:analysis-project-structure-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:analysis-project-structure-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-project-structure-for-ide/1.9.21-release-633/analysis-project-structure-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-project-structure-for-ide/1.9.22-release-704/analysis-project-structure-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-project-structure-for-ide/1.9.21-release-633/analysis-project-structure-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/analysis-project-structure-for-ide/1.9.22-release-704/analysis-project-structure-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml b/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml
index 4a77172..703b91b 100644
--- a/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.android-extensions-compiler-plugin" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:android-extensions-compiler-plugin-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:android-extensions-compiler-plugin-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/1.9.21-release-633/android-extensions-compiler-plugin-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/1.9.22-release-704/android-extensions-compiler-plugin-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/1.9.21-release-633/android-extensions-compiler-plugin-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/android-extensions-compiler-plugin-for-ide/1.9.22-release-704/android-extensions-compiler-plugin-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_assignment_compiler_plugin.xml b/.idea/libraries/kotlinc_assignment_compiler_plugin.xml
index fce1e34..81bdab6 100644
--- a/.idea/libraries/kotlinc_assignment_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_assignment_compiler_plugin.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.assignment-compiler-plugin" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:assignment-compiler-plugin-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:assignment-compiler-plugin-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/assignment-compiler-plugin-for-ide/1.9.21-release-633/assignment-compiler-plugin-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/assignment-compiler-plugin-for-ide/1.9.22-release-704/assignment-compiler-plugin-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/assignment-compiler-plugin-for-ide/1.9.21-release-633/assignment-compiler-plugin-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/assignment-compiler-plugin-for-ide/1.9.22-release-704/assignment-compiler-plugin-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api.xml b/.idea/libraries/kotlinc_high_level_api.xml
index 838da69..05ad0ac 100644
--- a/.idea/libraries/kotlinc_high_level_api.xml
+++ b/.idea/libraries/kotlinc_high_level_api.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.high-level-api" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-for-ide/1.9.21-release-633/high-level-api-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-for-ide/1.9.22-release-704/high-level-api-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-for-ide/1.9.21-release-633/high-level-api-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-for-ide/1.9.22-release-704/high-level-api-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api_fe10.xml b/.idea/libraries/kotlinc_high_level_api_fe10.xml
index e15d987..8fb48f9 100644
--- a/.idea/libraries/kotlinc_high_level_api_fe10.xml
+++ b/.idea/libraries/kotlinc_high_level_api_fe10.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.high-level-api-fe10" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-fe10-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-fe10-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fe10-for-ide/1.9.21-release-633/high-level-api-fe10-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fe10-for-ide/1.9.22-release-704/high-level-api-fe10-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fe10-for-ide/1.9.21-release-633/high-level-api-fe10-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fe10-for-ide/1.9.22-release-704/high-level-api-fe10-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api_fir.xml b/.idea/libraries/kotlinc_high_level_api_fir.xml
index 8f77afb..0cfffd8 100644
--- a/.idea/libraries/kotlinc_high_level_api_fir.xml
+++ b/.idea/libraries/kotlinc_high_level_api_fir.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.high-level-api-fir" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-fir-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-fir-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-for-ide/1.9.21-release-633/high-level-api-fir-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-for-ide/1.9.22-release-704/high-level-api-fir-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-for-ide/1.9.21-release-633/high-level-api-fir-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-for-ide/1.9.22-release-704/high-level-api-fir-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api_fir_tests.xml b/.idea/libraries/kotlinc_high_level_api_fir_tests.xml
index 905777a..a12e603 100644
--- a/.idea/libraries/kotlinc_high_level_api_fir_tests.xml
+++ b/.idea/libraries/kotlinc_high_level_api_fir_tests.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.high-level-api-fir-tests" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-fir-tests-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-fir-tests-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-tests-for-ide/1.9.21-release-633/high-level-api-fir-tests-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-tests-for-ide/1.9.22-release-704/high-level-api-fir-tests-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-tests-for-ide/1.9.21-release-633/high-level-api-fir-tests-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-fir-tests-for-ide/1.9.22-release-704/high-level-api-fir-tests-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api_impl_base.xml b/.idea/libraries/kotlinc_high_level_api_impl_base.xml
index c5ff228..205583b 100644
--- a/.idea/libraries/kotlinc_high_level_api_impl_base.xml
+++ b/.idea/libraries/kotlinc_high_level_api_impl_base.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.high-level-api-impl-base" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-impl-base-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-impl-base-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-for-ide/1.9.21-release-633/high-level-api-impl-base-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-for-ide/1.9.22-release-704/high-level-api-impl-base-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-for-ide/1.9.21-release-633/high-level-api-impl-base-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-for-ide/1.9.22-release-704/high-level-api-impl-base-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml b/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml
index ff794cb..d2967d4 100644
--- a/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml
+++ b/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.high-level-api-impl-base-tests" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-impl-base-tests-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:high-level-api-impl-base-tests-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-tests-for-ide/1.9.21-release-633/high-level-api-impl-base-tests-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-tests-for-ide/1.9.22-release-704/high-level-api-impl-base-tests-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-tests-for-ide/1.9.21-release-633/high-level-api-impl-base-tests-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/high-level-api-impl-base-tests-for-ide/1.9.22-release-704/high-level-api-impl-base-tests-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml b/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml
index 35d4b27..a027f59 100644
--- a/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml
+++ b/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.incremental-compilation-impl-tests" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:incremental-compilation-impl-tests-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:incremental-compilation-impl-tests-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/incremental-compilation-impl-tests-for-ide/1.9.21-release-633/incremental-compilation-impl-tests-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/incremental-compilation-impl-tests-for-ide/1.9.22-release-704/incremental-compilation-impl-tests-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/incremental-compilation-impl-tests-for-ide/1.9.21-release-633/incremental-compilation-impl-tests-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/incremental-compilation-impl-tests-for-ide/1.9.22-release-704/incremental-compilation-impl-tests-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_build_common_tests.xml b/.idea/libraries/kotlinc_kotlin_build_common_tests.xml
index e872942..8ccc668 100644
--- a/.idea/libraries/kotlinc_kotlin_build_common_tests.xml
+++ b/.idea/libraries/kotlinc_kotlin_build_common_tests.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-build-common-tests" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-build-common-tests-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-build-common-tests-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-build-common-tests-for-ide/1.9.21-release-633/kotlin-build-common-tests-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-build-common-tests-for-ide/1.9.22-release-704/kotlin-build-common-tests-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-build-common-tests-for-ide/1.9.21-release-633/kotlin-build-common-tests-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-build-common-tests-for-ide/1.9.22-release-704/kotlin-build-common-tests-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_cli.xml b/.idea/libraries/kotlinc_kotlin_compiler_cli.xml
index ad2391d..9cb5590 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_cli.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_cli.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-compiler-cli" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-cli-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-cli-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-cli-for-ide/1.9.21-release-633/kotlin-compiler-cli-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-cli-for-ide/1.9.22-release-704/kotlin-compiler-cli-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-cli-for-ide/1.9.21-release-633/kotlin-compiler-cli-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-cli-for-ide/1.9.22-release-704/kotlin-compiler-cli-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_common.xml b/.idea/libraries/kotlinc_kotlin_compiler_common.xml
index 5c1e500..8375390 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_common.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_common.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-compiler-common" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-common-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-common-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.9.21-release-633/kotlin-compiler-common-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.9.22-release-704/kotlin-compiler-common-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.9.21-release-633/kotlin-compiler-common-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-common-for-ide/1.9.22-release-704/kotlin-compiler-common-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml b/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml
index e891742..9801f1e 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-compiler-fe10" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-fe10-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-fe10-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.9.21-release-633/kotlin-compiler-fe10-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.9.22-release-704/kotlin-compiler-fe10-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.9.21-release-633/kotlin-compiler-fe10-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fe10-for-ide/1.9.22-release-704/kotlin-compiler-fe10-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_fir.xml b/.idea/libraries/kotlinc_kotlin_compiler_fir.xml
index 1bee013..940c91d 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_fir.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_fir.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-compiler-fir" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-fir-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-fir-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fir-for-ide/1.9.21-release-633/kotlin-compiler-fir-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fir-for-ide/1.9.22-release-704/kotlin-compiler-fir-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fir-for-ide/1.9.21-release-633/kotlin-compiler-fir-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-fir-for-ide/1.9.22-release-704/kotlin-compiler-fir-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_ir.xml b/.idea/libraries/kotlinc_kotlin_compiler_ir.xml
index 6a0ac9e..6f13933 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_ir.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_ir.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-compiler-ir" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-ir-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-ir-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/1.9.21-release-633/kotlin-compiler-ir-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/1.9.22-release-704/kotlin-compiler-ir-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/1.9.21-release-633/kotlin-compiler-ir-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-ir-for-ide/1.9.22-release-704/kotlin-compiler-ir-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_compiler_tests.xml b/.idea/libraries/kotlinc_kotlin_compiler_tests.xml
index 5264e00..e7eb9e7 100644
--- a/.idea/libraries/kotlinc_kotlin_compiler_tests.xml
+++ b/.idea/libraries/kotlinc_kotlin_compiler_tests.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-compiler-tests" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-tests-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-compiler-tests-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-tests-for-ide/1.9.21-release-633/kotlin-compiler-tests-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-tests-for-ide/1.9.22-release-704/kotlin-compiler-tests-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-tests-for-ide/1.9.21-release-633/kotlin-compiler-tests-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-compiler-tests-for-ide/1.9.22-release-704/kotlin-compiler-tests-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_dist.xml b/.idea/libraries/kotlinc_kotlin_dist.xml
index 94b0f4a..f00d6bc 100644
--- a/.idea/libraries/kotlinc_kotlin_dist.xml
+++ b/.idea/libraries/kotlinc_kotlin_dist.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-dist" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-dist-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-dist-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.9.21-release-633/kotlin-dist-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.9.22-release-704/kotlin-dist-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.9.21-release-633/kotlin-dist-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.9.22-release-704/kotlin-dist-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml b/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml
index f33c2cf..086c8e6 100644
--- a/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml
+++ b/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-gradle-statistics" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-gradle-statistics-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-gradle-statistics-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-statistics-for-ide/1.9.21-release-633/kotlin-gradle-statistics-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-statistics-for-ide/1.9.22-release-704/kotlin-gradle-statistics-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-statistics-for-ide/1.9.21-release-633/kotlin-gradle-statistics-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-gradle-statistics-for-ide/1.9.22-release-704/kotlin-gradle-statistics-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_jps_common.xml b/.idea/libraries/kotlinc_kotlin_jps_common.xml
index 064a7f3..57511f9 100644
--- a/.idea/libraries/kotlinc_kotlin_jps_common.xml
+++ b/.idea/libraries/kotlinc_kotlin_jps_common.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-jps-common" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-common-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-common-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-common-for-ide/1.9.21-release-633/kotlin-jps-common-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-common-for-ide/1.9.22-release-704/kotlin-jps-common-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-common-for-ide/1.9.21-release-633/kotlin-jps-common-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-common-for-ide/1.9.22-release-704/kotlin-jps-common-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml b/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml
index de96e0c..e765896 100644
--- a/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml
+++ b/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-jps-plugin-classpath" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-classpath:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-classpath:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.9.21-release-633/kotlin-jps-plugin-classpath-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.9.22-release-704/kotlin-jps-plugin-classpath-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.9.21-release-633/kotlin-jps-plugin-classpath-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.9.22-release-704/kotlin-jps-plugin-classpath-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_jps_plugin_tests.xml b/.idea/libraries/kotlinc_kotlin_jps_plugin_tests.xml
index 55d7c2a..a71e1f4 100644
--- a/.idea/libraries/kotlinc_kotlin_jps_plugin_tests.xml
+++ b/.idea/libraries/kotlinc_kotlin_jps_plugin_tests.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-jps-plugin-tests" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-tests-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-tests-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.9.21-release-633/kotlin-jps-plugin-tests-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.9.22-release-704/kotlin-jps-plugin-tests-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.9.21-release-633/kotlin-jps-plugin-tests-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.9.22-release-704/kotlin-jps-plugin-tests-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_script_runtime.xml b/.idea/libraries/kotlinc_kotlin_script_runtime.xml
index 67e6226..3d31bd4 100644
--- a/.idea/libraries/kotlinc_kotlin_script_runtime.xml
+++ b/.idea/libraries/kotlinc_kotlin_script_runtime.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-script-runtime" type="repository">
- <properties maven-id="org.jetbrains.kotlin:kotlin-script-runtime:1.9.21-release-633" />
+ <properties maven-id="org.jetbrains.kotlin:kotlin-script-runtime:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.9.21-release-633/kotlin-script-runtime-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.9.22-release-704/kotlin-script-runtime-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.9.21-release-633/kotlin-script-runtime-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-script-runtime/1.9.22-release-704/kotlin-script-runtime-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_scripting_common.xml b/.idea/libraries/kotlinc_kotlin_scripting_common.xml
index b2bce81..c2baae3 100644
--- a/.idea/libraries/kotlinc_kotlin_scripting_common.xml
+++ b/.idea/libraries/kotlinc_kotlin_scripting_common.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-scripting-common" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-common:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-common:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.9.21-release-633/kotlin-scripting-common-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.9.22-release-704/kotlin-scripting-common-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.9.21-release-633/kotlin-scripting-common-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-common/1.9.22-release-704/kotlin-scripting-common-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml b/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml
index ec64f32..54d63c6 100644
--- a/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml
+++ b/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-scripting-compiler-impl" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-compiler-impl:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.9.21-release-633/kotlin-scripting-compiler-impl-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.9.22-release-704/kotlin-scripting-compiler-impl-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.9.21-release-633/kotlin-scripting-compiler-impl-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-compiler-impl/1.9.22-release-704/kotlin-scripting-compiler-impl-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml b/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml
index f583f64..4079c03 100644
--- a/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml
+++ b/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-scripting-jvm" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.9.21-release-633/kotlin-scripting-jvm-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.9.22-release-704/kotlin-scripting-jvm-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.9.21-release-633/kotlin-scripting-jvm-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-scripting-jvm/1.9.22-release-704/kotlin-scripting-jvm-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_stdlib.xml b/.idea/libraries/kotlinc_kotlin_stdlib.xml
index e784d6c..5952e6a 100644
--- a/.idea/libraries/kotlinc_kotlin_stdlib.xml
+++ b/.idea/libraries/kotlinc_kotlin_stdlib.xml
@@ -1,6 +1,6 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-stdlib" type="repository">
- <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21-release-633">
+ <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22-release-704">
<exclude>
<dependency maven-id="org.jetbrains:annotations" />
</exclude>
@@ -9,15 +9,15 @@
<root url="file://$PROJECT_DIR$/lib/annotations/kotlin" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.21-release-633/kotlin-stdlib-jdk8-1.9.21-release-633.jar!/" />
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.9.21-release-633/kotlin-stdlib-1.9.21-release-633.jar!/" />
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.21-release-633/kotlin-stdlib-jdk7-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.22-release-704/kotlin-stdlib-jdk8-1.9.22-release-704.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.9.22-release-704/kotlin-stdlib-1.9.22-release-704.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.22-release-704/kotlin-stdlib-jdk7-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.21-release-633/kotlin-stdlib-jdk8-1.9.21-release-633-sources.jar!/" />
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.9.21-release-633/kotlin-stdlib-1.9.21-release-633-sources.jar!/" />
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.21-release-633/kotlin-stdlib-jdk7-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.22-release-704/kotlin-stdlib-jdk8-1.9.22-release-704-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.9.22-release-704/kotlin-stdlib-1.9.22-release-704-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.22-release-704/kotlin-stdlib-jdk7-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlin_stdlib_minimal_for_test.xml b/.idea/libraries/kotlinc_kotlin_stdlib_minimal_for_test.xml
index 1a4300e..09f0429 100644
--- a/.idea/libraries/kotlinc_kotlin_stdlib_minimal_for_test.xml
+++ b/.idea/libraries/kotlinc_kotlin_stdlib_minimal_for_test.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-stdlib-minimal-for-test" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-stdlib-minimal-for-test-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-stdlib-minimal-for-test-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-minimal-for-test-for-ide/1.9.21-release-633/kotlin-stdlib-minimal-for-test-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-minimal-for-test-for-ide/1.9.22-release-704/kotlin-stdlib-minimal-for-test-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-minimal-for-test-for-ide/1.9.21-release-633/kotlin-stdlib-minimal-for-test-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-minimal-for-test-for-ide/1.9.22-release-704/kotlin-stdlib-minimal-for-test-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml b/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml
index 61e9897..b413135 100644
--- a/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlinx-serialization-compiler-plugin" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlinx-serialization-compiler-plugin-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlinx-serialization-compiler-plugin-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/1.9.21-release-633/kotlinx-serialization-compiler-plugin-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/1.9.22-release-704/kotlinx-serialization-compiler-plugin-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/1.9.21-release-633/kotlinx-serialization-compiler-plugin-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlinx-serialization-compiler-plugin-for-ide/1.9.22-release-704/kotlinx-serialization-compiler-plugin-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_lombok_compiler_plugin.xml b/.idea/libraries/kotlinc_lombok_compiler_plugin.xml
index 2cfdff1..89589d2 100644
--- a/.idea/libraries/kotlinc_lombok_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_lombok_compiler_plugin.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.lombok-compiler-plugin" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:lombok-compiler-plugin-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:lombok-compiler-plugin-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/1.9.21-release-633/lombok-compiler-plugin-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/1.9.22-release-704/lombok-compiler-plugin-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/1.9.21-release-633/lombok-compiler-plugin-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/lombok-compiler-plugin-for-ide/1.9.22-release-704/lombok-compiler-plugin-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_low_level_api_fir.xml b/.idea/libraries/kotlinc_low_level_api_fir.xml
index 9655c32..678c5a9 100644
--- a/.idea/libraries/kotlinc_low_level_api_fir.xml
+++ b/.idea/libraries/kotlinc_low_level_api_fir.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.low-level-api-fir" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:low-level-api-fir-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:low-level-api-fir-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/low-level-api-fir-for-ide/1.9.21-release-633/low-level-api-fir-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/low-level-api-fir-for-ide/1.9.22-release-704/low-level-api-fir-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/low-level-api-fir-for-ide/1.9.21-release-633/low-level-api-fir-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/low-level-api-fir-for-ide/1.9.22-release-704/low-level-api-fir-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_noarg_compiler_plugin.xml b/.idea/libraries/kotlinc_noarg_compiler_plugin.xml
index 98bf7f7..d844184 100644
--- a/.idea/libraries/kotlinc_noarg_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_noarg_compiler_plugin.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.noarg-compiler-plugin" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:noarg-compiler-plugin-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:noarg-compiler-plugin-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/1.9.21-release-633/noarg-compiler-plugin-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/1.9.22-release-704/noarg-compiler-plugin-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/1.9.21-release-633/noarg-compiler-plugin-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/noarg-compiler-plugin-for-ide/1.9.22-release-704/noarg-compiler-plugin-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml b/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml
index 53ec34b..37ccf3b 100644
--- a/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.parcelize-compiler-plugin" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:parcelize-compiler-plugin-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:parcelize-compiler-plugin-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/1.9.21-release-633/parcelize-compiler-plugin-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/1.9.22-release-704/parcelize-compiler-plugin-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/1.9.21-release-633/parcelize-compiler-plugin-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/parcelize-compiler-plugin-for-ide/1.9.22-release-704/parcelize-compiler-plugin-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml b/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml
index 04711e3..5857d4e 100644
--- a/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml
+++ b/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.sam-with-receiver-compiler-plugin" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:sam-with-receiver-compiler-plugin-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:sam-with-receiver-compiler-plugin-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/1.9.21-release-633/sam-with-receiver-compiler-plugin-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/1.9.22-release-704/sam-with-receiver-compiler-plugin-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/1.9.21-release-633/sam-with-receiver-compiler-plugin-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/sam-with-receiver-compiler-plugin-for-ide/1.9.22-release-704/sam-with-receiver-compiler-plugin-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/kotlinc_symbol_light_classes.xml b/.idea/libraries/kotlinc_symbol_light_classes.xml
index 30e8b34..cd02287 100644
--- a/.idea/libraries/kotlinc_symbol_light_classes.xml
+++ b/.idea/libraries/kotlinc_symbol_light_classes.xml
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.symbol-light-classes" type="repository">
- <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:symbol-light-classes-for-ide:1.9.21-release-633" />
+ <properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:symbol-light-classes-for-ide:1.9.22-release-704" />
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/symbol-light-classes-for-ide/1.9.21-release-633/symbol-light-classes-for-ide-1.9.21-release-633.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/symbol-light-classes-for-ide/1.9.22-release-704/symbol-light-classes-for-ide-1.9.22-release-704.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/symbol-light-classes-for-ide/1.9.21-release-633/symbol-light-classes-for-ide-1.9.21-release-633-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/symbol-light-classes-for-ide/1.9.22-release-704/symbol-light-classes-for-ide-1.9.22-release-704-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/platform/core-api/src/com/intellij/util/indexing/FileContent.java b/platform/core-api/src/com/intellij/util/indexing/FileContent.java
index 42b7a06..d5a1b00 100644
--- a/platform/core-api/src/com/intellij/util/indexing/FileContent.java
+++ b/platform/core-api/src/com/intellij/util/indexing/FileContent.java
@@ -5,8 +5,28 @@
import org.jetbrains.annotations.NotNull;
public interface FileContent extends IndexedFile {
+ /**
+ * For binary files this is exactly the bytes from the file.
+ * <p>
+ * For text files content is normalized: new lines are converted to "\n", if the file contains BOM (e.g. FF FE), it will be dropped.
+ * <p>
+ * The following invariant holds true:
+ * <pre>
+ * getContent() == getContentAsText().toString().getBytes(charset)
+ * </pre>
+ * where {@code charset} is either detected, or forced (e.g. by FileType)
+ *
+ * @return normalized contents of the file as bytes
+ */
byte @NotNull [] getContent();
+ /**
+ * For text files content is normalized: new lines are converted to "\n", if the file contains BOM (e.g. FF FE), it will be dropped.
+ * <p>
+ * Throws exception for binary files
+ *
+ * @return normalized contents of the file as CharSequence
+ */
@NotNull CharSequence getContentAsText();
@NotNull PsiFile getPsiFile();
diff --git a/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java b/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java
index 3957bfb..f700cf7 100644
--- a/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java
+++ b/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java
@@ -30,7 +30,7 @@
public final class FileContentImpl extends IndexedFileImpl implements PsiDependentFileContent {
private final @NotNull NotNullComputable<byte[]> myContentComputable;
private Charset myCharset;
- private byte[] myContent;
+ private byte[] myCachedContentBytes;
private CharSequence myContentAsText;
private byte[] myIndexedFileHash;
private boolean myLighterASTShouldBeThreadSafe;
@@ -159,21 +159,18 @@
@Override
public byte @NotNull [] getContent() {
- if (myContent == null) {
- if (myContentAsText != null) {
- myContent = myContentAsText.toString().getBytes(getCharset());
- } else {
- myContent = myContentComputable.compute();
- FileType unsubstitutedFileType = getFileTypeWithoutSubstitution(this);
- if (!unsubstitutedFileType.isBinary()) {
- // Normalize line-separators for textual files to ensure
- // consistency of getContent() and getContentAsText(): both must return \n.
- // It calls getContent() internally and assigns the myContent to null.
- myContent = getContentAsText().toString().getBytes(getCharset());
- }
+ if (myCachedContentBytes == null) {
+ FileType unsubstitutedFileType = getFileTypeWithoutSubstitution(this);
+ if (unsubstitutedFileType.isBinary()) {
+ myCachedContentBytes = computeOriginalContent();
+ }
+ else {
+ // Normalize line-separators for textual files to ensure
+ // consistency of getContent() and getContentAsText(): both must return \n.
+ myCachedContentBytes = getContentAsText().toString().getBytes(getCharset());
}
}
- return myContent;
+ return myCachedContentBytes;
}
@NotNull
@@ -184,18 +181,17 @@
throw new UnsupportedOperationException("Cannot obtain text for binary file type : " + unsubstitutedFileType.getDescription());
}
final CharSequence content = getUserData(IndexingDataKeys.FILE_TEXT_CONTENT_KEY);
- try {
- if (content != null) {
- return content;
- }
- if (myContentAsText == null) {
- myContentAsText = LoadTextUtil.getTextByBinaryPresentation(getContent(), myFile, false, false);
- }
- return myContentAsText;
- } finally {
- // Help GC. Indexes expect either getContent() or getContentAsText().
- myContent = null;
+ if (content != null) {
+ return content;
}
+ if (myContentAsText == null) {
+ myContentAsText = LoadTextUtil.getTextByBinaryPresentation(computeOriginalContent(), myFile, false, false);
+ }
+ return myContentAsText;
+ }
+
+ private byte @NotNull [] computeOriginalContent() {
+ return myContentComputable.compute();
}
@Override
diff --git a/platform/platform-tests/testSrc/com/intellij/util/indexing/FileContentImplTest.kt b/platform/platform-tests/testSrc/com/intellij/util/indexing/FileContentImplTest.kt
index 329d28b..bd1541c 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/indexing/FileContentImplTest.kt
+++ b/platform/platform-tests/testSrc/com/intellij/util/indexing/FileContentImplTest.kt
@@ -2,6 +2,7 @@
package com.intellij.util.indexing
import com.intellij.openapi.fileEditor.impl.LoadTextUtil
+import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx
import com.intellij.openapi.util.NotNullComputable
import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.openapi.vfs.VirtualFile
@@ -9,11 +10,21 @@
import com.intellij.testFramework.HeavyPlatformTestCase
import com.intellij.util.ArrayUtil
import com.intellij.util.io.write
+import junit.framework.TestCase
import org.junit.Assert.assertArrayEquals
import java.nio.charset.StandardCharsets
import java.util.concurrent.atomic.AtomicBoolean
class FileContentImplTest : HeavyPlatformTestCase() {
+
+ private val CHARSETS_WITH_BOM = listOf(
+ StandardCharsets.UTF_8,
+ StandardCharsets.UTF_16LE,
+ StandardCharsets.UTF_16BE,
+ CharsetToolkit.UTF_32LE_CHARSET,
+ CharsetToolkit.UTF_32BE_CHARSET
+ )
+
fun `test text file`() {
val text = "aaa"
val content = createFileContent(text.toByteArray())
@@ -75,13 +86,7 @@
fun `test bom is truncated from getContent()`() {
val text = "哇你居然翻译了这篇中文文本"
- for (charset in listOf(
- StandardCharsets.UTF_8,
- StandardCharsets.UTF_16LE,
- StandardCharsets.UTF_16BE,
- CharsetToolkit.UTF_32LE_CHARSET,
- CharsetToolkit.UTF_32BE_CHARSET
- )) {
+ for (charset in CHARSETS_WITH_BOM) {
val bom = CharsetToolkit.getPossibleBom(charset)!!
val bytes = ArrayUtil.mergeArrays(bom, text.toByteArray (charset))
val fileContent = createFileContent(bytes)
@@ -91,22 +96,50 @@
}
}
+ fun `test contentAsText() returns correct content for files with BOM`() {
+ val text = "<xml/>"
+ for (charset in CHARSETS_WITH_BOM) {
+ for (ext in listOf("xml", "txt")) {
+ // in txt files content {60,0,120,0,...}=("<x..." in UTF16) is recognized as "guessed" binary content
+ // in xml files content {60,0,120,0,...}=("<x..." in UTF16) is recognized as "hardCoded" UTF8 content (see XmlLikeFileType.getCharset which defaults to UTF8)
+ val bom = CharsetToolkit.getPossibleBom(charset)!!
+ val bytes = ArrayUtil.mergeArrays(bom, text.toByteArray(charset))
+ val fileContent = createFileContent(bytes, ext)
+ val contentAsText = fileContent.contentAsText
+ val detectedFileType = FileTypeManagerEx.getInstance().getFileTypeByFile(fileContent.file)
+ TestCase.assertFalse(detectedFileType.isBinary)
+ TestCase.assertEquals("Wrong text: charset=$charset, file=$ext", text, contentAsText.toString())
+ }
+ }
+
+ }
+
private fun createFileContent(bytes: ByteArray, binary: Boolean = false): FileContent {
- val virtualFile = createInputFile(bytes, binary)
+ return createFileContent(bytes, suggestExtension(binary))
+ }
+
+ private fun createFileContent(bytes: ByteArray, fileExtension: String): FileContent {
+ val virtualFile = createInputFile(bytes, fileExtension)
return FileContentImpl.createByFile(virtualFile, myProject)
}
private fun createInputFile(content: ByteArray, binary: Boolean = false): VirtualFile {
+ return createInputFile(content, suggestExtension(binary)).also {
+ assertEquals(binary, it.fileType.isBinary)
+ }
+ }
+
+ private fun suggestExtension(binary: Boolean) = if (binary) "jpg" else "txt"
+
+ private fun createInputFile(content: ByteArray, fileExtension: String): VirtualFile {
val home = createTempDir("hashing-test").toPath()
- val path = home.resolve(if (binary) "file.jpg" else "test-file.txt")
+ val path = home.resolve("test-file.$fileExtension")
//we create the file via low-level code to make sure IntelliJ Utils would not alter the newlines in it
path.write(content)
- val virtualFile = VirtualFileManager.getInstance().refreshAndFindFileByNioPath(path) ?: error("Failed to find temp file")
- assertEquals(binary, virtualFile.fileType.isBinary)
- return virtualFile
+ return VirtualFileManager.getInstance().refreshAndFindFileByNioPath(path) ?: error("Failed to find temp file")
}
}
diff --git a/plugins/kotlin/base/plugin/test/org/jetbrains/kotlin/idea/artifacts/KotlinNativeVersion.kt b/plugins/kotlin/base/plugin/test/org/jetbrains/kotlin/idea/artifacts/KotlinNativeVersion.kt
index acce1d7..44d4d0a 100644
--- a/plugins/kotlin/base/plugin/test/org/jetbrains/kotlin/idea/artifacts/KotlinNativeVersion.kt
+++ b/plugins/kotlin/base/plugin/test/org/jetbrains/kotlin/idea/artifacts/KotlinNativeVersion.kt
@@ -17,7 +17,7 @@
/** This field is automatically setup from project-module-updater.
* See [org.jetbrains.tools.model.updater.updateKGPVersionForKotlinNativeTests]
*/
- private const val kotlinGradlePluginVersion: String = "1.9.21-release-633"
+ private const val kotlinGradlePluginVersion: String = "1.9.22-release-704"
/** Return bootstrap version or version from properties file of specified Kotlin Gradle Plugin.
* Make sure localMaven has kotlin-gradle-plugin with required version for cooperative development environment.
diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradlePluginVersions.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradlePluginVersions.kt
index 5a0d7ff..9cd7edc 100644
--- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradlePluginVersions.kt
+++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/KotlinGradlePluginVersions.kt
@@ -7,7 +7,7 @@
object KotlinGradlePluginVersions {
val V_1_7_21 = KotlinToolingVersion(1, 7, 21, null)
val V_1_8_22 = KotlinToolingVersion(1, 8, 22, null)
- val latest = KotlinToolingVersion("1.9.21-release-633")
+ val latest = KotlinToolingVersion("1.9.22-release-704")
val all = listOf(
V_1_7_21,
diff --git a/plugins/kotlin/util/project-model-updater/resources/model.properties b/plugins/kotlin/util/project-model-updater/resources/model.properties
index ce045fe..ac176c5 100644
--- a/plugins/kotlin/util/project-model-updater/resources/model.properties
+++ b/plugins/kotlin/util/project-model-updater/resources/model.properties
@@ -1,11 +1,11 @@
-kotlincVersion=1.9.21-release-633
+kotlincVersion=1.9.22-release-704
kotlincArtifactsMode=MAVEN
-jpsPluginVersion=1.9.21-release-633
+jpsPluginVersion=1.9.22-release-704
jpsPluginArtifactsMode=MAVEN
# The Kotlin Gradle Plugin version used for testing
# Kotlin Importing Tests will use this version as 'latest master'
# Native Analyzer Tests will use this Kotlin Gradle Plugin version to infer the corresponding Kotlin/Native version bundled
# within this Kotlin Gradle Plugin
-kotlinGradlePluginVersion=1.9.21-release-633
+kotlinGradlePluginVersion=1.9.22-release-704
