azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move PsiSourceElement to psi

Browse Source
This commit is contained in:
Alexander Udalov
2021-04-22 20:46:30 +02:00
parent bcf47ddc94
commit 81ce1da352
9 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java
+2 -2
View File
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.calls.tasks.DynamicCallsKt;
import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt;
import org.jetbrains.kotlin.resolve.source.PsiSourceElementKt;
import org.jetbrains.kotlin.serialization.js.ModuleKind;
import org.jetbrains.kotlin.types.KotlinType;
import org.jetbrains.kotlin.types.typeUtil.TypeUtilsKt;
@@ -676,7 +676,7 @@ public final class StaticContext {
JsFunction correspondingFunction = JsAstUtils.createFunctionWithEmptyBody(fragment.getScope());
assert (!scopeToFunction.containsKey(correspondingFunction.getScope())) : "Scope to function value overridden for " + descriptor;
scopeToFunction.put(correspondingFunction.getScope(), correspondingFunction);
correspondingFunction.setSource(KotlinSourceElementKt.getPsi(((CallableDescriptor) descriptor).getSource()));
correspondingFunction.setSource(PsiSourceElementKt.getPsi(((CallableDescriptor) descriptor).getSource()));
return correspondingFunction.getScope();
};
Rule<JsScope> scopeForPackage = descriptor -> {
js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.KtParameter;
import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.BindingContextUtils;
import org.jetbrains.kotlin.resolve.calls.components.ArgumentsUtilsKt;
import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt;
import org.jetbrains.kotlin.resolve.source.PsiSourceElementKt;
import java.util.ArrayList;
import java.util.List;
@@ -46,7 +46,7 @@ class JsDataClassGenerator extends JsEqualsHashcodeToStringGenerator {
JsFunction functionObject = generateJsMethod(function);
JsExpression returnExpression = JsAstUtils.pureFqn(context.getNameForDescriptor(propertyDescriptor), new JsThisRef());
JsReturn returnStatement = new JsReturn(returnExpression);
returnStatement.setSource(KotlinSourceElementKt.getPsi(parameter.getSource()));
returnStatement.setSource(PsiSourceElementKt.getPsi(parameter.getSource()));
functionObject.getBody().getStatements().add(returnStatement);
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsEqualsHashcodeToStringGenerator.java
+8 -5
View File
@@ -8,14 +8,17 @@ package org.jetbrains.kotlin.js.translate.declaration;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
import org.jetbrains.kotlin.descriptors.PropertyDescriptor;
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor;
import org.jetbrains.kotlin.js.backend.ast.*;
import org.jetbrains.kotlin.js.translate.context.TranslationContext;
import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
import org.jetbrains.kotlin.js.translate.utils.UtilsKt;
import org.jetbrains.kotlin.psi.KtClassOrObject;
import org.jetbrains.kotlin.psi.KtParameter;
import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt;
import org.jetbrains.kotlin.resolve.source.PsiSourceElementKt;
import java.util.List;
@@ -42,7 +45,7 @@ abstract class JsEqualsHashcodeToStringGenerator extends DataClassMethodGenerato
JsName name = context.getNameForDescriptor(classProperties.get(i));
JsExpression literal = new JsStringLiteral((i == 0 ? (getClassDescriptor().getName() + "(") : ", ") + printName + "=");
JsExpression expr = new JsInvocation(context.namer().kotlin("toString"), new JsNameRef(name, new JsThisRef()));
PsiElement source = KotlinSourceElementKt.getPsi(classProperties.get(i).getSource());
PsiElement source = PsiSourceElementKt.getPsi(classProperties.get(i).getSource());
JsExpression component = JsAstUtils.sum(literal, expr).source(source);
if (result == null) {
result = component;
@@ -79,7 +82,7 @@ abstract class JsEqualsHashcodeToStringGenerator extends DataClassMethodGenerato
JsExpression assignment = JsAstUtils.assignment(new JsNameRef(varName),
new JsBinaryOperation(JsBinaryOperator.BIT_OR, newHashValue,
new JsIntLiteral(0)));
statements.add(assignment.source(KotlinSourceElementKt.getPsi(prop.getSource())).makeStmt());
statements.add(assignment.source(PsiSourceElementKt.getPsi(prop.getSource())).makeStmt());
}
JsReturn returnStatement = new JsReturn(new JsNameRef(varName));
@@ -106,7 +109,7 @@ abstract class JsEqualsHashcodeToStringGenerator extends DataClassMethodGenerato
JsExpression fieldChain = null;
for (PropertyDescriptor prop : classProperties) {
JsName name = context.getNameForDescriptor(prop);
PsiElement source = KotlinSourceElementKt.getPsi(prop.getSource());
PsiElement source = PsiSourceElementKt.getPsi(prop.getSource());
JsExpression next = new JsInvocation(context.namer().kotlin("equals"),
new JsNameRef(name, new JsThisRef()),
new JsNameRef(name, new JsNameRef(paramName))).source(source);
js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java
+4 -6
View File
@@ -16,15 +16,13 @@
package org.jetbrains.kotlin.js.translate.initializer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.PropertyDescriptor;
import org.jetbrains.kotlin.js.backend.ast.JsExpression;
import org.jetbrains.kotlin.js.backend.ast.JsStatement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.PropertyDescriptor;
import org.jetbrains.kotlin.js.translate.context.Namer;
import org.jetbrains.kotlin.js.translate.context.TranslationContext;
import org.jetbrains.kotlin.js.translate.utils.JsAstUtils;
import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt;
import org.jetbrains.kotlin.resolve.source.PsiSourceElementKt;
import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.assignmentToBackingField;
@@ -39,7 +37,7 @@ public final class InitializerUtils {
@NotNull JsExpression value
) {
JsExpression assignment = assignmentToBackingField(context, descriptor, value);
assignment.setSource(KotlinSourceElementKt.getPsi(descriptor.getSource()));
assignment.setSource(PsiSourceElementKt.getPsi(descriptor.getSource()));
return assignment.makeStmt();
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java
+2 -2
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator;
import org.jetbrains.kotlin.psi.KtBlockExpression;
import org.jetbrains.kotlin.psi.KtDeclarationWithBody;
import org.jetbrains.kotlin.psi.KtExpression;
import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt;
import org.jetbrains.kotlin.resolve.source.PsiSourceElementKt;
import org.jetbrains.kotlin.types.KotlinType;
import java.util.ArrayList;
@@ -97,7 +97,7 @@ public final class FunctionBodyTranslator extends AbstractTranslator {
JsExpression defaultValue = Translation.translateAsExpression(defaultArgument, context, defaultArgBlock);
// parameterName = defaultValue
PsiElement psi = KotlinSourceElementKt.getPsi(valueParameter.getSource());
PsiElement psi = PsiSourceElementKt.getPsi(valueParameter.getSource());
JsStatement assignStatement = assignment(jsNameRef, defaultValue).source(psi).makeStmt();
JsStatement thenStatement = JsAstUtils.mergeStatementInBlockIfNeeded(assignStatement, defaultArgBlock);
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.js.translate.context.Namer;
import org.jetbrains.kotlin.js.translate.context.TranslationContext;
import org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator;
import org.jetbrains.kotlin.name.ClassId;
import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt;
import org.jetbrains.kotlin.resolve.source.PsiSourceElementKt;
import org.jetbrains.kotlin.util.OperatorNameConventions;
import java.util.Collections;
@@ -486,7 +486,7 @@ public final class JsAstUtils {
public static JsStatement defineSimpleProperty(@NotNull JsName name, @NotNull JsExpression value, @Nullable SourceElement source) {
JsExpression assignment = assignment(new JsNameRef(name, new JsThisRef()), value);
if (source != null) {
assignment.setSource(KotlinSourceElementKt.getPsi(source));
assignment.setSource(PsiSourceElementKt.getPsi(source));
}
return assignment.makeStmt();
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java
+2 -1
View File
@@ -42,6 +42,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils;
import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
import org.jetbrains.kotlin.resolve.inline.InlineUtil;
import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt;
import org.jetbrains.kotlin.resolve.source.PsiSourceElementKt;
import org.jetbrains.kotlin.types.DynamicTypesKt;
import org.jetbrains.kotlin.types.KotlinType;
import org.jetbrains.kotlin.types.TypeUtils;
@@ -74,7 +75,7 @@ public final class TranslationUtils {
JsExpression functionExpression = function;
if (InlineUtil.isInline(descriptor)) {
InlineMetadata metadata = InlineMetadata.compose(function, descriptor, context);
PsiElement sourceInfo = KotlinSourceElementKt.getPsi(descriptor.getSource());
PsiElement sourceInfo = PsiSourceElementKt.getPsi(descriptor.getSource());
functionExpression = metadata.functionWithMetadata(context, sourceInfo);
}