Skip to content

Commit cb0bd59

Browse files
koperagenkoperagen
committed
[Compiler plugin] move
1 parent 1182ac9 commit cb0bd59

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+374
-274
lines changed

‎plugins/kotlin-dataframe/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.jetbrains.kotlin.fir.dataframe.DataFrameCommandLineProcessor
1+
org.jetbrains.kotlinx.dataframe.plugin.DataFrameCommandLineProcessor

‎plugins/kotlin-dataframe/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
#
55

6-
org.jetbrains.kotlin.fir.dataframe.FirDataFrameComponentRegistrar
6+
org.jetbrains.kotlinx.dataframe.plugin.FirDataFrameComponentRegistrar

‎plugins/kotlin-dataframe/src/org/jetbrains/kotlin/fir/dataframe/FirDataFrameComponentRegistrar.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

6-
package org.jetbrains.kotlin.fir.dataframe
6+
package org.jetbrains.kotlinx.dataframe.plugin
77

88
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
99
import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
@@ -17,22 +17,22 @@ import org.jetbrains.kotlin.config.CompilerConfigurationKey
1717
import org.jetbrains.kotlin.fir.FirSession
1818
import org.jetbrains.kotlin.fir.caches.FirCache
1919
import org.jetbrains.kotlin.fir.caches.firCachesFactory
20-
import org.jetbrains.kotlin.fir.dataframe.extensions.DataRowSchemaSupertype
21-
import org.jetbrains.kotlin.fir.dataframe.extensions.ExpressionAnalysisAdditionalChecker
22-
import org.jetbrains.kotlin.fir.dataframe.extensions.ExtensionsGenerator
23-
import org.jetbrains.kotlin.fir.dataframe.extensions.FunctionCallTransformer
24-
import org.jetbrains.kotlin.fir.dataframe.extensions.IrBodyFiller
25-
import org.jetbrains.kotlin.fir.dataframe.extensions.ReturnTypeBasedReceiverInjector
26-
import org.jetbrains.kotlin.fir.dataframe.extensions.TokenGenerator
20+
import org.jetbrains.kotlinx.dataframe.plugin.extensions.DataRowSchemaSupertype
21+
import org.jetbrains.kotlinx.dataframe.plugin.extensions.ExpressionAnalysisAdditionalChecker
22+
import org.jetbrains.kotlinx.dataframe.plugin.extensions.ExtensionsGenerator
23+
import org.jetbrains.kotlinx.dataframe.plugin.extensions.FunctionCallTransformer
24+
import org.jetbrains.kotlinx.dataframe.plugin.extensions.IrBodyFiller
25+
import org.jetbrains.kotlinx.dataframe.plugin.extensions.KotlinTypeFacade
26+
import org.jetbrains.kotlinx.dataframe.plugin.extensions.ReturnTypeBasedReceiverInjector
2727
import org.jetbrains.kotlin.fir.extensions.FirExtensionApiInternals
2828
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
2929
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
3030
import org.jetbrains.kotlinx.dataframe.DataFrame
31-
import org.jetbrains.kotlinx.dataframe.KotlinTypeFacade
3231
import org.jetbrains.kotlinx.dataframe.api.schema
3332
import org.jetbrains.kotlinx.dataframe.io.readJson
34-
import org.jetbrains.kotlinx.dataframe.plugin.PluginDataFrameSchema
35-
import org.jetbrains.kotlinx.dataframe.plugin.toPluginDataFrameSchema
33+
import org.jetbrains.kotlinx.dataframe.plugin.extensions.TokenGenerator
34+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.PluginDataFrameSchema
35+
import org.jetbrains.kotlinx.dataframe.plugin.impl.data.toPluginDataFrameSchema
3636

3737
val PATH: CompilerConfigurationKey<String> = CompilerConfigurationKey.create("annotation qualified name")
3838
val SCHEMAS: CompilerConfigurationKey<String> = CompilerConfigurationKey.create("directory to store IO schemas")

‎plugins/kotlin-dataframe/src/org/jetbrains/kotlin/fir/dataframe/analyzeRefinedCallShape.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

6-
package org.jetbrains.kotlin.fir.dataframe
6+
package org.jetbrains.kotlinx.dataframe.plugin
77

8-
import org.jetbrains.kotlin.fir.dataframe.api.CreateDataFrameConfiguration
9-
import org.jetbrains.kotlin.fir.dataframe.api.TraverseConfiguration
10-
import org.jetbrains.kotlin.fir.dataframe.api.aggregate
11-
import org.jetbrains.kotlin.fir.dataframe.api.toDataFrame
12-
import org.jetbrains.kotlin.fir.dataframe.utils.Names.DF_CLASS_ID
8+
import org.jetbrains.kotlinx.dataframe.plugin.extensions.KotlinTypeFacade
9+
import org.jetbrains.kotlinx.dataframe.plugin.impl.Interpreter
10+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.CreateDataFrameConfiguration
11+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.TraverseConfiguration
12+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.aggregate
13+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.toDataFrame
14+
import org.jetbrains.kotlinx.dataframe.plugin.utils.Names.DF_CLASS_ID
1315
import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression
1416
import org.jetbrains.kotlin.fir.expressions.FirExpression
1517
import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
@@ -21,9 +23,7 @@ import org.jetbrains.kotlin.fir.types.ConeTypeProjection
2123
import org.jetbrains.kotlin.fir.types.classId
2224
import org.jetbrains.kotlin.fir.types.resolvedType
2325
import org.jetbrains.kotlin.name.Name
24-
import org.jetbrains.kotlinx.dataframe.KotlinTypeFacade
25-
import org.jetbrains.kotlinx.dataframe.annotations.Interpreter
26-
import org.jetbrains.kotlinx.dataframe.plugin.PluginDataFrameSchema
26+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.PluginDataFrameSchema
2727

2828
fun KotlinTypeFacade.analyzeRefinedCallShape(call: FirFunctionCall, reporter: InterpretationErrorReporter): CallResult? {
2929
val callReturnType = call.resolvedType
@@ -107,7 +107,7 @@ fun KotlinTypeFacade.analyzeRefinedCallShape(call: FirFunctionCall, reporter: In
107107

108108
data class CallResult(val rootMarker: ConeClassLikeType, val newSchema: PluginDataFrameSchema)
109109

110-
class Arguments(val refinedArguments: List<RefinedArgument>) : List<RefinedArgument> by refinedArguments
110+
class RefinedArguments(val refinedArguments: List<RefinedArgument>) : List<RefinedArgument> by refinedArguments
111111

112112
data class RefinedArgument(val name: Name, val expression: FirExpression) {
113113

‎plugins/kotlin-dataframe/src/org/jetbrains/kotlin/fir/dataframe/CallShapeAttribute.kt renamed to ‎plugins/kotlin-dataframe/src/org/jetbrains/kotlin/fir/dataframe/extensions/CallShapeAttribute.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package org.jetbrains.kotlin.fir.dataframe
1+
package org.jetbrains.kotlinx.dataframe.plugin.extensions
22

3+
import org.jetbrains.kotlinx.dataframe.plugin.SchemaProperty
34
import org.jetbrains.kotlin.fir.declarations.FirClass
45
import org.jetbrains.kotlin.fir.declarations.FirDeclarationDataKey
56
import org.jetbrains.kotlin.fir.declarations.FirDeclarationDataRegistry

‎plugins/kotlin-dataframe/src/org/jetbrains/kotlin/fir/dataframe/extensions/DataFramePlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jetbrains.kotlin.fir.dataframe.extensions
1+
package org.jetbrains.kotlinx.dataframe.plugin.extensions
22

33
import org.jetbrains.kotlin.GeneratedDeclarationKey
44

‎plugins/kotlin-dataframe/src/org/jetbrains/kotlin/fir/dataframe/extensions/DataRowSchemaSupertype.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jetbrains.kotlin.fir.dataframe.extensions
1+
package org.jetbrains.kotlinx.dataframe.plugin.extensions
22

33
import org.jetbrains.kotlin.descriptors.ClassKind
44
import org.jetbrains.kotlin.fir.FirSession

‎plugins/kotlin-dataframe/src/org/jetbrains/kotlin/fir/dataframe/extensions/ExpressionAnalysisAdditionalChecker.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

6-
package org.jetbrains.kotlin.fir.dataframe.extensions
6+
package org.jetbrains.kotlinx.dataframe.plugin.extensions
77

88
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
99
import org.jetbrains.kotlin.diagnostics.SourceElementPositioningStrategies
@@ -16,8 +16,8 @@ import org.jetbrains.kotlin.fir.analysis.checkers.expression.ExpressionCheckers
1616
import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirFunctionCallChecker
1717
import org.jetbrains.kotlin.fir.analysis.extensions.FirAdditionalCheckersExtension
1818
import org.jetbrains.kotlin.fir.caches.FirCache
19-
import org.jetbrains.kotlin.fir.dataframe.api.flatten
20-
import org.jetbrains.kotlin.fir.dataframe.pluginDataFrameSchema
19+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.flatten
20+
import org.jetbrains.kotlinx.dataframe.plugin.pluginDataFrameSchema
2121
import org.jetbrains.kotlin.fir.declarations.hasAnnotation
2222
import org.jetbrains.kotlin.fir.expressions.FirFunctionCall
2323
import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference
@@ -35,9 +35,7 @@ import org.jetbrains.kotlin.name.ClassId
3535
import org.jetbrains.kotlin.name.FqName
3636
import org.jetbrains.kotlin.name.Name
3737
import org.jetbrains.kotlin.psi.KtElement
38-
import org.jetbrains.kotlinx.dataframe.KotlinTypeFacade
39-
import org.jetbrains.kotlinx.dataframe.KotlinTypeFacadeImpl
40-
import org.jetbrains.kotlinx.dataframe.plugin.PluginDataFrameSchema
38+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.PluginDataFrameSchema
4139

4240
class ExpressionAnalysisAdditionalChecker(
4341
session: FirSession,

‎plugins/kotlin-dataframe/src/org/jetbrains/kotlin/fir/dataframe/extensions/ExtensionsGenerator.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package org.jetbrains.kotlin.fir.dataframe.extensions
1+
package org.jetbrains.kotlinx.dataframe.plugin.extensions
22

33
import org.jetbrains.kotlin.fir.FirSession
44
import org.jetbrains.kotlin.fir.analysis.checkers.toClassLikeSymbol
5-
import org.jetbrains.kotlin.fir.dataframe.utils.Names
6-
import org.jetbrains.kotlin.fir.dataframe.utils.generateExtensionProperty
7-
import org.jetbrains.kotlin.fir.dataframe.utils.projectOverDataColumnType
5+
import org.jetbrains.kotlinx.dataframe.plugin.utils.Names
6+
import org.jetbrains.kotlinx.dataframe.plugin.utils.generateExtensionProperty
7+
import org.jetbrains.kotlinx.dataframe.plugin.utils.projectOverDataColumnType
88
import org.jetbrains.kotlin.fir.declarations.hasAnnotation
99
import org.jetbrains.kotlin.fir.declarations.utils.isLocal
1010
import org.jetbrains.kotlin.fir.extensions.ExperimentalTopLevelDeclarationsGenerationApi

‎plugins/kotlin-dataframe/src/org/jetbrains/kotlin/fir/dataframe/extensions/FunctionCallTransformer.kt

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jetbrains.kotlin.fir.dataframe.extensions
1+
package org.jetbrains.kotlinx.dataframe.plugin.extensions
22

33
import org.jetbrains.kotlin.cli.common.repl.replEscapeLineBreaks
44
import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange
@@ -11,13 +11,11 @@ import org.jetbrains.kotlin.fir.FirElement
1111
import org.jetbrains.kotlin.fir.FirFunctionTarget
1212
import org.jetbrains.kotlin.fir.FirSession
1313
import org.jetbrains.kotlin.fir.caches.FirCache
14-
import org.jetbrains.kotlin.fir.dataframe.CallShapeData
15-
import org.jetbrains.kotlin.fir.dataframe.InterpretationErrorReporter
16-
import org.jetbrains.kotlin.fir.dataframe.SchemaProperty
17-
import org.jetbrains.kotlin.fir.dataframe.analyzeRefinedCallShape
18-
import org.jetbrains.kotlin.fir.dataframe.callShapeData
19-
import org.jetbrains.kotlin.fir.dataframe.utils.Names
20-
import org.jetbrains.kotlin.fir.dataframe.utils.projectOverDataColumnType
14+
import org.jetbrains.kotlinx.dataframe.plugin.InterpretationErrorReporter
15+
import org.jetbrains.kotlinx.dataframe.plugin.SchemaProperty
16+
import org.jetbrains.kotlinx.dataframe.plugin.analyzeRefinedCallShape
17+
import org.jetbrains.kotlinx.dataframe.plugin.utils.Names
18+
import org.jetbrains.kotlinx.dataframe.plugin.utils.projectOverDataColumnType
2119
import org.jetbrains.kotlin.fir.declarations.EmptyDeprecationsProvider
2220
import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
2321
import org.jetbrains.kotlin.fir.declarations.FirRegularClass
@@ -72,11 +70,10 @@ import org.jetbrains.kotlin.name.FqName
7270
import org.jetbrains.kotlin.name.Name
7371
import org.jetbrains.kotlin.text
7472
import org.jetbrains.kotlin.types.Variance
75-
import org.jetbrains.kotlinx.dataframe.KotlinTypeFacade
76-
import org.jetbrains.kotlinx.dataframe.plugin.PluginDataFrameSchema
77-
import org.jetbrains.kotlinx.dataframe.plugin.SimpleCol
78-
import org.jetbrains.kotlinx.dataframe.plugin.SimpleColumnGroup
79-
import org.jetbrains.kotlinx.dataframe.plugin.SimpleFrameColumn
73+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.PluginDataFrameSchema
74+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.SimpleCol
75+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.SimpleColumnGroup
76+
import org.jetbrains.kotlinx.dataframe.plugin.impl.api.SimpleFrameColumn
8077
import kotlin.math.abs
8178

8279
@OptIn(FirExtensionApiInternals::class)

0 commit comments

Comments
 (0)