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

Replace OBJECT$ usages in code and test data

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-25 15:49:16 +03:00
parent ed218c473a
commit 9d618ca767
13 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+2 -2
View File
@@ -1908,7 +1908,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
if (descriptor instanceof PropertyDescriptor) {
PropertyDescriptor propertyDescriptor = (PropertyDescriptor) descriptor;
Collection<ExpressionCodegenExtension> codegenExtensions = ExpressionCodegenExtension.OBJECT$.getInstances(state.getProject());
Collection<ExpressionCodegenExtension> codegenExtensions = ExpressionCodegenExtension.Companion.getInstances(state.getProject());
if (!codegenExtensions.isEmpty() && resolvedCall != null) {
ExpressionCodegenExtension.Context context = new ExpressionCodegenExtension.Context(typeMapper, v);
JetType returnType = propertyDescriptor.getReturnType();
@@ -2348,7 +2348,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already
receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod);
Collection<ExpressionCodegenExtension> codegenExtensions = ExpressionCodegenExtension.OBJECT$.getInstances(state.getProject());
Collection<ExpressionCodegenExtension> codegenExtensions = ExpressionCodegenExtension.Companion.getInstances(state.getProject());
if (!codegenExtensions.isEmpty()) {
ExpressionCodegenExtension.Context context = new ExpressionCodegenExtension.Context(typeMapper, v);
for (ExpressionCodegenExtension extension : codegenExtensions) {
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -388,7 +388,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
genClosureFields(context.closure, v, typeMapper);
for (ExpressionCodegenExtension extension : ExpressionCodegenExtension.OBJECT$.getInstances(state.getProject())) {
for (ExpressionCodegenExtension extension : ExpressionCodegenExtension.Companion.getInstances(state.getProject())) {
extension.generateClassSyntheticParts(v, state, myClass, descriptor);
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+2 -2
View File
@@ -138,7 +138,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
writeInnerClasses();
if (sourceMapper != null) {
SourceMapper.OBJECT$.flushToClassBuilder(sourceMapper, v);
SourceMapper.Companion.flushToClassBuilder(sourceMapper, v);
}
v.done();
@@ -520,7 +520,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
@NotNull
public SourceMapper getOrCreateSourceMapper() {
if (sourceMapper == null) {
sourceMapper = new DefaultSourceMapper(SourceInfo.OBJECT$.createInfo(element, getClassName()), null);
sourceMapper = new DefaultSourceMapper(SourceInfo.Companion.createInfo(element, getClassName()), null);
}
return sourceMapper;
}
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
+2 -2
View File
@@ -161,7 +161,7 @@ public class AnonymousObjectTransformer {
if (!inliningContext.isInliningLambda) {
if (debugInfo != null && !debugInfo.isEmpty()) {
sourceMapper = SourceMapper.OBJECT$.createFromSmap(SMAPParser.parse(debugInfo));
sourceMapper = SourceMapper.Companion.createFromSmap(SMAPParser.parse(debugInfo));
}
else {
//seems we can't do any clever mapping cause we don't know any about original class name
@@ -195,7 +195,7 @@ public class AnonymousObjectTransformer {
result.addAllClassesToRemove(constructorResult);
SourceMapper.OBJECT$.flushToClassBuilder(sourceMapper, classBuilder);
SourceMapper.Companion.flushToClassBuilder(sourceMapper, classBuilder);
classBuilder.done();
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java
+2 -2
View File
@@ -299,8 +299,8 @@ public class JetCoreEnvironment {
project.registerService(VirtualFileFinderFactory.class, new CliVirtualFileFinderFactory(classPath));
ExternalDeclarationsProvider.OBJECT$.registerExtensionPoint(project);
ExpressionCodegenExtension.OBJECT$.registerExtensionPoint(project);
ExternalDeclarationsProvider.Companion.registerExtensionPoint(project);
ExpressionCodegenExtension.Companion.registerExtensionPoint(project);
for (ComponentRegistrar registrar : configuration.getList(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS)) {
registrar.registerProjectComponents(project, configuration);
compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java
+7 -7
View File
@@ -2,13 +2,13 @@ package test;
class ClassObject {
void accessToClassObject() {
WithClassObject.OBJECT$.foo();
WithClassObject.OBJECT$.getValue();
WithClassObject.OBJECT$.getValueWithGetter();
WithClassObject.OBJECT$.getVariable();
WithClassObject.OBJECT$.setVariable(0);
WithClassObject.OBJECT$.getVariableWithAccessors();
WithClassObject.OBJECT$.setVariableWithAccessors(0);
WithClassObject.Companion.foo();
WithClassObject.Companion.getValue();
WithClassObject.Companion.getValueWithGetter();
WithClassObject.Companion.getVariable();
WithClassObject.Companion.setVariable(0);
WithClassObject.Companion.getVariableWithAccessors();
WithClassObject.Companion.setVariableWithAccessors(0);
}
void accessToPackageObject() {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java
+1 -1
View File
@@ -34,7 +34,7 @@ class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
public void visitSimpleNameExpression(@NotNull JetSimpleNameExpression expression) {
PsiReference ref = expression.getReference();
if (ref == null) return;
if (JetPsiChecker.OBJECT$.getNamesHighlightingEnabled()) {
if (JetPsiChecker.Companion.getNamesHighlightingEnabled()) {
DeclarationDescriptor referenceTarget = bindingContext.get(BindingContext.REFERENCE_TARGET, expression);
if (referenceTarget instanceof ConstructorDescriptor) {
referenceTarget = referenceTarget.getContainingDeclaration();
idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class JetPsiCheckerAndHighlightingUpdater extends JetPsiChecker {
PsiElement grandParent = parameter.getParent().getParent();
if (grandParent instanceof JetNamedFunction) {
JetNamedFunction function = (JetNamedFunction) grandParent;
return UnusedSymbolInspection.OBJECT$.isEntryPoint(function);
return UnusedSymbolInspection.Companion.isEntryPoint(function);
}
return false;
}
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java
+1 -1
View File
@@ -129,7 +129,7 @@ public class QuickFixRegistrar {
QuickFixes.factories.put(NO_BACKING_FIELD_CUSTOM_ACCESSORS, changeToPropertyNameFactory);
QuickFixes.factories.put(INACCESSIBLE_BACKING_FIELD, changeToPropertyNameFactory);
JetSingleIntentionActionFactory unresolvedReferenceFactory = AutoImportFix.OBJECT$.createFactory();
JetSingleIntentionActionFactory unresolvedReferenceFactory = AutoImportFix.Companion.createFactory();
QuickFixes.factories.put(UNRESOLVED_REFERENCE, unresolvedReferenceFactory);
QuickFixes.factories.put(UNRESOLVED_REFERENCE_WRONG_RECEIVER, unresolvedReferenceFactory);
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
+1 -1
View File
@@ -263,7 +263,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
final JetExpression originalBody = originalDeclaration.getBodyExpression();
assert originalBody != null : "Original body is not found: " + originalDeclaration;
JetDeclarationWithBody newDeclaration = ConvertToBlockBodyAction.OBJECT$.convert(originalDeclaration);
JetDeclarationWithBody newDeclaration = ConvertToBlockBodyAction.Companion.convert(originalDeclaration);
JetBlockExpression newCommonContainer = (JetBlockExpression) newDeclaration.getBodyExpression();
assert newCommonContainer != null : "New body is not found: " + newDeclaration;
idea/testData/kotlinAndJavaChecker/ClassObjects.java
+8 -8
View File
@@ -1,12 +1,12 @@
class ClassObject {
void foo() {
WithClassObject.OBJECT$.getValue();
WithClassObject.OBJECT$.getValue();
WithClassObject.OBJECT$.foo();
WithClassObject.OBJECT$.getValueWithGetter();
WithClassObject.OBJECT$.getVariable();
WithClassObject.OBJECT$.setVariable(0);
WithClassObject.OBJECT$.getVariableWithAccessors();
WithClassObject.OBJECT$.setVariableWithAccessors(0);
WithClassObject.Companion.getValue();
WithClassObject.Companion.getValue();
WithClassObject.Companion.foo();
WithClassObject.Companion.getValueWithGetter();
WithClassObject.Companion.getVariable();
WithClassObject.Companion.setVariable(0);
WithClassObject.Companion.getVariableWithAccessors();
WithClassObject.Companion.setVariableWithAccessors(0);
}
}
idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java
+2 -2
View File
@@ -38,11 +38,11 @@ public abstract class AbstractJetPsiCheckerTest extends JetLightCodeInsightFixtu
//noinspection unchecked
myFixture.enableInspections(SpellCheckingInspection.class);
JetPsiChecker.OBJECT$.setNamesHighlightingEnabled(false);
JetPsiChecker.Companion.setNamesHighlightingEnabled(false);
checkHighlighting(true, true, false);
}
finally {
JetPsiChecker.OBJECT$.setNamesHighlightingEnabled(true);
JetPsiChecker.Companion.setNamesHighlightingEnabled(true);
}
}
js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java
+1 -1
View File
@@ -94,7 +94,7 @@ public final class AnnotationsUtils {
}
for (DeclarationDescriptor descriptor : descriptors) {
for (PredefinedAnnotation annotation : PredefinedAnnotation.OBJECT$.getWITH_CUSTOM_NAME()) {
for (PredefinedAnnotation annotation : PredefinedAnnotation.Companion.getWITH_CUSTOM_NAME()) {
if (!hasAnnotationOrInsideAnnotatedClass(descriptor, annotation)) {
continue;
}