[PowerAssert] Update base package
This commit is contained in:
+1
-1
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power
|
||||
package org.jetbrains.kotlin.powerassert
|
||||
|
||||
import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
|
||||
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
|
||||
+12
-12
@@ -14,19 +14,19 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power
|
||||
package org.jetbrains.kotlin.powerassert
|
||||
|
||||
import com.bnorm.power.delegate.FunctionDelegate
|
||||
import com.bnorm.power.delegate.LambdaFunctionDelegate
|
||||
import com.bnorm.power.delegate.SamConversionLambdaFunctionDelegate
|
||||
import com.bnorm.power.delegate.SimpleFunctionDelegate
|
||||
import com.bnorm.power.diagram.IrTemporaryVariable
|
||||
import com.bnorm.power.diagram.Node
|
||||
import com.bnorm.power.diagram.SourceFile
|
||||
import com.bnorm.power.diagram.buildDiagramNesting
|
||||
import com.bnorm.power.diagram.buildDiagramNestingNullable
|
||||
import com.bnorm.power.diagram.buildTree
|
||||
import com.bnorm.power.diagram.irDiagramString
|
||||
import org.jetbrains.kotlin.powerassert.delegate.FunctionDelegate
|
||||
import org.jetbrains.kotlin.powerassert.delegate.LambdaFunctionDelegate
|
||||
import org.jetbrains.kotlin.powerassert.delegate.SamConversionLambdaFunctionDelegate
|
||||
import org.jetbrains.kotlin.powerassert.delegate.SimpleFunctionDelegate
|
||||
import org.jetbrains.kotlin.powerassert.diagram.IrTemporaryVariable
|
||||
import org.jetbrains.kotlin.powerassert.diagram.Node
|
||||
import org.jetbrains.kotlin.powerassert.diagram.SourceFile
|
||||
import org.jetbrains.kotlin.powerassert.diagram.buildDiagramNesting
|
||||
import org.jetbrains.kotlin.powerassert.diagram.buildDiagramNestingNullable
|
||||
import org.jetbrains.kotlin.powerassert.diagram.buildTree
|
||||
import org.jetbrains.kotlin.powerassert.diagram.irDiagramString
|
||||
import org.jetbrains.kotlin.backend.common.IrElementTransformerVoidWithContext
|
||||
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
|
||||
import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
|
||||
+2
-2
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power
|
||||
package org.jetbrains.kotlin.powerassert
|
||||
|
||||
import com.bnorm.power.diagram.SourceFile
|
||||
import org.jetbrains.kotlin.powerassert.diagram.SourceFile
|
||||
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
|
||||
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
|
||||
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power.delegate
|
||||
package org.jetbrains.kotlin.powerassert.delegate
|
||||
|
||||
import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
|
||||
import org.jetbrains.kotlin.ir.builders.irCall
|
||||
+2
-2
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power.delegate
|
||||
package org.jetbrains.kotlin.powerassert.delegate
|
||||
|
||||
import com.bnorm.power.irLambda
|
||||
import org.jetbrains.kotlin.powerassert.irLambda
|
||||
import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
|
||||
import org.jetbrains.kotlin.ir.builders.irReturn
|
||||
import org.jetbrains.kotlin.ir.declarations.IrValueParameter
|
||||
+2
-2
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power.delegate
|
||||
package org.jetbrains.kotlin.powerassert.delegate
|
||||
|
||||
import com.bnorm.power.irLambda
|
||||
import org.jetbrains.kotlin.powerassert.irLambda
|
||||
import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
|
||||
import org.jetbrains.kotlin.ir.builders.irReturn
|
||||
import org.jetbrains.kotlin.ir.builders.irSamConversion
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power.delegate
|
||||
package org.jetbrains.kotlin.powerassert.delegate
|
||||
|
||||
import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
|
||||
import org.jetbrains.kotlin.ir.declarations.IrValueParameter
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power.diagram
|
||||
package org.jetbrains.kotlin.powerassert.diagram
|
||||
|
||||
import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
|
||||
import org.jetbrains.kotlin.ir.builders.irBlock
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power.diagram
|
||||
package org.jetbrains.kotlin.powerassert.diagram
|
||||
|
||||
import org.jetbrains.kotlin.ir.IrElement
|
||||
import org.jetbrains.kotlin.ir.expressions.IrCall
|
||||
+15
-15
@@ -14,9 +14,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power.diagram
|
||||
package org.jetbrains.kotlin.powerassert.diagram
|
||||
|
||||
import com.bnorm.power.irString
|
||||
import org.jetbrains.kotlin.powerassert.irString
|
||||
import org.jetbrains.kotlin.ir.IrBuiltIns
|
||||
import org.jetbrains.kotlin.ir.SourceRangeInfo
|
||||
import org.jetbrains.kotlin.ir.builders.IrBuilderWithScope
|
||||
@@ -35,10 +35,10 @@ import org.jetbrains.kotlin.ir.expressions.IrTypeOperatorCall
|
||||
import org.jetbrains.kotlin.ir.expressions.addArgument
|
||||
|
||||
fun IrBuilderWithScope.irDiagramString(
|
||||
sourceFile: SourceFile,
|
||||
prefix: IrExpression? = null,
|
||||
call: IrCall,
|
||||
variables: List<IrTemporaryVariable>,
|
||||
sourceFile: SourceFile,
|
||||
prefix: IrExpression? = null,
|
||||
call: IrCall,
|
||||
variables: List<IrTemporaryVariable>,
|
||||
): IrExpression {
|
||||
val callInfo = sourceFile.getSourceRangeInfo(call)
|
||||
val callIndent = callInfo.startColumnNumber
|
||||
@@ -99,9 +99,9 @@ private data class ValueDisplay(
|
||||
)
|
||||
|
||||
private fun IrTemporaryVariable.toValueDisplay(
|
||||
fileSource: SourceFile,
|
||||
callIndent: Int,
|
||||
originalInfo: SourceRangeInfo,
|
||||
fileSource: SourceFile,
|
||||
callIndent: Int,
|
||||
originalInfo: SourceRangeInfo,
|
||||
): ValueDisplay {
|
||||
val info = fileSource.getSourceRangeInfo(original)
|
||||
var indent = info.startColumnNumber - callIndent
|
||||
@@ -156,9 +156,9 @@ private fun IrTemporaryVariable.toValueDisplay(
|
||||
* ```
|
||||
*/
|
||||
private fun findDisplayOffset(
|
||||
sourceFile: SourceFile,
|
||||
expression: IrExpression,
|
||||
source: String,
|
||||
sourceFile: SourceFile,
|
||||
expression: IrExpression,
|
||||
source: String,
|
||||
): Int {
|
||||
return when (expression) {
|
||||
is IrMemberAccessExpression<*> -> memberAccessOffset(sourceFile, expression, source)
|
||||
@@ -168,9 +168,9 @@ private fun findDisplayOffset(
|
||||
}
|
||||
|
||||
private fun memberAccessOffset(
|
||||
sourceFile: SourceFile,
|
||||
expression: IrMemberAccessExpression<*>,
|
||||
source: String,
|
||||
sourceFile: SourceFile,
|
||||
expression: IrMemberAccessExpression<*>,
|
||||
source: String,
|
||||
): Int {
|
||||
when (expression.origin) {
|
||||
// special case to handle `value != null`
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.bnorm.power.diagram
|
||||
package org.jetbrains.kotlin.powerassert.diagram
|
||||
|
||||
import org.jetbrains.kotlin.ir.builders.IrStatementsBuilder
|
||||
import org.jetbrains.kotlin.ir.builders.irGet
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bnorm.power.diagram
|
||||
package org.jetbrains.kotlin.powerassert.diagram
|
||||
|
||||
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
|
||||
import org.jetbrains.kotlin.ir.IrElement
|
||||
Reference in New Issue
Block a user