diff --git a/build-tools/ant/src/org/jetbrains/jet/buildtools/ant/BytecodeCompilerTask.java b/build-tools/ant/src/org/jetbrains/jet/buildtools/ant/BytecodeCompilerTask.java index 0e9099c54fb..c3a7384f94b 100644 --- a/build-tools/ant/src/org/jetbrains/jet/buildtools/ant/BytecodeCompilerTask.java +++ b/build-tools/ant/src/org/jetbrains/jet/buildtools/ant/BytecodeCompilerTask.java @@ -111,9 +111,9 @@ public class BytecodeCompilerTask extends Task { @Override public void execute() { - final BytecodeCompiler compiler = new BytecodeCompiler(); - final String stdlibPath = (this.stdlib != null ? getPath(this.stdlib) : null); - final String[] classpath = (this.compileClasspath != null ? this.compileClasspath.list() : null); + BytecodeCompiler compiler = new BytecodeCompiler(); + String stdlibPath = (this.stdlib != null ? getPath(this.stdlib) : null); + String[] classpath = (this.compileClasspath != null ? this.compileClasspath.list() : null); if (this.src != null) { diff --git a/compiler/android-tests/src/org/jetbrains/jet/compiler/CodegenTestsOnAndroidRunner.java b/compiler/android-tests/src/org/jetbrains/jet/compiler/CodegenTestsOnAndroidRunner.java index 64711d17a98..e90d7844ad0 100644 --- a/compiler/android-tests/src/org/jetbrains/jet/compiler/CodegenTestsOnAndroidRunner.java +++ b/compiler/android-tests/src/org/jetbrains/jet/compiler/CodegenTestsOnAndroidRunner.java @@ -57,7 +57,7 @@ public class CodegenTestsOnAndroidRunner { if (resultOutput == null) return suite; // Test name -> stackTrace - final Map resultMap = parseOutputForFailedTests(resultOutput); + Map resultMap = parseOutputForFailedTests(resultOutput); final Statistics statistics; // If map is empty => there are no failed tests diff --git a/compiler/android-tests/src/org/jetbrains/jet/compiler/run/RunUtils.java b/compiler/android-tests/src/org/jetbrains/jet/compiler/run/RunUtils.java index edfe55a8908..618dd14b934 100644 --- a/compiler/android-tests/src/org/jetbrains/jet/compiler/run/RunUtils.java +++ b/compiler/android-tests/src/org/jetbrains/jet/compiler/run/RunUtils.java @@ -107,7 +107,7 @@ public class RunUtils { final StringBuilder stdOut = new StringBuilder(); final StringBuilder stdErr = new StringBuilder(); - final OSProcessHandler handler; + OSProcessHandler handler; try { handler = new OSProcessHandler(settings.commandLine.createProcess(), settings.commandLine.getCommandLineString(), Charsets.UTF_8); if (settings.input != null) { diff --git a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java index a07c0edd09d..62d083c906e 100644 --- a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/CodegenTestsOnAndroidGenerator.java @@ -133,7 +133,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { String generatedTestName = generateTestName(file.getName()); String packageName = file.getPath().replaceAll("\\\\|-|\\.|/", "_"); text = changePackage(packageName, text); - final ClassFileFactory factory; + ClassFileFactory factory; if (filesCompiledWithoutStdLib.contains(file.getName())) { factory = getFactoryFromText(file.getAbsolutePath(), text, environmentWithMockJdk); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java index 943a44a90b1..caa53b937d2 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/AsmUtil.java @@ -122,7 +122,7 @@ public class AsmUtil { return Type.getType(internalName.substring(1)); } - public static Type unboxType(final Type type) { + public static Type unboxType(Type type) { JvmPrimitiveType jvmPrimitiveType = JvmPrimitiveType.getByWrapperAsmType(type); if (jvmPrimitiveType != null) { return jvmPrimitiveType.getAsmType(); @@ -270,7 +270,7 @@ public class AsmUtil { } private static Type stringValueOfOrStringBuilderAppendType(Type type) { - final int sort = type.getSort(); + int sort = type.getSort(); return sort == Type.OBJECT || sort == Type.ARRAY ? AsmTypeConstants.OBJECT_TYPE : sort == Type.BYTE || sort == Type.SHORT ? Type.INT_TYPE : type; @@ -293,20 +293,20 @@ public class AsmUtil { } public static void genClosureFields(CalculatedClosure closure, ClassBuilder v, JetTypeMapper typeMapper) { - final ClassifierDescriptor captureThis = closure.getCaptureThis(); - final int access = NO_FLAG_PACKAGE_PRIVATE | ACC_SYNTHETIC | ACC_FINAL; + ClassifierDescriptor captureThis = closure.getCaptureThis(); + int access = NO_FLAG_PACKAGE_PRIVATE | ACC_SYNTHETIC | ACC_FINAL; if (captureThis != null) { v.newField(null, access, CAPTURED_THIS_FIELD, typeMapper.mapType(captureThis).getDescriptor(), null, null); } - final ClassifierDescriptor captureReceiver = closure.getCaptureReceiver(); + ClassifierDescriptor captureReceiver = closure.getCaptureReceiver(); if (captureReceiver != null) { v.newField(null, access, CAPTURED_RECEIVER_FIELD, typeMapper.mapType(captureReceiver).getDescriptor(), null, null); } - final List> fields = closure.getRecordedFields(); + List> fields = closure.getRecordedFields(); for (Pair field : fields) { v.newField(null, access, field.first, field.second.getDescriptor(), null, null); } @@ -339,7 +339,7 @@ public class AsmUtil { } public static StackValue genToString(InstructionAdapter v, StackValue receiver) { - final Type type = stringValueOfOrStringBuilderAppendType(receiver.type); + Type type = stringValueOfOrStringBuilderAppendType(receiver.type); receiver.put(type, v); v.invokestatic("java/lang/String", "valueOf", "(" + type.getDescriptor() + ")Ljava/lang/String;"); return StackValue.onStack(JAVA_STRING_TYPE); @@ -347,7 +347,7 @@ public class AsmUtil { static void genHashCode(MethodVisitor mv, InstructionAdapter iv, Type type) { if (type.getSort() == Type.ARRAY) { - final Type elementType = correctElementType(type); + Type elementType = correctElementType(type); if (elementType.getSort() == Type.OBJECT || elementType.getSort() == Type.ARRAY) { iv.invokestatic("java/util/Arrays", "hashCode", "([Ljava/lang/Object;)I"); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java index 1bec7fd4577..c0ab237fd8c 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassBodyCodegen.java @@ -71,8 +71,8 @@ public abstract class ClassBodyCodegen extends MemberCodegen { } private void generateClassBody() { - final FunctionCodegen functionCodegen = new FunctionCodegen(context, v, state); - final PropertyCodegen propertyCodegen = new PropertyCodegen(context, v, functionCodegen); + FunctionCodegen functionCodegen = new FunctionCodegen(context, v, state); + PropertyCodegen propertyCodegen = new PropertyCodegen(context, v, functionCodegen); for (JetDeclaration declaration : myClass.getDeclarations()) { generateDeclaration(propertyCodegen, declaration, functionCodegen); @@ -114,7 +114,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen { private void generateStaticInitializer() { if (staticInitializerChunks.size() > 0) { - final MethodVisitor mv = v.newMethod(null, ACC_PUBLIC | ACC_STATIC, "", "()V", null, null); + MethodVisitor mv = v.newMethod(null, ACC_PUBLIC | ACC_STATIC, "", "()V", null, null); if (state.getClassBuilderMode() == ClassBuilderMode.FULL) { mv.visitCode(); @@ -133,7 +133,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen { private void generateRemoveInIterator() { // generates stub 'remove' function for subclasses of Iterator to be compatible with java.util.Iterator if (DescriptorUtils.isIteratorWithoutRemoveImpl(descriptor)) { - final MethodVisitor mv = v.getVisitor().visitMethod(ACC_PUBLIC, "remove", "()V", null, null); + MethodVisitor mv = v.getVisitor().visitMethod(ACC_PUBLIC, "remove", "()V", null, null); genMethodThrow(mv, "java/lang/UnsupportedOperationException", "Mutating method called on a Kotlin Iterator"); } } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java index 798fa2c4d3f..82747bd5d95 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java @@ -57,7 +57,7 @@ public final class ClassFileFactory extends GenerationStateAware { private ClassBuilder newVisitor(String outputFilePath, Collection sourceFiles) { state.getProgress().reportOutput(toIoFilesIgnoringNonPhysical(sourceFiles), new File(outputFilePath)); - final ClassBuilder answer = builderFactory.newClassBuilder(); + ClassBuilder answer = builderFactory.newClassBuilder(); generators.put(outputFilePath, answer); return answer; } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java index 81b91693e0c..28f715bd0a4 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClosureCodegen.java @@ -63,19 +63,19 @@ public class ClosureCodegen extends GenerationStateAware { } public ClosureCodegen gen(JetExpression fun, CodegenContext context, ExpressionCodegen expressionCodegen) { - final SimpleFunctionDescriptor descriptor = bindingContext.get(BindingContext.FUNCTION, fun); + SimpleFunctionDescriptor descriptor = bindingContext.get(BindingContext.FUNCTION, fun); assert descriptor != null; name = classNameForAnonymousClass(state.getBindingContext(), fun); - final ClassBuilder cv = state.getFactory().newVisitor(name.getInternalName() + ".class", fun.getContainingFile()); + ClassBuilder cv = state.getFactory().newVisitor(name.getInternalName() + ".class", fun.getContainingFile()); - final FunctionDescriptor funDescriptor = bindingContext.get(BindingContext.FUNCTION, fun); + FunctionDescriptor funDescriptor = bindingContext.get(BindingContext.FUNCTION, fun); SignatureWriter signatureWriter = new SignatureWriter(); assert funDescriptor != null; - final List parameters = funDescriptor.getValueParameters(); - final JvmClassName funClass = getInternalClassName(funDescriptor); + List parameters = funDescriptor.getValueParameters(); + JvmClassName funClass = getInternalClassName(funDescriptor); signatureWriter.visitClassType(funClass.getInternalName()); for (ValueParameterDescriptor parameter : parameters) { appendType(signatureWriter, parameter.getType(), '='); @@ -113,7 +113,7 @@ public class ClosureCodegen extends GenerationStateAware { private void generateConstInstance(PsiElement fun, ClassBuilder cv) { MethodVisitor mv = cv.newMethod(fun, ACC_PUBLIC | ACC_STATIC | ACC_SYNTHETIC, "", "()V", null, new String[0]); - final InstructionAdapter iv = new InstructionAdapter(mv); + InstructionAdapter iv = new InstructionAdapter(mv); cv.newField(fun, ACC_PUBLIC | ACC_STATIC | ACC_FINAL, JvmAbi.INSTANCE_FIELD, name.getDescriptor(), null, null); @@ -136,7 +136,7 @@ public class ClosureCodegen extends GenerationStateAware { ExpressionCodegen expressionCodegen ) { - final CodegenContext closureContext = context.intoClosure(funDescriptor, expressionCodegen); + CodegenContext closureContext = context.intoClosure(funDescriptor, expressionCodegen); FunctionCodegen fc = new FunctionCodegen(closureContext, cv, state); JvmMethodSignature jvmMethodSignature = typeMapper.invokeSignature(funDescriptor); fc.generateMethod(body, jvmMethodSignature, false, null, funDescriptor); @@ -149,14 +149,14 @@ public class ClosureCodegen extends GenerationStateAware { JetExpression fun, ClassBuilder cv ) { - final JvmMethodSignature bridge = erasedInvokeSignature(funDescriptor); - final Method delegate = typeMapper.invokeSignature(funDescriptor).getAsmMethod(); + JvmMethodSignature bridge = erasedInvokeSignature(funDescriptor); + Method delegate = typeMapper.invokeSignature(funDescriptor).getAsmMethod(); if (bridge.getAsmMethod().getDescriptor().equals(delegate.getDescriptor())) { return; } - final MethodVisitor mv = + MethodVisitor mv = cv.newMethod(fun, ACC_PUBLIC | ACC_BRIDGE | ACC_VOLATILE, "invoke", bridge.getAsmMethod().getDescriptor(), null, new String[0]); if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) { @@ -169,14 +169,14 @@ public class ClosureCodegen extends GenerationStateAware { iv.load(0, Type.getObjectType(className)); - final ReceiverParameterDescriptor receiver = funDescriptor.getReceiverParameter(); + ReceiverParameterDescriptor receiver = funDescriptor.getReceiverParameter(); int count = 1; if (receiver != null) { StackValue.local(count, OBJECT_TYPE).put(typeMapper.mapType(receiver.getType()), iv); count++; } - final List params = funDescriptor.getValueParameters(); + List params = funDescriptor.getValueParameters(); for (ValueParameterDescriptor param : params) { StackValue.local(count, OBJECT_TYPE).put(typeMapper.mapType(param.getType()), iv); count++; @@ -197,13 +197,13 @@ public class ClosureCodegen extends GenerationStateAware { ClassBuilder cv, CalculatedClosure closure ) { - final ArrayList> args = new ArrayList>(); + ArrayList> args = new ArrayList>(); calculateConstructorParameters(args, state, closure); - final Type[] argTypes = nameAnTypeListToTypeArray(args); + Type[] argTypes = nameAnTypeListToTypeArray(args); - final Method constructor = new Method("", Type.VOID_TYPE, argTypes); - final MethodVisitor mv = cv.newMethod(fun, ACC_PUBLIC, "", constructor.getDescriptor(), null, new String[0]); + Method constructor = new Method("", Type.VOID_TYPE, argTypes); + MethodVisitor mv = cv.newMethod(fun, ACC_PUBLIC, "", constructor.getDescriptor(), null, new String[0]); if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) { genStubCode(mv); } @@ -217,8 +217,8 @@ public class ClosureCodegen extends GenerationStateAware { int k = 1; for (int i = 0; i != argTypes.length; ++i) { StackValue.local(0, OBJECT_TYPE).put(OBJECT_TYPE, iv); - final Pair nameAndType = args.get(i); - final Type type = nameAndType.second; + Pair nameAndType = args.get(i); + Type type = nameAndType.second; StackValue.local(k, type).put(type, iv); k += type.getSize(); StackValue.field(type, name, nameAndType.first, false).store(type, iv); @@ -236,27 +236,27 @@ public class ClosureCodegen extends GenerationStateAware { GenerationState state, CalculatedClosure closure ) { - final ClassDescriptor captureThis = closure.getCaptureThis(); + ClassDescriptor captureThis = closure.getCaptureThis(); if (captureThis != null) { - final Type type = typeMapper.mapType(captureThis); + Type type = typeMapper.mapType(captureThis); args.add(new Pair(CAPTURED_THIS_FIELD, type)); } - final ClassifierDescriptor captureReceiver = closure.getCaptureReceiver(); + ClassifierDescriptor captureReceiver = closure.getCaptureReceiver(); if (captureReceiver != null) { args.add(new Pair(CAPTURED_RECEIVER_FIELD, typeMapper.mapType(captureReceiver))); } for (DeclarationDescriptor descriptor : closure.getCaptureVariables().keySet()) { if (descriptor instanceof VariableDescriptor && !(descriptor instanceof PropertyDescriptor)) { - final Type sharedVarType = typeMapper.getSharedVarType(descriptor); + Type sharedVarType = typeMapper.getSharedVarType(descriptor); - final Type type = sharedVarType != null + Type type = sharedVarType != null ? sharedVarType : typeMapper.mapType((VariableDescriptor) descriptor); args.add(new Pair("$" + descriptor.getName().getName(), type)); } else if (isLocalNamedFun(state.getBindingContext(), descriptor)) { - final Type type = + Type type = classNameForAnonymousClass(bindingContext, (JetElement) BindingContextUtils.descriptorToDeclaration(bindingContext, descriptor)) .getAsmType(); @@ -270,7 +270,7 @@ public class ClosureCodegen extends GenerationStateAware { } private static Type[] nameAnTypeListToTypeArray(List> args) { - final Type[] argTypes = new Type[args.size()]; + Type[] argTypes = new Type[args.size()]; for (int i = 0; i != argTypes.length; ++i) { argTypes[i] = args.get(i).second; } @@ -280,7 +280,7 @@ public class ClosureCodegen extends GenerationStateAware { private void appendType(SignatureWriter signatureWriter, JetType type, char variance) { signatureWriter.visitTypeArgument(variance); - final Type rawRetType = typeMapper.mapType(type, JetTypeMapperMode.TYPE_PARAMETER); + Type rawRetType = typeMapper.mapType(type, JetTypeMapperMode.TYPE_PARAMETER); signatureWriter.visitClassType(rawRetType.getInternalName()); signatureWriter.visitEnd(); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java index a42ab21ea60..68dcc7b67e5 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java @@ -58,7 +58,7 @@ public class CodegenUtil { public static boolean isInterface(DeclarationDescriptor descriptor) { if (descriptor instanceof ClassDescriptor) { - final ClassKind kind = ((ClassDescriptor) descriptor).getKind(); + ClassKind kind = ((ClassDescriptor) descriptor).getKind(); return kind == ClassKind.TRAIT || kind == ClassKind.ANNOTATION_CLASS; } return false; @@ -123,7 +123,7 @@ public class CodegenUtil { @NotNull public static JvmClassName getInternalClassName(FunctionDescriptor descriptor) { - final int paramCount = descriptor.getValueParameters().size(); + int paramCount = descriptor.getValueParameters().size(); if (descriptor.getReceiverParameter() != null) { return JvmClassName.byInternalName("jet/ExtensionFunction" + paramCount); } @@ -181,7 +181,7 @@ public class CodegenUtil { } public static JetType getSuperClass(ClassDescriptor classDescriptor) { - final List superclassDescriptors = DescriptorUtils.getSuperclassDescriptors(classDescriptor); + List superclassDescriptors = DescriptorUtils.getSuperclassDescriptors(classDescriptor); for (ClassDescriptor descriptor : superclassDescriptors) { if (descriptor.getKind() != ClassKind.TRAIT) { return descriptor.getDefaultType(); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ConstructorFrameMap.java b/compiler/backend/src/org/jetbrains/jet/codegen/ConstructorFrameMap.java index 0708584cad7..f9392728983 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ConstructorFrameMap.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ConstructorFrameMap.java @@ -34,7 +34,7 @@ public class ConstructorFrameMap extends FrameMap { public ConstructorFrameMap(CallableMethod callableMethod, @Nullable ConstructorDescriptor descriptor) { enterTemp(OBJECT_TYPE); // this - final List parameterTypes = callableMethod.getSignature().getKotlinParameterTypes(); + List parameterTypes = callableMethod.getSignature().getKotlinParameterTypes(); if (parameterTypes != null) { for (JvmMethodParameterSignature parameterType : parameterTypes) { if (parameterType.getKind() == JvmMethodParameterKind.OUTER) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java index d88938cf94b..da107a6af9e 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java @@ -115,16 +115,16 @@ public class ExpressionCodegen extends JetVisitor implem className.getInternalName() + ".class", literal.getContainingFile()); - final ClassDescriptor classDescriptor = bindingContext.get(CLASS, objectDeclaration); + ClassDescriptor classDescriptor = bindingContext.get(CLASS, objectDeclaration); assert classDescriptor != null; //noinspection SuspiciousMethodCalls - final CalculatedClosure closure = bindingContext.get(CLOSURE, classDescriptor); + CalculatedClosure closure = bindingContext.get(CLOSURE, classDescriptor); - final CodegenContext contextForInners = context.intoClass(classDescriptor, OwnerKind.IMPLEMENTATION, state); + CodegenContext contextForInners = context.intoClass(classDescriptor, OwnerKind.IMPLEMENTATION, state); - final CodegenContext objectContext = context.intoAnonymousClass(classDescriptor, this); - final ImplementationBodyCodegen implementationBodyCodegen = new ImplementationBodyCodegen(objectDeclaration, objectContext, classBuilder, state); + CodegenContext objectContext = context.intoAnonymousClass(classDescriptor, this); + ImplementationBodyCodegen implementationBodyCodegen = new ImplementationBodyCodegen(objectDeclaration, objectContext, classBuilder, state); implementationBodyCodegen.genInners(contextForInners, state, objectDeclaration); @@ -200,7 +200,7 @@ public class ExpressionCodegen extends JetVisitor implem if (!isInterface(provided) && isInterface(required)) { inner.put(OBJECT_TYPE, v); - final Type type = asmType(required.getDefaultType()); + Type type = asmType(required.getDefaultType()); v.checkcast(type); return StackValue.onStack(type); } @@ -283,7 +283,7 @@ public class ExpressionCodegen extends JetVisitor implem declaration.getContainingFile() ); - final CodegenContext objectContext = context.intoAnonymousClass(descriptor, this); + CodegenContext objectContext = context.intoAnonymousClass(descriptor, this); new ImplementationBodyCodegen(declaration, objectContext, classBuilder, state).generate(); return StackValue.none(); @@ -406,7 +406,7 @@ public class ExpressionCodegen extends JetVisitor implem Label end = new Label(); blockStackElements.push(new LoopBlockStackElement(end, condition, targetLabel(expression))); - final StackValue conditionValue = gen(expression.getCondition()); + StackValue conditionValue = gen(expression.getCondition()); conditionValue.condJump(end, true, v); gen(expression.getBody(), Type.VOID_TYPE); @@ -471,8 +471,8 @@ public class ExpressionCodegen extends JetVisitor implem } } - final JetExpression loopRange = forExpression.getLoopRange(); - final JetType loopRangeType = bindingContext.get(BindingContext.EXPRESSION_TYPE, loopRange); + JetExpression loopRange = forExpression.getLoopRange(); + JetType loopRangeType = bindingContext.get(BindingContext.EXPRESSION_TYPE, loopRange); assert loopRangeType != null; Type asmLoopRangeType = asmType(loopRangeType); if (asmLoopRangeType.getSort() == Type.ARRAY) { @@ -1173,7 +1173,7 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitStringTemplateExpression(JetStringTemplateExpression expression, StackValue receiver) { StringBuilder constantValue = new StringBuilder(""); - final JetStringTemplateEntry[] entries = expression.getEntries(); + JetStringTemplateEntry[] entries = expression.getEntries(); if (entries.length == 1 && entries[0] instanceof JetStringTemplateEntryWithExpression) { return genToString(v, gen(entries[0].getExpression())); @@ -1192,7 +1192,7 @@ public class ExpressionCodegen extends JetVisitor implem } } if (constantValue != null) { - final Type type = expressionType(expression); + Type type = expressionType(expression); return StackValue.constant(constantValue.toString(), type); } else { @@ -1251,16 +1251,16 @@ public class ExpressionCodegen extends JetVisitor implem } private StackValue genClosure(JetExpression expression) { - final FunctionDescriptor descriptor = bindingContext.get(BindingContext.FUNCTION, expression); - final ClassDescriptor classDescriptor = + FunctionDescriptor descriptor = bindingContext.get(BindingContext.FUNCTION, expression); + ClassDescriptor classDescriptor = bindingContext.get(CLASS_FOR_FUNCTION, descriptor); //noinspection SuspiciousMethodCalls - final CalculatedClosure closure = bindingContext.get(CLOSURE, classDescriptor); + CalculatedClosure closure = bindingContext.get(CLOSURE, classDescriptor); ClosureCodegen closureCodegen = new ClosureCodegen(state, (MutableClosure) closure).gen(expression, context, this); - final JvmClassName className = closureCodegen.name; - final Type asmType = className.getAsmType(); + JvmClassName className = closureCodegen.name; + Type asmType = className.getAsmType(); if (isConst(closure)) { v.getstatic(className.getInternalName(), JvmAbi.INSTANCE_FIELD, className.getDescriptor()); } @@ -1268,7 +1268,7 @@ public class ExpressionCodegen extends JetVisitor implem v.anew(asmType); v.dup(); - final Method cons = closureCodegen.constructor; + Method cons = closureCodegen.constructor; pushClosureOnStack(closure, false); v.invokespecial(className.getInternalName(), "", cons.getDescriptor()); } @@ -1283,17 +1283,17 @@ public class ExpressionCodegen extends JetVisitor implem assert constructorDescriptor != null; CallableMethod constructor = typeMapper.mapToCallableMethod(constructorDescriptor, closure); - final JvmClassName name = bindingContext.get(FQN, constructorDescriptor.getContainingDeclaration()); + JvmClassName name = bindingContext.get(FQN, constructorDescriptor.getContainingDeclaration()); assert name != null; Type type = name.getAsmType(); v.anew(type); v.dup(); - final Method cons = constructor.getSignature().getAsmMethod(); + Method cons = constructor.getSignature().getAsmMethod(); pushClosureOnStack(closure, false); - final JetDelegatorToSuperCall superCall = closure.getSuperCall(); + JetDelegatorToSuperCall superCall = closure.getSuperCall(); if (superCall != null) { ConstructorDescriptor superConstructor = (ConstructorDescriptor) bindingContext.get(BindingContext.REFERENCE_TARGET, superCall @@ -1315,14 +1315,14 @@ public class ExpressionCodegen extends JetVisitor implem protected void pushClosureOnStack(CalculatedClosure closure, boolean ignoreThisAndReceiver) { if (closure != null) { if (!ignoreThisAndReceiver) { - final ClassDescriptor captureThis = closure.getCaptureThis(); + ClassDescriptor captureThis = closure.getCaptureThis(); if (captureThis != null) { generateThisOrOuter(captureThis, false).put(OBJECT_TYPE, v); } - final ClassifierDescriptor captureReceiver = closure.getCaptureReceiver(); + ClassifierDescriptor captureReceiver = closure.getCaptureReceiver(); if (captureReceiver != null) { - final Type asmType = typeMapper.mapType(captureReceiver.getDefaultType(), JetTypeMapperMode.IMPL); + Type asmType = typeMapper.mapType(captureReceiver.getDefaultType(), JetTypeMapperMode.IMPL); v.load(context.isStatic() ? 0 : 1, asmType); } } @@ -1340,7 +1340,7 @@ public class ExpressionCodegen extends JetVisitor implem } private StackValue generateBlock(List statements, boolean lastStatementIsExpression) { - final Label blockEnd = new Label(); + Label blockEnd = new Label(); List> leaveTasks = Lists.newArrayList(); @@ -1452,7 +1452,7 @@ public class ExpressionCodegen extends JetVisitor implem } private void markLineNumber(@NotNull JetElement statement) { - final Document document = statement.getContainingFile().getViewProvider().getDocument(); + Document document = statement.getContainingFile().getViewProvider().getDocument(); if (document != null) { int lineNumber = document.getLineNumber(statement.getTextRange().getStartOffset()); // 0-based if (lineNumber == myLastLineNumber) { @@ -1485,7 +1485,7 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitReturnExpression(JetReturnExpression expression, StackValue receiver) { - final JetExpression returnedExpression = expression.getReturnedExpression(); + JetExpression returnedExpression = expression.getReturnedExpression(); if (returnedExpression != null) { gen(returnedExpression, returnType); doFinallyOnReturn(); @@ -1512,7 +1512,7 @@ public class ExpressionCodegen extends JetVisitor implem private static boolean endsWithReturn(JetElement bodyExpression) { if (bodyExpression instanceof JetBlockExpression) { - final List statements = ((JetBlockExpression) bodyExpression).getStatements(); + List statements = ((JetBlockExpression) bodyExpression).getStatements(); return statements.size() > 0 && statements.get(statements.size() - 1) instanceof JetReturnExpression; } @@ -1548,12 +1548,12 @@ public class ExpressionCodegen extends JetVisitor implem intrinsic = state.getIntrinsics().getIntrinsic(memberDescriptor); } if (intrinsic != null) { - final Type expectedType = expressionType(expression); + Type expectedType = expressionType(expression); return intrinsic.generate(this, v, expectedType, expression, Collections.emptyList(), receiver, state); } assert descriptor != null; - final DeclarationDescriptor container = descriptor.getContainingDeclaration(); + DeclarationDescriptor container = descriptor.getContainingDeclaration(); if (descriptor instanceof VariableDescriptor) { VariableDescriptor variableDescriptor = (VariableDescriptor) descriptor; @@ -1572,12 +1572,12 @@ public class ExpressionCodegen extends JetVisitor implem PropertyDescriptor propertyDescriptor = (PropertyDescriptor) descriptor; boolean isStatic = container instanceof NamespaceDescriptor; - final boolean directToField = + boolean directToField = expression.getReferencedNameElementType() == JetTokens.FIELD_IDENTIFIER && contextKind() != OwnerKind.TRAIT_IMPL; JetExpression r = getReceiverForSelector(expression); - final boolean isSuper = r instanceof JetSuperExpression; + boolean isSuper = r instanceof JetSuperExpression; propertyDescriptor = accessablePropertyDescriptor(propertyDescriptor); - final StackValue.Property iValue = + StackValue.Property iValue = intermediateValueForProperty(propertyDescriptor, directToField, isSuper ? (JetSuperExpression) r : null); if (!directToField && resolvedCall != null && !isSuper) { receiver.put(propertyDescriptor.getReceiverParameter() != null || isStatic @@ -1656,8 +1656,8 @@ public class ExpressionCodegen extends JetVisitor implem assert scriptDescriptor != null; JvmClassName scriptClassName = classNameForScriptDescriptor(bindingContext, scriptDescriptor); ValueParameterDescriptor valueParameterDescriptor = (ValueParameterDescriptor) descriptor; - final ClassDescriptor scriptClass = bindingContext.get(CLASS_FOR_FUNCTION, scriptDescriptor); - final StackValue script = StackValue.thisOrOuter(this, scriptClass, false); + ClassDescriptor scriptClass = bindingContext.get(CLASS_FOR_FUNCTION, scriptDescriptor); + StackValue script = StackValue.thisOrOuter(this, scriptClass, false); script.put(script.type, v); Type fieldType = typeMapper.mapType(valueParameterDescriptor); return StackValue.field(fieldType, scriptClassName, valueParameterDescriptor.getName().getIdentifier(), false); @@ -1682,7 +1682,7 @@ public class ExpressionCodegen extends JetVisitor implem private StackValue stackValueForLocal(DeclarationDescriptor descriptor, int index) { if (descriptor instanceof VariableDescriptor) { Type sharedVarType = typeMapper.getSharedVarType(descriptor); - final JetType outType = ((VariableDescriptor) descriptor).getType(); + JetType outType = ((VariableDescriptor) descriptor).getType(); if (sharedVarType != null) { return StackValue.shared(index, asmType(outType)); } @@ -1706,7 +1706,7 @@ public class ExpressionCodegen extends JetVisitor implem public StackValue.Property intermediateValueForProperty( PropertyDescriptor propertyDescriptor, - final boolean forceField, + boolean forceField, @Nullable JetSuperExpression superExpression ) { boolean isSuper = superExpression != null; @@ -1845,7 +1845,7 @@ public class ExpressionCodegen extends JetVisitor implem private static boolean isOverrideForTrait(CallableMemberDescriptor propertyDescriptor) { if (propertyDescriptor.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) { - final Set overriddenDescriptors = propertyDescriptor.getOverriddenDescriptors(); + Set overriddenDescriptors = propertyDescriptor.getOverriddenDescriptors(); for (CallableMemberDescriptor descriptor : overriddenDescriptors) { if (isInterface(descriptor.getContainingDeclaration())) { return true; @@ -1857,7 +1857,7 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitCallExpression(JetCallExpression expression, StackValue receiver) { - final JetExpression callee = expression.getCalleeExpression(); + JetExpression callee = expression.getCalleeExpression(); assert callee != null; ResolvedCall resolvedCall = bindingContext.get(BindingContext.RESOLVED_CALL, callee); @@ -1895,7 +1895,7 @@ public class ExpressionCodegen extends JetVisitor implem PropertySetterDescriptor setter = propertyDescriptor.getSetter(); PropertyGetterDescriptor getter = propertyDescriptor.getGetter(); - final int flag = getVisibilityAccessFlag(propertyDescriptor) | + int flag = getVisibilityAccessFlag(propertyDescriptor) | (getter == null ? 0 : getVisibilityAccessFlag(getter)) | (setter == null ? 0 : getVisibilityAccessFlag(setter)); @@ -1907,7 +1907,7 @@ public class ExpressionCodegen extends JetVisitor implem } private FunctionDescriptor accessableFunctionDescriptor(FunctionDescriptor fd) { - final int flag = getVisibilityAccessFlag(fd); + int flag = getVisibilityAccessFlag(fd); if ((flag & ACC_PRIVATE) == 0) { return fd; } @@ -1954,10 +1954,10 @@ public class ExpressionCodegen extends JetVisitor implem Callable callable = resolveToCallable(fd, superCall); if (callable instanceof CallableMethod) { - final CallableMethod callableMethod = (CallableMethod) callable; + CallableMethod callableMethod = (CallableMethod) callable; invokeMethodWithArguments(callableMethod, resolvedCall, call, receiver); - final Type callReturnType = callableMethod.getSignature().getAsmMethod().getReturnType(); + Type callReturnType = callableMethod.getSignature().getAsmMethod().getReturnType(); return returnValueAsStackValue(fd, callReturnType); } else { @@ -2012,7 +2012,7 @@ public class ExpressionCodegen extends JetVisitor implem if (callReturnType != Type.VOID_TYPE) { JetType type = fd.getReturnType(); assert type != null; - final Type retType = typeMapper.mapReturnType(type); + Type retType = typeMapper.mapReturnType(type); StackValue.coerce(callReturnType, retType, v); return StackValue.onStack(retType); } @@ -2020,7 +2020,7 @@ public class ExpressionCodegen extends JetVisitor implem } Callable resolveToCallable(@NotNull FunctionDescriptor fd, boolean superCall) { - final IntrinsicMethod intrinsic = state.getIntrinsics().getIntrinsic(fd); + IntrinsicMethod intrinsic = state.getIntrinsics().getIntrinsic(fd); if (intrinsic != null) { return intrinsic; } @@ -2083,7 +2083,7 @@ public class ExpressionCodegen extends JetVisitor implem @NotNull Call call, @NotNull StackValue receiver ) { - final Type calleeType = callableMethod.getGenerateCalleeType(); + Type calleeType = callableMethod.getGenerateCalleeType(); if (calleeType != null) { assert !callableMethod.isNeedsThis(); gen(call.getCalleeExpression(), calleeType); @@ -2165,7 +2165,7 @@ public class ExpressionCodegen extends JetVisitor implem @Nullable private static JetExpression getReceiverForSelector(PsiElement expression) { if (expression.getParent() instanceof JetDotQualifiedExpression && !isReceiver(expression)) { - final JetDotQualifiedExpression parent = (JetDotQualifiedExpression) expression.getParent(); + JetDotQualifiedExpression parent = (JetDotQualifiedExpression) expression.getParent(); return parent.getReceiverExpression(); } return null; @@ -2222,7 +2222,7 @@ public class ExpressionCodegen extends JetVisitor implem throw new UnsupportedOperationException(); } - public StackValue generateThisOrOuter(@NotNull final ClassDescriptor calleeContainingClass, boolean isSuper) { + public StackValue generateThisOrOuter(@NotNull ClassDescriptor calleeContainingClass, boolean isSuper) { boolean isSingleton = CodegenBinding.isSingleton(bindingContext, calleeContainingClass); if (isSingleton) { assert !isSuper; @@ -2244,7 +2244,7 @@ public class ExpressionCodegen extends JetVisitor implem } assert cur != null; - final ClassDescriptor thisDescriptor = cur.getThisDescriptor(); + ClassDescriptor thisDescriptor = cur.getThisDescriptor(); if (!isSuper && thisDescriptor.equals(calleeContainingClass) || isSuper && DescriptorUtils.isSubclass(thisDescriptor, calleeContainingClass)) { return castToRequiredTypeOfInterfaceIfNeeded(result, thisDescriptor, calleeContainingClass); @@ -2263,9 +2263,9 @@ public class ExpressionCodegen extends JetVisitor implem } private static boolean isReceiver(PsiElement expression) { - final PsiElement parent = expression.getParent(); + PsiElement parent = expression.getParent(); if (parent instanceof JetQualifiedExpression) { - final JetExpression receiverExpression = ((JetQualifiedExpression) parent).getReceiverExpression(); + JetExpression receiverExpression = ((JetQualifiedExpression) parent).getReceiverExpression(); return expression == receiverExpression; } return false; @@ -2388,7 +2388,7 @@ public class ExpressionCodegen extends JetVisitor implem } public int indexOfLocal(JetReferenceExpression lhs) { - final DeclarationDescriptor declarationDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, lhs); + DeclarationDescriptor declarationDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, lhs); if (isVarCapturedInClosure(bindingContext, declarationDescriptor)) { return -1; } @@ -2437,7 +2437,7 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitBinaryExpression(JetBinaryExpression expression, StackValue receiver) { - final IElementType opToken = expression.getOperationReference().getReferencedNameElementType(); + IElementType opToken = expression.getOperationReference().getReferencedNameElementType(); if (opToken == JetTokens.EQ) { return generateAssignmentExpression(expression); } @@ -2466,7 +2466,7 @@ public class ExpressionCodegen extends JetVisitor implem } else { DeclarationDescriptor op = bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getOperationReference()); - final Callable callable = resolveToCallable((FunctionDescriptor) op, false); + Callable callable = resolveToCallable((FunctionDescriptor) op, false); if (callable instanceof IntrinsicMethod) { IntrinsicMethod intrinsic = (IntrinsicMethod) callable; return intrinsic.generate(this, v, expressionType(expression), expression, @@ -2689,8 +2689,8 @@ public class ExpressionCodegen extends JetVisitor implem private StackValue generateAugmentedAssignment(JetBinaryExpression expression) { DeclarationDescriptor op = bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getOperationReference()); - final Callable callable = resolveToCallable((FunctionDescriptor) op, false); - final JetExpression lhs = expression.getLeft(); + Callable callable = resolveToCallable((FunctionDescriptor) op, false); + JetExpression lhs = expression.getLeft(); // if (lhs instanceof JetArrayAccessExpression) { // JetArrayAccessExpression arrayAccessExpression = (JetArrayAccessExpression) lhs; @@ -2706,7 +2706,7 @@ public class ExpressionCodegen extends JetVisitor implem StackValue value = gen(lhs); // receiver value.dupReceiver(v); // receiver receiver value.put(lhsType, v); // receiver lhs - final IntrinsicMethod intrinsic = (IntrinsicMethod) callable; + IntrinsicMethod intrinsic = (IntrinsicMethod) callable; //noinspection NullableProblems JetExpression right = expression.getRight(); assert right != null; @@ -2722,14 +2722,14 @@ public class ExpressionCodegen extends JetVisitor implem else { JetType type = ((FunctionDescriptor) op).getReturnType(); assert type != null; - final boolean keepReturnValue = !type.equals(KotlinBuiltIns.getInstance().getUnitType()); + boolean keepReturnValue = !type.equals(KotlinBuiltIns.getInstance().getUnitType()); callAugAssignMethod(expression, (CallableMethod) callable, lhsType, keepReturnValue); } return StackValue.none(); } - private void callAugAssignMethod(JetBinaryExpression expression, CallableMethod callable, Type lhsType, final boolean keepReturnValue) { + private void callAugAssignMethod(JetBinaryExpression expression, CallableMethod callable, Type lhsType, boolean keepReturnValue) { ResolvedCall resolvedCall = bindingContext.get(BindingContext.RESOLVED_CALL, expression.getOperationReference()); assert resolvedCall != null; @@ -2753,9 +2753,9 @@ public class ExpressionCodegen extends JetVisitor implem } } - public void invokeAppend(final JetExpression expr) { + public void invokeAppend(JetExpression expr) { if (expr instanceof JetBinaryExpression) { - final JetBinaryExpression binaryExpression = (JetBinaryExpression) expr; + JetBinaryExpression binaryExpression = (JetBinaryExpression) expr; if (binaryExpression.getOperationToken() == JetTokens.PLUS) { JetExpression left = binaryExpression.getLeft(); JetExpression right = binaryExpression.getRight(); @@ -2794,7 +2794,7 @@ public class ExpressionCodegen extends JetVisitor implem } DeclarationDescriptor op = bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getOperationReference()); - final Callable callable = resolveToCallable((FunctionDescriptor) op, false); + Callable callable = resolveToCallable((FunctionDescriptor) op, false); if (callable instanceof IntrinsicMethod) { IntrinsicMethod intrinsic = (IntrinsicMethod) callable; //noinspection ConstantConditions @@ -2859,14 +2859,14 @@ public class ExpressionCodegen extends JetVisitor implem } DeclarationDescriptor op = bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getOperationReference()); if (op instanceof FunctionDescriptor) { - final Type asmType = expressionType(expression); + Type asmType = expressionType(expression); DeclarationDescriptor cls = op.getContainingDeclaration(); if (op.getName().getName().equals("inc") || op.getName().getName().equals("dec")) { if (isPrimitiveNumberClassDescriptor(cls)) { receiver.put(receiver.type, v); JetExpression operand = expression.getBaseExpression(); if (operand instanceof JetReferenceExpression) { - final int index = indexOfLocal((JetReferenceExpression) operand); + int index = indexOfLocal((JetReferenceExpression) operand); if (index >= 0 && isIntPrimitive(asmType)) { int increment = op.getName().getName().equals("inc") ? 1 : -1; return StackValue.postIncrement(index, increment); @@ -2881,7 +2881,7 @@ public class ExpressionCodegen extends JetVisitor implem bindingContext.get(BindingContext.RESOLVED_CALL, expression.getOperationReference()); assert resolvedCall != null; - final Callable callable = resolveToCallable((FunctionDescriptor) op, false); + Callable callable = resolveToCallable((FunctionDescriptor) op, false); StackValue value = gen(expression.getBaseExpression()); value.dupReceiver(v); @@ -2935,7 +2935,7 @@ public class ExpressionCodegen extends JetVisitor implem private void generateIncrement(DeclarationDescriptor op, Type asmType, JetExpression operand, StackValue receiver) { int increment = op.getName().getName().equals("inc") ? 1 : -1; if (operand instanceof JetReferenceExpression) { - final int index = indexOfLocal((JetReferenceExpression) operand); + int index = indexOfLocal((JetReferenceExpression) operand); if (index >= 0 && isIntPrimitive(asmType)) { v.iinc(index, increment); return; @@ -2973,11 +2973,11 @@ public class ExpressionCodegen extends JetVisitor implem JetType initializerType = bindingContext.get(EXPRESSION_TYPE, initializer); assert initializerType != null; - final Type initializerAsmType = asmType(initializerType); + Type initializerAsmType = asmType(initializerType); final TransientReceiver initializerAsReceiver = new TransientReceiver(initializerType); - final int tempVarIndex = myFrameMap.enterTemp(initializerAsmType); + int tempVarIndex = myFrameMap.enterTemp(initializerAsmType); gen(initializer, initializerAsmType); v.store(tempVarIndex, initializerAsmType); @@ -3053,7 +3053,7 @@ public class ExpressionCodegen extends JetVisitor implem ) { DeclarationDescriptor constructorDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, constructorReference); assert constructorDescriptor != null; - final PsiElement declaration = BindingContextUtils.descriptorToDeclaration(bindingContext, constructorDescriptor); + PsiElement declaration = BindingContextUtils.descriptorToDeclaration(bindingContext, constructorDescriptor); Type type; if (declaration instanceof PsiMethod) { type = generateJavaConstructorCall(expression); @@ -3070,13 +3070,13 @@ public class ExpressionCodegen extends JetVisitor implem v.anew(type); v.dup(); - final ClassDescriptor classDescriptor = ((ConstructorDescriptor) constructorDescriptor).getContainingDeclaration(); + ClassDescriptor classDescriptor = ((ConstructorDescriptor) constructorDescriptor).getContainingDeclaration(); CallableMethod method = typeMapper.mapToCallableMethod((ConstructorDescriptor) constructorDescriptor); receiver.put(receiver.type, v); - final MutableClosure closure = bindingContext.get(CLOSURE, classDescriptor); + MutableClosure closure = bindingContext.get(CLOSURE, classDescriptor); if(receiver.type.getSort() != Type.VOID && (closure == null || closure.getCaptureThis() == null)) { v.pop(); @@ -3105,7 +3105,7 @@ public class ExpressionCodegen extends JetVisitor implem Type type = asmType(javaClass.getDefaultType()); v.anew(type); v.dup(); - final CallableMethod callableMethod = typeMapper.mapToCallableMethod( + CallableMethod callableMethod = typeMapper.mapToCallableMethod( descriptor, false, isCallInsideSameClassAsDeclared(descriptor, context), @@ -3184,10 +3184,10 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitArrayAccessExpression(JetArrayAccessExpression expression, StackValue receiver) { - final JetExpression array = expression.getArrayExpression(); + JetExpression array = expression.getArrayExpression(); JetType type = bindingContext.get(BindingContext.EXPRESSION_TYPE, array); - final Type arrayType = asmTypeOrVoid(type); - final List indices = expression.getIndexExpressions(); + Type arrayType = asmTypeOrVoid(type); + List indices = expression.getIndexExpressions(); FunctionDescriptor operationDescriptor = (FunctionDescriptor) bindingContext.get(BindingContext.REFERENCE_TARGET, expression); assert operationDescriptor != null; if (arrayType.getSort() == Type.ARRAY && @@ -3274,7 +3274,7 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitThisExpression(JetThisExpression expression, StackValue receiver) { - final DeclarationDescriptor descriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getInstanceReference()); + DeclarationDescriptor descriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getInstanceReference()); if (descriptor instanceof ClassDescriptor) { return StackValue.thisOrOuter(this, (ClassDescriptor) descriptor, false); } @@ -3399,7 +3399,7 @@ The "returned" value of try expression with no finally is either the last expres } @Override - public StackValue visitBinaryWithTypeRHSExpression(final JetBinaryExpressionWithTypeRHS expression, StackValue receiver) { + public StackValue visitBinaryWithTypeRHSExpression(JetBinaryExpressionWithTypeRHS expression, StackValue receiver) { JetSimpleNameExpression operationSign = expression.getOperationSign(); IElementType opToken = operationSign.getReferencedNameElementType(); if (opToken == JetTokens.COLON) { @@ -3449,8 +3449,8 @@ The "returned" value of try expression with no finally is either the last expres } @Override - public StackValue visitIsExpression(final JetIsExpression expression, StackValue receiver) { - final StackValue match = StackValue.expression(OBJECT_TYPE, expression.getLeftHandSide(), this); + public StackValue visitIsExpression(JetIsExpression expression, StackValue receiver) { + StackValue match = StackValue.expression(OBJECT_TYPE, expression.getLeftHandSide(), this); return generateIsCheck(match, expression.getTypeRef(), expression.isNegated()); } @@ -3520,9 +3520,9 @@ The "returned" value of try expression with no finally is either the last expres public StackValue generateWhenExpression(JetWhenExpression expression, boolean isStatement) { JetExpression expr = expression.getSubjectExpression(); JetType subjectJetType = bindingContext.get(BindingContext.EXPRESSION_TYPE, expr); - final Type subjectType = asmTypeOrVoid(subjectJetType); - final Type resultType = isStatement ? Type.VOID_TYPE : expressionType(expression); - final int subjectLocal = expr != null ? myFrameMap.enterTemp(subjectType) : -1; + Type subjectType = asmTypeOrVoid(subjectJetType); + Type resultType = isStatement ? Type.VOID_TYPE : expressionType(expression); + int subjectLocal = expr != null ? myFrameMap.enterTemp(subjectType) : -1; if (subjectLocal != -1) { gen(expr, subjectType); tempVariables.put(expr, StackValue.local(subjectLocal, subjectType)); @@ -3547,7 +3547,7 @@ The "returned" value of try expression with no finally is either the last expres FrameMap.Mark mark = myFrameMap.mark(); Label thisEntry = new Label(); if (!whenEntry.isElse()) { - final JetWhenCondition[] conditions = whenEntry.getConditions(); + JetWhenCondition[] conditions = whenEntry.getConditions(); for (int i = 0; i < conditions.length; i++) { StackValue conditionValue = generateWhenCondition(subjectType, subjectLocal, conditions[i]); conditionValue.condJump(nextCondition, true, v); @@ -3631,18 +3631,18 @@ The "returned" value of try expression with no finally is either the last expres if (binaryExpression.getOperationReference().getReferencedNameElementType() == JetTokens.RANGE) { JetType jetType = bindingContext.get(BindingContext.EXPRESSION_TYPE, rangeExpression); assert jetType != null; - final DeclarationDescriptor descriptor = jetType.getConstructor().getDeclarationDescriptor(); + DeclarationDescriptor descriptor = jetType.getConstructor().getDeclarationDescriptor(); return INTEGRAL_RANGES.contains(descriptor); } } return false; } - private void throwNewException(@NotNull final String className) { + private void throwNewException(@NotNull String className) { throwNewException(className, null); } - private void throwNewException(@NotNull final String className, @Nullable final String message) { + private void throwNewException(@NotNull String className, @Nullable String message) { v.anew(Type.getObjectType(className)); v.dup(); if (message != null) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java index 243e97e735e..2b925d3436c 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java @@ -69,7 +69,7 @@ public class FunctionCodegen extends GenerationStateAware { } public void gen(JetNamedFunction f) { - final SimpleFunctionDescriptor functionDescriptor = bindingContext.get(BindingContext.FUNCTION, f); + SimpleFunctionDescriptor functionDescriptor = bindingContext.get(BindingContext.FUNCTION, f); assert functionDescriptor != null; JvmMethodSignature method = typeMapper.mapToCallableMethod( @@ -383,7 +383,7 @@ public class FunctionCodegen extends GenerationStateAware { throw new IllegalStateException(); } - final List kotlinParameterTypes = jvmSignature.getKotlinParameterTypes(); + List kotlinParameterTypes = jvmSignature.getKotlinParameterTypes(); assert kotlinParameterTypes != null; if (receiverParameter != null) { @@ -572,7 +572,7 @@ public class FunctionCodegen extends GenerationStateAware { if (!isStatic && !isConstructor) { descriptor = descriptor.replace("(", "(" + ownerInternalName.getDescriptor()); } - final MethodVisitor mv = v.newMethod(null, flags | (isConstructor ? 0 : ACC_STATIC), + MethodVisitor mv = v.newMethod(null, flags | (isConstructor ? 0 : ACC_STATIC), isConstructor ? "" : jvmSignature.getName() + JvmAbi.DEFAULT_PARAMS_IMPL_SUFFIX, descriptor, null, null); InstructionAdapter iv = new InstructionAdapter(mv); @@ -628,8 +628,8 @@ public class FunctionCodegen extends GenerationStateAware { receiverType = state.getTypeMapper().mapType(receiverParameter.getType()); } - final int extraInLocalVariablesTable = getSizeOfExplicitArgumentsInLocalVariablesTable(aStatic, hasOuter, isEnumConstructor, receiverType); - final int countOfExtraVarsInMethodArgs = getCountOfExplicitArgumentsInMethodArguments(hasOuter, hasReceiver, isEnumConstructor); + int extraInLocalVariablesTable = getSizeOfExplicitArgumentsInLocalVariablesTable(aStatic, hasOuter, isEnumConstructor, receiverType); + int countOfExtraVarsInMethodArgs = getCountOfExplicitArgumentsInMethodArguments(hasOuter, hasReceiver, isEnumConstructor); Type[] argTypes = jvmSignature.getArgumentTypes(); List paramDescrs = functionDescriptor.getValueParameters(); @@ -641,7 +641,7 @@ public class FunctionCodegen extends GenerationStateAware { paramSizeInLocalVariablesTable += size; } - final int maskIndex = extraInLocalVariablesTable + paramSizeInLocalVariablesTable; + int maskIndex = extraInLocalVariablesTable + paramSizeInLocalVariablesTable; loadExplicitArgumentsOnStack(iv, OBJECT_TYPE, receiverType, ownerInternalName.getAsmType(), aStatic, hasOuter, isEnumConstructor); @@ -674,9 +674,9 @@ public class FunctionCodegen extends GenerationStateAware { indexInLocalVariablesTable += t.getSize(); } - final String internalName = ownerInternalName.getInternalName(); - final String jvmSignatureName = jvmSignature.getName(); - final String jvmSignatureDescriptor = jvmSignature.getDescriptor(); + String internalName = ownerInternalName.getInternalName(); + String jvmSignatureName = jvmSignature.getName(); + String jvmSignatureDescriptor = jvmSignature.getDescriptor(); if (!aStatic) { if (kind == OwnerKind.TRAIT_IMPL) { iv.invokeinterface(internalName, jvmSignatureName, jvmSignatureDescriptor); @@ -806,7 +806,7 @@ public class FunctionCodegen extends GenerationStateAware { ) { int flags = ACC_PUBLIC | ACC_BRIDGE | ACC_SYNTHETIC; // TODO. - final MethodVisitor mv = v.newMethod(null, flags, jvmSignature.getName(), overridden.getDescriptor(), null, null); + MethodVisitor mv = v.newMethod(null, flags, jvmSignature.getName(), overridden.getDescriptor(), null, null); if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) { genStubCode(mv); } @@ -854,7 +854,7 @@ public class FunctionCodegen extends GenerationStateAware { int flags = ACC_PUBLIC | ACC_SYNTHETIC; // TODO. - final MethodVisitor mv = v.newMethod(null, flags, delegateMethod.getName(), delegateMethod.getDescriptor(), null, null); + MethodVisitor mv = v.newMethod(null, flags, delegateMethod.getName(), delegateMethod.getDescriptor(), null, null); if (state.getClassBuilderMode() == ClassBuilderMode.STUBS) { genStubCode(mv); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java index 65170afe86d..9cad090f9d6 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java @@ -505,8 +505,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } private void generateDataClassEqualsMethod(List properties) { - final MethodVisitor mv = v.getVisitor().visitMethod(ACC_PUBLIC, "equals", "(Ljava/lang/Object;)Z", null, null); - final InstructionAdapter iv = new InstructionAdapter(mv); + MethodVisitor mv = v.getVisitor().visitMethod(ACC_PUBLIC, "equals", "(Ljava/lang/Object;)Z", null, null); + InstructionAdapter iv = new InstructionAdapter(mv); mv.visitCode(); Label eq = new Label(); @@ -531,7 +531,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { genPropertyOnStack(iv, propertyDescriptor, 2); if (asmType.getSort() == Type.ARRAY) { - final Type elementType = correctElementType(asmType); + Type elementType = correctElementType(asmType); if (elementType.getSort() == Type.OBJECT || elementType.getSort() == Type.ARRAY) { iv.invokestatic("java/util/Arrays", "equals", "([Ljava/lang/Object;[Ljava/lang/Object;)Z"); } @@ -559,8 +559,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } private void generateDataClassHashCodeMethod(List properties) { - final MethodVisitor mv = v.getVisitor().visitMethod(ACC_PUBLIC, "hashCode", "()I", null, null); - final InstructionAdapter iv = new InstructionAdapter(mv); + MethodVisitor mv = v.getVisitor().visitMethod(ACC_PUBLIC, "hashCode", "()I", null, null); + InstructionAdapter iv = new InstructionAdapter(mv); mv.visitCode(); boolean first = true; @@ -605,8 +605,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } private void generateDataClassToStringMethod(List properties) { - final MethodVisitor mv = v.getVisitor().visitMethod(ACC_PUBLIC, "toString", "()Ljava/lang/String;", null, null); - final InstructionAdapter iv = new InstructionAdapter(mv); + MethodVisitor mv = v.getVisitor().visitMethod(ACC_PUBLIC, "toString", "()Ljava/lang/String;", null, null); + InstructionAdapter iv = new InstructionAdapter(mv); mv.visitCode(); genStringBuilderConstructor(iv); @@ -625,7 +625,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { Type type = genPropertyOnStack(iv, propertyDescriptor, 0); if (type.getSort() == Type.ARRAY) { - final Type elementType = correctElementType(type); + Type elementType = correctElementType(type); if (elementType.getSort() == Type.OBJECT || elementType.getSort() == Type.ARRAY) { iv.invokestatic("java/util/Arrays", "toString", "([Ljava/lang/Object;)Ljava/lang/String;"); type = JAVA_STRING_TYPE; @@ -651,7 +651,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { private Type genPropertyOnStack(InstructionAdapter iv, PropertyDescriptor propertyDescriptor, int index) { iv.load(index, classAsmType); - final Method + Method method = typeMapper.mapGetterSignature(propertyDescriptor, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod(); iv.invokevirtual(classAsmType.getInternalName(), method.getName(), method.getDescriptor()); @@ -676,7 +676,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { assert returnType != null : "Return type of component function should not be null: " + function; Type componentType = typeMapper.mapReturnType(returnType); - final String desc = "()" + componentType.getDescriptor(); + String desc = "()" + componentType.getDescriptor(); MethodVisitor mv = v.newMethod(myClass, AsmUtil.getMethodAsmFlags(function, OwnerKind.IMPLEMENTATION), function.getName().getName(), @@ -701,7 +701,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { assert returnType != null : "Return type of copy function should not be null: " + function; JvmMethodSignature methodSignature = typeMapper.mapSignature(function.getName(), function); - final String methodDesc = methodSignature.getAsmMethod().getDescriptor(); + String methodDesc = methodSignature.getAsmMethod().getDescriptor(); MethodVisitor mv = v.newMethod(myClass, AsmUtil.getMethodAsmFlags(function, OwnerKind.IMPLEMENTATION), function.getName().getName(), methodDesc, @@ -729,7 +729,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { MutableClosure closure = context.closure; if (closure != null && closure.getCaptureThis() != null) { - final Type type = typeMapper.mapType(enclosingClassDescriptor(bindingContext, descriptor)); + Type type = typeMapper.mapType(enclosingClassDescriptor(bindingContext, descriptor)); iv.load(0, classAsmType); iv.getfield(JvmClassName.byType(classAsmType).getInternalName(), CAPTURED_THIS_FIELD, type.getDescriptor()); } @@ -754,7 +754,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { FunctionCodegen.endVisit(mv, function.getName().getName(), myClass); - final MethodContext functionContext = context.intoFunction(function); + MethodContext functionContext = context.intoFunction(function); FunctionCodegen.generateDefaultIfNeeded(functionContext, state, v, methodSignature.getAsmMethod(), function, OwnerKind.IMPLEMENTATION, new DefaultParameterValueLoader() { @Override @@ -820,7 +820,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { FunctionDescriptor original = (FunctionDescriptor) entry.getKey(); Method method = typeMapper.mapSignature(bridge.getName(), bridge).getAsmMethod(); - final boolean isConstructor = original instanceof ConstructorDescriptor; + boolean isConstructor = original instanceof ConstructorDescriptor; Method originalMethod = isConstructor ? typeMapper.mapToCallableMethod((ConstructorDescriptor) original).getSignature().getAsmMethod() : typeMapper.mapSignature(original.getName(), original).getAsmMethod(); @@ -977,7 +977,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { ConstructorDescriptor constructorDescriptor = bindingContext.get(BindingContext.CONSTRUCTOR, myClass); - final ConstructorContext constructorContext = context.intoConstructor(constructorDescriptor); + ConstructorContext constructorContext = context.intoConstructor(constructorDescriptor); if (state.getClassBuilderMode() == ClassBuilderMode.FULL) { lookupConstructorExpressionsInClosureIfPresent(constructorContext); @@ -986,12 +986,12 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { MutableClosure closure = context.closure; boolean hasCapturedThis = closure != null && closure.getCaptureThis() != null; - final CallableMethod callableMethod = typeMapper.mapToCallableMethod(constructorDescriptor, context.closure); - final JvmMethodSignature constructorMethod = callableMethod.getSignature(); + CallableMethod callableMethod = typeMapper.mapToCallableMethod(constructorDescriptor, context.closure); + JvmMethodSignature constructorMethod = callableMethod.getSignature(); assert constructorDescriptor != null; int flags = getConstructorAsmFlags(constructorDescriptor); - final MethodVisitor mv = v.newMethod(myClass, flags, constructorMethod.getName(), constructorMethod.getAsmMethod().getDescriptor(), + MethodVisitor mv = v.newMethod(myClass, flags, constructorMethod.getName(), constructorMethod.getAsmMethod().getDescriptor(), constructorMethod.getGenericsSignature(), null); if (state.getClassBuilderMode() != ClassBuilderMode.SIGNATURES) { @@ -1037,7 +1037,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { ConstructorFrameMap frameMap = new ConstructorFrameMap(callableMethod, constructorDescriptor); - final InstructionAdapter iv = new InstructionAdapter(mv); + InstructionAdapter iv = new InstructionAdapter(mv); ExpressionCodegen codegen = new ExpressionCodegen(mv, frameMap, Type.VOID_TYPE, constructorContext, state); JvmClassName classname = JvmClassName.byType(classAsmType); @@ -1053,7 +1053,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } if (hasCapturedThis) { - final Type type = typeMapper + Type type = typeMapper .mapType(enclosingClassDescriptor(bindingContext, descriptor)); String interfaceDesc = type.getDescriptor(); iv.load(0, classAsmType); @@ -1063,11 +1063,11 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { if (closure != null) { int k = hasCapturedThis ? 2 : 1; - final String internalName = typeMapper.mapType(descriptor).getInternalName(); - final ClassifierDescriptor captureReceiver = closure.getCaptureReceiver(); + String internalName = typeMapper.mapType(descriptor).getInternalName(); + ClassifierDescriptor captureReceiver = closure.getCaptureReceiver(); if (captureReceiver != null) { iv.load(0, OBJECT_TYPE); - final Type asmType = typeMapper.mapType(captureReceiver.getDefaultType(), JetTypeMapperMode.IMPL); + Type asmType = typeMapper.mapType(captureReceiver.getDefaultType(), JetTypeMapperMode.IMPL); iv.load(k, asmType); iv.putfield(internalName, CAPTURED_RECEIVER_FIELD, asmType.getDescriptor()); k += asmType.getSize(); @@ -1190,14 +1190,14 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { int n, JetDelegationSpecifier specifier ) { - final JetExpression expression = ((JetDelegatorByExpressionSpecifier) specifier).getDelegateExpression(); + JetExpression expression = ((JetDelegatorByExpressionSpecifier) specifier).getDelegateExpression(); PropertyDescriptor propertyDescriptor = null; if (expression instanceof JetSimpleNameExpression) { - final ResolvedCall call = bindingContext.get(BindingContext.RESOLVED_CALL, expression); + ResolvedCall call = bindingContext.get(BindingContext.RESOLVED_CALL, expression); if (call != null) { - final CallableDescriptor callResultingDescriptor = call.getResultingDescriptor(); + CallableDescriptor callResultingDescriptor = call.getResultingDescriptor(); if (callResultingDescriptor instanceof ValueParameterDescriptor) { - final ValueParameterDescriptor valueParameterDescriptor = (ValueParameterDescriptor) callResultingDescriptor; + ValueParameterDescriptor valueParameterDescriptor = (ValueParameterDescriptor) callResultingDescriptor; // constructor parameter if (valueParameterDescriptor.getContainingDeclaration() instanceof ConstructorDescriptor) { // constructor of my class @@ -1217,7 +1217,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { ClassDescriptor superClassDescriptor = (ClassDescriptor) superType.getConstructor().getDeclarationDescriptor(); assert superClassDescriptor != null; - final Type superTypeAsmType = typeMapper.mapType(superType, JetTypeMapperMode.IMPL); + Type superTypeAsmType = typeMapper.mapType(superType, JetTypeMapperMode.IMPL); StackValue field; if (propertyDescriptor != null && @@ -1245,7 +1245,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } private void lookupConstructorExpressionsInClosureIfPresent(final ConstructorContext constructorContext) { - final JetVisitorVoid visitor = new JetVisitorVoid() { + JetVisitorVoid visitor = new JetVisitorVoid() { @Override public void visitJetElement(JetElement e) { e.acceptChildren(this); @@ -1253,7 +1253,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { @Override public void visitSimpleNameExpression(JetSimpleNameExpression expr) { - final DeclarationDescriptor descriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, expr); + DeclarationDescriptor descriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, expr); if (descriptor instanceof VariableDescriptor && !(descriptor instanceof PropertyDescriptor)) { ConstructorDescriptor constructorDescriptor = (ConstructorDescriptor) constructorContext.getContextDescriptor(); for (ValueParameterDescriptor parameterDescriptor : constructorDescriptor.getValueParameters()) { @@ -1268,7 +1268,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { @Override public void visitThisExpression(JetThisExpression expression) { - final DeclarationDescriptor descriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getInstanceReference()); + DeclarationDescriptor descriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, expression.getInstanceReference()); if (descriptor instanceof ClassDescriptor) { // @todo for now all our classes are inner so no need to lookup this. change it when we have real inners } @@ -1283,14 +1283,14 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { for (JetDeclaration declaration : myClass.getDeclarations()) { if (declaration instanceof JetProperty) { - final JetProperty property = (JetProperty) declaration; - final JetExpression initializer = property.getInitializer(); + JetProperty property = (JetProperty) declaration; + JetExpression initializer = property.getInitializer(); if (initializer != null) { initializer.accept(visitor); } } else if (declaration instanceof JetClassInitializer) { - final JetClassInitializer initializer = (JetClassInitializer) declaration; + JetClassInitializer initializer = (JetClassInitializer) declaration; initializer.accept(visitor); } } @@ -1305,7 +1305,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } else { if (superCall instanceof JetDelegatorToSuperCall) { - final JetValueArgumentList argumentList = ((JetDelegatorToSuperCall) superCall).getValueArgumentList(); + JetValueArgumentList argumentList = ((JetDelegatorToSuperCall) superCall).getValueArgumentList(); if (argumentList != null) { argumentList.accept(visitor); } @@ -1384,7 +1384,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { functionOriginal = typeMapper.mapSignature(fun.getName(), fun.getOriginal()).getAsmMethod(); } - final MethodVisitor mv = v.newMethod(myClass, flags, function.getName(), function.getDescriptor(), null, null); + MethodVisitor mv = v.newMethod(myClass, flags, function.getName(), function.getDescriptor(), null, null); AnnotationCodegen.forMethod(mv, state.getTypeMapper()).genAnnotations(fun); JvmMethodSignature jvmSignature = typeMapper.mapToCallableMethod( @@ -1471,13 +1471,13 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { CallableMethod method = typeMapper.mapToCallableMethod(constructorDescriptor, context.closure); - final ResolvedCall resolvedCall = + ResolvedCall resolvedCall = bindingContext.get(BindingContext.RESOLVED_CALL, ((JetCallElement) superCall).getCalleeExpression()); assert resolvedCall != null; - final ConstructorDescriptor superConstructor = (ConstructorDescriptor) resolvedCall.getResultingDescriptor(); + ConstructorDescriptor superConstructor = (ConstructorDescriptor) resolvedCall.getResultingDescriptor(); //noinspection SuspiciousMethodCalls - final CalculatedClosure closureForSuper = bindingContext.get(CLOSURE, superConstructor.getContainingDeclaration()); + CalculatedClosure closureForSuper = bindingContext.get(CLOSURE, superConstructor.getContainingDeclaration()); CallableMethod superCallable = typeMapper.mapToCallableMethod(superConstructor, closureForSuper); if (closureForSuper != null && closureForSuper.getCaptureThis() != null) { @@ -1500,7 +1500,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } private static int findFirstSuperArgument(CallableMethod method) { - final List types = method.getSignature().getKotlinParameterTypes(); + List types = method.getSignature().getKotlinParameterTypes(); if (types != null) { int i = 0; for (JvmMethodParameterSignature type : types) { @@ -1520,7 +1520,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } else if (declaration instanceof JetEnumEntry) { String name = declaration.getName(); - final String desc = "L" + classAsmType.getInternalName() + ";"; + String desc = "L" + classAsmType.getInternalName() + ";"; v.newField(declaration, ACC_PUBLIC | ACC_ENUM | ACC_STATIC | ACC_FINAL, name, desc, null, null); if (myEnumConstants.isEmpty()) { staticInitializerChunks.add(new CodeChunk() { @@ -1564,7 +1564,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { assert classDescriptor != null; String implClass = typeMapper.mapType(classDescriptor.getDefaultType(), JetTypeMapperMode.IMPL).getInternalName(); - final List delegationSpecifiers = enumConstant.getDelegationSpecifiers(); + List delegationSpecifiers = enumConstant.getDelegationSpecifiers(); if (delegationSpecifiers.size() > 1) { throw new UnsupportedOperationException("multiple delegation specifiers for enum constant not supported"); } @@ -1576,9 +1576,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { iv.iconst(ordinal); if (delegationSpecifiers.size() == 1 && !enumEntryNeedSubclass(state.getBindingContext(), enumConstant)) { - final JetDelegationSpecifier specifier = delegationSpecifiers.get(0); + JetDelegationSpecifier specifier = delegationSpecifiers.get(0); if (specifier instanceof JetDelegatorToSuperCall) { - final JetDelegatorToSuperCall superCall = (JetDelegatorToSuperCall) specifier; + JetDelegatorToSuperCall superCall = (JetDelegatorToSuperCall) specifier; ConstructorDescriptor constructorDescriptor = (ConstructorDescriptor) bindingContext .get(BindingContext.REFERENCE_TARGET, superCall.getCalleeExpression().getConstructorReferenceExpression()); assert constructorDescriptor != null; @@ -1607,13 +1607,13 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { JetTypeMapper typeMapper = state.getTypeMapper(); for (JetDeclaration declaration : declarations) { if (declaration instanceof JetProperty) { - final PropertyDescriptor propertyDescriptor = (PropertyDescriptor) bindingContext.get(BindingContext.VARIABLE, declaration); + PropertyDescriptor propertyDescriptor = (PropertyDescriptor) bindingContext.get(BindingContext.VARIABLE, declaration); assert propertyDescriptor != null; if (Boolean.TRUE.equals(bindingContext.get(BindingContext.BACKING_FIELD_REQUIRED, propertyDescriptor))) { - final JetExpression initializer = ((JetProperty) declaration).getInitializer(); + JetExpression initializer = ((JetProperty) declaration).getInitializer(); if (initializer != null) { CompileTimeConstant compileTimeValue = bindingContext.get(BindingContext.COMPILE_TIME_VALUE, initializer); - final JetType jetType = propertyDescriptor.getType(); + JetType jetType = propertyDescriptor.getType(); if (compileTimeValue != null) { Object value = compileTimeValue.getValue(); Type type = typeMapper.mapType(jetType); @@ -1677,8 +1677,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } protected void generateDelegates(ClassDescriptor toClass, StackValue field) { - final FunctionCodegen functionCodegen = new FunctionCodegen(context, v, state); - final PropertyCodegen propertyCodegen = new PropertyCodegen(context, v, functionCodegen); + FunctionCodegen functionCodegen = new FunctionCodegen(context, v, state); + PropertyCodegen propertyCodegen = new PropertyCodegen(context, v, functionCodegen); for (DeclarationDescriptor declaration : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) { if (declaration instanceof CallableMemberDescriptor) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java index f48ea7fd23d..37c5001b953 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java @@ -122,7 +122,7 @@ public class MemberCodegen extends GenerationStateAware { ClassBuilder classBuilder = state.getFactory().forClassImplementation(descriptor, aClass.getContainingFile()); - final CodegenContext contextForInners = context.intoClass(descriptor, OwnerKind.IMPLEMENTATION, state); + CodegenContext contextForInners = context.intoClass(descriptor, OwnerKind.IMPLEMENTATION, state); if (state.getClassBuilderMode() == ClassBuilderMode.SIGNATURES) { // Outer class implementation must happen prior inner classes so we get proper scoping tree in JetLightClass's delegate diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java index dbb1483264c..0de2b2af293 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java @@ -148,12 +148,12 @@ public class NamespaceCodegen extends MemberCodegen { for (JetDeclaration declaration : file.getDeclarations()) { if (declaration instanceof JetNamedFunction || declaration instanceof JetProperty) { { - final CodegenContext context = + CodegenContext context = CodegenContext.STATIC.intoNamespace(descriptor); genFunctionOrProperty(context, (JetTypeParameterListOwner) declaration, builder); } { - final CodegenContext context = + CodegenContext context = CodegenContext.STATIC.intoNamespacePart(className, descriptor); genFunctionOrProperty(context, (JetTypeParameterListOwner) declaration, v.getClassBuilder()); } @@ -216,9 +216,9 @@ public class NamespaceCodegen extends MemberCodegen { for (JetDeclaration declaration : file.getDeclarations()) { if (declaration instanceof JetProperty) { - final JetExpression initializer = ((JetProperty) declaration).getInitializer(); + JetExpression initializer = ((JetProperty) declaration).getInitializer(); if (initializer != null && !(initializer instanceof JetConstantExpression)) { - final PropertyDescriptor descriptor = + PropertyDescriptor descriptor = (PropertyDescriptor) state.getBindingContext().get(BindingContext.VARIABLE, declaration); assert descriptor != null; codegen.genToJVMStack(initializer); @@ -238,7 +238,7 @@ public class NamespaceCodegen extends MemberCodegen { for (JetFile file : files) { for (JetDeclaration declaration : file.getDeclarations()) { if (declaration instanceof JetProperty) { - final JetExpression initializer = ((JetProperty) declaration).getInitializer(); + JetExpression initializer = ((JetProperty) declaration).getInitializer(); if (initializer != null && !(initializer instanceof JetConstantExpression)) { return true; } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java index 984d06a03f0..315547ff1c6 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java @@ -94,7 +94,7 @@ public class PropertyCodegen extends GenerationStateAware { } Object value = null; - final JetExpression initializer = p instanceof JetProperty ? ((JetProperty) p).getInitializer() : null; + JetExpression initializer = p instanceof JetProperty ? ((JetProperty) p).getInitializer() : null; if (initializer != null) { if (initializer instanceof JetConstantExpression) { CompileTimeConstant compileTimeValue = bindingContext.get(BindingContext.COMPILE_TIME_VALUE, initializer); @@ -177,8 +177,8 @@ public class PropertyCodegen extends GenerationStateAware { } JvmPropertyAccessorSignature signature = typeMapper.mapGetterSignature(propertyDescriptor, kind); - final JvmMethodSignature jvmMethodSignature = signature.getJvmMethodSignature(); - final String descriptor = jvmMethodSignature.getAsmMethod().getDescriptor(); + JvmMethodSignature jvmMethodSignature = signature.getJvmMethodSignature(); + String descriptor = jvmMethodSignature.getAsmMethod().getDescriptor(); String getterName = getterName(propertyDescriptor.getName()); MethodVisitor mv = v.newMethod(origin, flags, getterName, descriptor, jvmMethodSignature.getGenericsSignature(), null); PropertyGetterDescriptor getter = propertyDescriptor.getGetter(); @@ -208,7 +208,7 @@ public class PropertyCodegen extends GenerationStateAware { if (kind != OwnerKind.NAMESPACE) { iv.load(0, OBJECT_TYPE); } - final Type type = typeMapper.mapType(propertyDescriptor); + Type type = typeMapper.mapType(propertyDescriptor); iv.visitFieldInsn( kind == OwnerKind.NAMESPACE ? GETSTATIC : GETFIELD, @@ -261,8 +261,8 @@ public class PropertyCodegen extends GenerationStateAware { JvmPropertyAccessorSignature signature = typeMapper.mapSetterSignature(propertyDescriptor, kind); assert true; - final JvmMethodSignature jvmMethodSignature = signature.getJvmMethodSignature(); - final String descriptor = jvmMethodSignature.getAsmMethod().getDescriptor(); + JvmMethodSignature jvmMethodSignature = signature.getJvmMethodSignature(); + String descriptor = jvmMethodSignature.getAsmMethod().getDescriptor(); MethodVisitor mv = v.newMethod(origin, flags, setterName(propertyDescriptor.getName()), descriptor, jvmMethodSignature.getGenericsSignature(), null); PropertySetterDescriptor setter = propertyDescriptor.getSetter(); assert setter != null; @@ -284,7 +284,7 @@ public class PropertyCodegen extends GenerationStateAware { } else { InstructionAdapter iv = new InstructionAdapter(mv); - final Type type = typeMapper.mapType(propertyDescriptor); + Type type = typeMapper.mapType(propertyDescriptor); int paramCode = 0; if (kind != OwnerKind.NAMESPACE) { iv.load(0, OBJECT_TYPE); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java index a56fe6ffb33..aa3fc92b067 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/StackValue.java @@ -155,7 +155,7 @@ public abstract class StackValue { return new Expression(type, expression, generator); } - private static void box(final Type type, final Type toType, InstructionAdapter v) { + private static void box(Type type, Type toType, InstructionAdapter v) { // TODO handle toType correctly if (type == Type.INT_TYPE || (isIntPrimitive(type) && toType.getInternalName().equals("java/lang/Integer"))) { v.invokestatic("java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;"); @@ -183,7 +183,7 @@ public abstract class StackValue { } } - private static void unbox(final Type type, InstructionAdapter v) { + private static void unbox(Type type, InstructionAdapter v) { if (type == Type.INT_TYPE) { v.invokevirtual("java/lang/Number", "intValue", "()I"); } @@ -1142,7 +1142,7 @@ public abstract class StackValue { @Override public void put(Type type, InstructionAdapter v) { - final StackValue stackValue = codegen.generateThisOrOuter(descriptor, isSuper); + StackValue stackValue = codegen.generateThisOrOuter(descriptor, isSuper); stackValue.put(coerceType ? type : stackValue.type, v); } } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java index 571d4076a8f..ccd7267c780 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenAnnotatingVisitor.java @@ -111,7 +111,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { public void visitJetFile(JetFile file) { if (file.isScript()) { //noinspection ConstantConditions - final ClassDescriptor classDescriptor = + ClassDescriptor classDescriptor = bindingContext.get(CLASS_FOR_FUNCTION, bindingContext.get(SCRIPT, file.getScript())); classStack.push(classDescriptor); //noinspection ConstantConditions @@ -132,7 +132,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { ClassDescriptor descriptor = bindingContext.get(CLASS, enumEntry); assert descriptor != null; - final boolean trivial = enumEntry.getDeclarations().isEmpty(); + boolean trivial = enumEntry.getDeclarations().isEmpty(); if (!trivial) { bindingTrace.record(ENUM_ENTRY_CLASS_NEED_SUBCLASS, descriptor); super.visitEnumEntry(enumEntry); @@ -211,7 +211,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { return; } - final String name = inventAnonymousClassName(expression.getObjectDeclaration()); + String name = inventAnonymousClassName(expression.getObjectDeclaration()); recordClosure(bindingTrace, expression.getObjectDeclaration(), classDescriptor, peekFromStack(classStack), JvmClassName.byInternalName(name), false); classStack.push(classDescriptor); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java index 8687f3b39d3..cbb0fb3df9f 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/binding/CodegenBinding.java @@ -75,7 +75,7 @@ public class CodegenBinding { @NotNull public static JvmClassName classNameForScriptDescriptor(BindingContext bindingContext, @NotNull ScriptDescriptor scriptDescriptor) { - final ClassDescriptor classDescriptor = bindingContext.get(CLASS_FOR_FUNCTION, scriptDescriptor); + ClassDescriptor classDescriptor = bindingContext.get(CLASS_FOR_FUNCTION, scriptDescriptor); //noinspection ConstantConditions return bindingContext.get(FQN, classDescriptor); } @@ -90,7 +90,7 @@ public class CodegenBinding { } public static ClassDescriptor enclosingClassDescriptor(BindingContext bindingContext, ClassDescriptor descriptor) { - final CalculatedClosure closure = bindingContext.get(CLOSURE, descriptor); + CalculatedClosure closure = bindingContext.get(CLOSURE, descriptor); return closure == null ? null : closure.getEnclosingClass(); } @@ -159,7 +159,7 @@ public class CodegenBinding { } public static boolean isSingleton(BindingContext bindingContext, @NotNull ClassDescriptor classDescriptor) { - final ClassKind kind = classDescriptor.getKind(); + ClassKind kind = classDescriptor.getKind(); if (kind == ClassKind.CLASS_OBJECT) { return true; } @@ -183,7 +183,7 @@ public class CodegenBinding { JvmClassName name, boolean functionLiteral ) { - final JetDelegatorToSuperCall superCall = findSuperCall(bindingTrace.getBindingContext(), element); + JetDelegatorToSuperCall superCall = findSuperCall(bindingTrace.getBindingContext(), element); CallableDescriptor enclosingReceiver = null; if (classDescriptor.getContainingDeclaration() instanceof CallableDescriptor) { @@ -197,7 +197,7 @@ public class CodegenBinding { } } - final MutableClosure closure = new MutableClosure(superCall, enclosing, enclosingReceiver); + MutableClosure closure = new MutableClosure(superCall, enclosing, enclosingReceiver); assert PsiCodegenPredictor.checkPredictedNameFromPsi(bindingTrace, classDescriptor, name); bindingTrace.record(FQN, classDescriptor, name); @@ -238,19 +238,19 @@ public class CodegenBinding { // todo: we use Set and add given files but ignoring other scripts because something non-clear kept in binding // for scripts especially in case of REPL - final HashSet names = new HashSet(); + HashSet names = new HashSet(); for (JetFile file : files) { if (!file.isScript()) { names.add(JetPsiUtil.getFQName(file)); } } - final HashSet answer = new HashSet(); + HashSet answer = new HashSet(); answer.addAll(files); for (FqName name : names) { - final NamespaceDescriptor namespaceDescriptor = bindingContext.get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, name); - final Collection jetFiles = bindingContext.get(NAMESPACE_TO_FILES, namespaceDescriptor); + NamespaceDescriptor namespaceDescriptor = bindingContext.get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, name); + Collection jetFiles = bindingContext.get(NAMESPACE_TO_FILES, namespaceDescriptor); if (jetFiles != null) answer.addAll(jetFiles); } @@ -274,8 +274,8 @@ public class CodegenBinding { } public static boolean isMultiFileNamespace(BindingContext bindingContext, FqName fqName) { - final NamespaceDescriptor namespaceDescriptor = bindingContext.get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, fqName); - final Collection jetFiles = bindingContext.get(NAMESPACE_TO_FILES, namespaceDescriptor); + NamespaceDescriptor namespaceDescriptor = bindingContext.get(BindingContext.FQNAME_TO_NAMESPACE_DESCRIPTOR, fqName); + Collection jetFiles = bindingContext.get(NAMESPACE_TO_FILES, namespaceDescriptor); return jetFiles != null && jetFiles.size() > 1; } @@ -306,7 +306,7 @@ public class CodegenBinding { public static boolean isLocalNamedFun(BindingContext bindingContext, DeclarationDescriptor fd) { PsiElement psiElement = descriptorToDeclaration(bindingContext, fd); if (psiElement instanceof JetNamedFunction) { - final DeclarationDescriptor declaration = fd.getContainingDeclaration(); + DeclarationDescriptor declaration = fd.getContainingDeclaration(); return declaration instanceof FunctionDescriptor || declaration instanceof PropertyDescriptor; } return false; @@ -385,7 +385,7 @@ public class CodegenBinding { public static boolean hasThis0(BindingContext bindingContext, ClassDescriptor classDescriptor) { //noinspection SuspiciousMethodCalls - final CalculatedClosure closure = bindingContext.get(CLOSURE, classDescriptor); + CalculatedClosure closure = bindingContext.get(CLOSURE, classDescriptor); return closure != null && closure.getCaptureThis() != null; } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java index 24e416846e6..32b6a2d3168 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java @@ -105,7 +105,7 @@ public abstract class CodegenContext { @Nullable public final CallableDescriptor getCallableDescriptorWithReceiver() { if (contextDescriptor instanceof CallableDescriptor) { - final CallableDescriptor callableDescriptor = (CallableDescriptor) getContextDescriptor(); + CallableDescriptor callableDescriptor = (CallableDescriptor) getContextDescriptor(); return callableDescriptor.getReceiverParameter() != null ? callableDescriptor : null; } return null; @@ -151,7 +151,7 @@ public abstract class CodegenContext { ClassDescriptor descriptor, ExpressionCodegen expressionCodegen ) { - final JetTypeMapper typeMapper = expressionCodegen.getState().getTypeMapper(); + JetTypeMapper typeMapper = expressionCodegen.getState().getTypeMapper(); return new AnonymousClassContext(typeMapper, descriptor, OwnerKind.IMPLEMENTATION, this, expressionCodegen); } @@ -177,7 +177,7 @@ public abstract class CodegenContext { FunctionDescriptor funDescriptor, ExpressionCodegen expressionCodegen ) { - final JetTypeMapper typeMapper = expressionCodegen.getState().getTypeMapper(); + JetTypeMapper typeMapper = expressionCodegen.getState().getTypeMapper(); return new ClosureContext(typeMapper, funDescriptor, typeMapper.getBindingContext().get(CLASS_FOR_FUNCTION, funDescriptor), this, expressionCodegen); @@ -275,7 +275,7 @@ public abstract class CodegenContext { } public StackValue lookupInContext(DeclarationDescriptor d, @Nullable StackValue result, GenerationState state, boolean ignoreNoOuter) { - final MutableClosure top = closure; + MutableClosure top = closure; if (top != null) { EnclosedValueDescriptor answer = closure.getCaptureVariables().get(d); if (answer != null) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java index 98984c97a39..bb8f0d27fa4 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/ConstructorContext.java @@ -33,7 +33,7 @@ public class ConstructorContext extends MethodContext { ) { super(contextDescriptor, kind, parent); - final ClassDescriptor type = getEnclosingClass(); + ClassDescriptor type = getEnclosingClass(); outerExpression = type != null ? local1 : null; } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/EnclosedValueDescriptor.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/EnclosedValueDescriptor.java index ae8b84232f2..26f2a0dc9ff 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/EnclosedValueDescriptor.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/EnclosedValueDescriptor.java @@ -46,7 +46,7 @@ public final class EnclosedValueDescriptor { } public StackValue getOuterValue(ExpressionCodegen expressionCodegen) { - final GenerationState state = expressionCodegen.getState(); + GenerationState state = expressionCodegen.getState(); for (LocalLookup.LocalLookupCase aCase : LocalLookup.LocalLookupCase.values()) { if (aCase.isCase(descriptor, state)) { return aCase.outerValue(this, expressionCodegen); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java b/compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java index ec591ef393c..c3c04f79e01 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/context/LocalLookup.java @@ -50,14 +50,14 @@ public interface LocalLookup { ) { VariableDescriptor vd = (VariableDescriptor) d; - final boolean idx = localLookup != null && localLookup.lookupLocal(vd); + boolean idx = localLookup != null && localLookup.lookupLocal(vd); if (!idx) return null; - final Type sharedVarType = state.getTypeMapper().getSharedVarType(vd); + Type sharedVarType = state.getTypeMapper().getSharedVarType(vd); Type localType = state.getTypeMapper().mapType(vd); - final Type type = sharedVarType != null ? sharedVarType : localType; + Type type = sharedVarType != null ? sharedVarType : localType; - final String fieldName = "$" + vd.getName(); + String fieldName = "$" + vd.getName(); StackValue innerValue = sharedVarType != null ? StackValue.fieldForSharedVar(localType, className, fieldName) : StackValue.field(type, className, fieldName, false); @@ -85,14 +85,14 @@ public interface LocalLookup { ) { FunctionDescriptor vd = (FunctionDescriptor) d; - final boolean idx = localLookup.lookupLocal(vd); + boolean idx = localLookup.lookupLocal(vd); if (!idx) return null; JetElement expression = (JetElement) callableDescriptorToDeclaration(state.getBindingContext(), vd); JvmClassName cn = classNameForAnonymousClass(state.getBindingContext(), expression); Type localType = cn.getAsmType(); - final String fieldName = "$" + vd.getName(); + String fieldName = "$" + vd.getName(); StackValue innerValue = StackValue.field(localType, className, fieldName, false); closure.recordField(fieldName, localType); @@ -117,7 +117,7 @@ public interface LocalLookup { ) { if (closure.getEnclosingReceiverDescriptor() != d) return null; - final JetType receiverType = ((CallableDescriptor) d).getReceiverParameter().getType(); + JetType receiverType = ((CallableDescriptor) d).getReceiverParameter().getType(); Type type = state.getTypeMapper().mapType(receiverType); StackValue innerValue = StackValue.field(type, className, CAPTURED_RECEIVER_FIELD, false); closure.setCaptureReceiver(); @@ -143,7 +143,7 @@ public interface LocalLookup { ); public StackValue outerValue(EnclosedValueDescriptor d, ExpressionCodegen expressionCodegen) { - final int idx = expressionCodegen.lookupLocalIndex(d.getDescriptor()); + int idx = expressionCodegen.lookupLocalIndex(d.getDescriptor()); assert idx != -1; return StackValue.local(idx, d.getType()); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Increment.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Increment.java index abb864b30f4..89ecc7e31c5 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Increment.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Increment.java @@ -58,7 +58,7 @@ public class Increment implements IntrinsicMethod { operand = ((JetParenthesizedExpression) operand).getExpression(); } if (operand instanceof JetReferenceExpression) { - final int index = codegen.indexOfLocal((JetReferenceExpression) operand); + int index = codegen.indexOfLocal((JetReferenceExpression) operand); if (index >= 0 && isIntPrimitive(expectedType)) { return StackValue.preIncrement(index, myDelta); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Not.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Not.java index bb673153615..012ee122f75 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Not.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/Not.java @@ -38,7 +38,7 @@ public class Not implements IntrinsicMethod { StackValue receiver, @NotNull GenerationState state ) { - final StackValue stackValue; + StackValue stackValue; if (arguments.size() == 1) { stackValue = codegen.gen(arguments.get(0)); } diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/RangeTo.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/RangeTo.java index 634b9b78a2c..63ac5769416 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/RangeTo.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/RangeTo.java @@ -44,8 +44,8 @@ public class RangeTo implements IntrinsicMethod { @NotNull GenerationState state ) { if (arguments.size() == 1) { - final Type leftType = receiver.type; - final Type rightType = codegen.expressionType(arguments.get(0)); + Type leftType = receiver.type; + Type rightType = codegen.expressionType(arguments.get(0)); receiver.put(leftType, v); codegen.gen(arguments.get(0), rightType); v.invokestatic("jet/runtime/Ranges", "rangeTo", @@ -54,8 +54,8 @@ public class RangeTo implements IntrinsicMethod { } else { JetBinaryExpression expression = (JetBinaryExpression) element; - final Type leftType = codegen.expressionType(expression.getLeft()); - final Type rightType = codegen.expressionType(expression.getRight()); + Type leftType = codegen.expressionType(expression.getLeft()); + Type rightType = codegen.expressionType(expression.getRight()); // if (JetTypeMapper.isIntPrimitive(leftType)) { codegen.gen(expression.getLeft(), leftType); codegen.gen(expression.getRight(), rightType); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java b/compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java index d2b51198033..1619eac40b6 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/signature/BothSignatureWriter.java @@ -271,14 +271,14 @@ public class BothSignatureWriter { pop(); } - public void writeTypeVariable(final Name name, boolean nullable, Type asmType) { + public void writeTypeVariable(Name name, boolean nullable, Type asmType) { signatureVisitor().visitTypeVariable(name.getName()); jetSignatureWriter.visitTypeVariable(name.getName(), nullable); generic = true; writeAsmType0(asmType); } - public void writeFormalTypeParameter(final String name, Variance variance, boolean reified) { + public void writeFormalTypeParameter(String name, Variance variance, boolean reified) { checkTopLevel(); signatureVisitor().visitFormalTypeParameter(name); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java index f12b844a3b0..079194f1435 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/JetTypeMapper.java @@ -169,12 +169,12 @@ public class JetTypeMapper extends BindingTraceAware { } @NotNull - public Type mapReturnType(@NotNull final JetType jetType) { + public Type mapReturnType(@NotNull JetType jetType) { return mapReturnType(jetType, null); } @NotNull - private Type mapReturnType(@NotNull final JetType jetType, @Nullable BothSignatureWriter signatureVisitor) { + private Type mapReturnType(@NotNull JetType jetType, @Nullable BothSignatureWriter signatureVisitor) { if (jetType.equals(KotlinBuiltIns.getInstance().getUnitType())) { if (signatureVisitor != null) { signatureVisitor.writeAsmType(Type.VOID_TYPE, false); @@ -197,22 +197,22 @@ public class JetTypeMapper extends BindingTraceAware { } @NotNull - public Type mapType(@NotNull final JetType jetType, @NotNull JetTypeMapperMode kind) { + public Type mapType(@NotNull JetType jetType, @NotNull JetTypeMapperMode kind) { return mapType(jetType, null, kind); } @NotNull - public Type mapType(@NotNull final JetType jetType) { + public Type mapType(@NotNull JetType jetType) { return mapType(jetType, null, JetTypeMapperMode.VALUE); } @NotNull - public Type mapType(@NotNull final VariableDescriptor variableDescriptor) { + public Type mapType(@NotNull VariableDescriptor variableDescriptor) { return mapType(variableDescriptor.getType(), null, JetTypeMapperMode.VALUE); } @NotNull - public Type mapType(@NotNull final ClassifierDescriptor classifierDescriptor) { + public Type mapType(@NotNull ClassifierDescriptor classifierDescriptor) { return mapType(classifierDescriptor.getDefaultType()); } @@ -260,7 +260,7 @@ public class JetTypeMapper extends BindingTraceAware { } } - final TypeConstructor constructor = jetType.getConstructor(); + TypeConstructor constructor = jetType.getConstructor(); if (constructor instanceof IntersectionTypeConstructor) { jetType = CommonSupertypes.commonSupertype(new ArrayList(constructor.getSupertypes())); } @@ -452,7 +452,7 @@ public class JetTypeMapper extends BindingTraceAware { boolean isInsideModule, OwnerKind kind ) { - final DeclarationDescriptor functionParent = functionDescriptor.getOriginal().getContainingDeclaration(); + DeclarationDescriptor functionParent = functionDescriptor.getOriginal().getContainingDeclaration(); functionDescriptor = unwrapFakeOverride(functionDescriptor); @@ -575,8 +575,8 @@ public class JetTypeMapper extends BindingTraceAware { writeFormalTypeParameters(f.getTypeParameters(), signatureVisitor); - final JetType receiverType = DescriptorUtils.getReceiverParameterType(f.getReceiverParameter()); - final List parameters = f.getValueParameters(); + JetType receiverType = DescriptorUtils.getReceiverParameterType(f.getReceiverParameter()); + List parameters = f.getValueParameters(); signatureVisitor.writeParametersStart(); @@ -686,7 +686,7 @@ public class JetTypeMapper extends BindingTraceAware { } public JvmMethodSignature mapSignature(Name name, FunctionDescriptor f) { - final ReceiverParameterDescriptor receiver = f.getReceiverParameter(); + ReceiverParameterDescriptor receiver = f.getReceiverParameter(); BothSignatureWriter signatureWriter = new BothSignatureWriter(BothSignatureWriter.Mode.METHOD, false); @@ -696,7 +696,7 @@ public class JetTypeMapper extends BindingTraceAware { writeThisForAccessorIfNeeded(f, signatureWriter); - final List parameters = f.getValueParameters(); + List parameters = f.getValueParameters(); writeReceiverIfNeeded(receiver, signatureWriter); for (ValueParameterDescriptor parameter : parameters) { writeParameter(signatureWriter, parameter.getType()); @@ -723,7 +723,7 @@ public class JetTypeMapper extends BindingTraceAware { public JvmPropertyAccessorSignature mapGetterSignature(PropertyDescriptor descriptor, OwnerKind kind) { - final DeclarationDescriptor parentDescriptor = descriptor.getContainingDeclaration(); + DeclarationDescriptor parentDescriptor = descriptor.getContainingDeclaration(); boolean isAnnotation = parentDescriptor instanceof ClassDescriptor && ((ClassDescriptor) parentDescriptor).getKind() == ClassKind.ANNOTATION_CLASS; String name = isAnnotation ? descriptor.getName().getName() : PropertyCodegen.getterName(descriptor.getName()); @@ -821,14 +821,14 @@ public class JetTypeMapper extends BindingTraceAware { signatureWriter.writeParametersStart(); ClassDescriptor containingDeclaration = descriptor.getContainingDeclaration(); - final ClassDescriptor captureThis = closure != null ? closure.getCaptureThis() : null; + ClassDescriptor captureThis = closure != null ? closure.getCaptureThis() : null; if (captureThis != null) { signatureWriter.writeParameterType(JvmMethodParameterKind.OUTER); mapType(captureThis.getDefaultType(), signatureWriter, JetTypeMapperMode.VALUE); signatureWriter.writeParameterTypeEnd(); } - final ClassifierDescriptor captureReceiver = closure != null ? closure.getCaptureReceiver() : null; + ClassifierDescriptor captureReceiver = closure != null ? closure.getCaptureReceiver() : null; if (captureReceiver != null) { signatureWriter.writeParameterType(JvmMethodParameterKind.RECEIVER); mapType(captureReceiver.getDefaultType(), signatureWriter, JetTypeMapperMode.VALUE); @@ -858,7 +858,7 @@ public class JetTypeMapper extends BindingTraceAware { } } - final JetDelegatorToSuperCall superCall = closure.getSuperCall(); + JetDelegatorToSuperCall superCall = closure.getSuperCall(); if (superCall != null) { DeclarationDescriptor superDescriptor = bindingContext.get(BindingContext.REFERENCE_TARGET, superCall @@ -866,12 +866,12 @@ public class JetTypeMapper extends BindingTraceAware { .getConstructorReferenceExpression()); if(superDescriptor instanceof ConstructorDescriptor) { - final ConstructorDescriptor superConstructor = (ConstructorDescriptor) superDescriptor; + ConstructorDescriptor superConstructor = (ConstructorDescriptor) superDescriptor; if (isObjectLiteral(bindingContext, descriptor.getContainingDeclaration())) { //noinspection SuspiciousMethodCalls CallableMethod superCallable = mapToCallableMethod(superConstructor); - final List types = superCallable.getSignature().getKotlinParameterTypes(); + List types = superCallable.getSignature().getKotlinParameterTypes(); if (types != null) { for (JvmMethodParameterSignature type : types) { signatureWriter.writeParameterType(JvmMethodParameterKind.SUPER_CALL_PARAM); @@ -905,7 +905,7 @@ public class JetTypeMapper extends BindingTraceAware { for (ScriptDescriptor importedScript : importedScripts) { signatureWriter.writeParameterType(JvmMethodParameterKind.VALUE); - final ClassDescriptor descriptor = bindingContext.get(CLASS_FOR_FUNCTION, importedScript); + ClassDescriptor descriptor = bindingContext.get(CLASS_FOR_FUNCTION, importedScript); assert descriptor != null; mapType(descriptor.getDefaultType(), signatureWriter, JetTypeMapperMode.VALUE); signatureWriter.writeParameterTypeEnd(); @@ -927,7 +927,7 @@ public class JetTypeMapper extends BindingTraceAware { } public CallableMethod mapToCallableMethod(ConstructorDescriptor descriptor, CalculatedClosure closure) { - final JvmMethodSignature method = mapConstructorSignature(descriptor, closure); + JvmMethodSignature method = mapConstructorSignature(descriptor, closure); JetType defaultType = descriptor.getContainingDeclaration().getDefaultType(); Type mapped = mapType(defaultType, JetTypeMapperMode.IMPL); if (mapped.getSort() != Type.OBJECT) { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java index efa60eddc5a..5d944769acb 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java @@ -78,7 +78,7 @@ public class K2JVMCompiler extends CLICompiler { return INTERNAL_ERROR; } - final List argumentsSourceDirs = arguments.getSourceDirs(); + List argumentsSourceDirs = arguments.getSourceDirs(); if (!arguments.script && arguments.module == null && arguments.src == null && diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java index e94220302f1..e8f0d252ea9 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -141,7 +141,7 @@ public class CompileEnvironmentUtil { } try { Class namespaceClass = loader.loadClass(PackageClassUtils.getPackageClassName(FqName.ROOT)); - final Method method = namespaceClass.getDeclaredMethod("project"); + Method method = namespaceClass.getDeclaredMethod("project"); if (method == null) { throw new CompileEnvironmentException("Module script " + moduleFile + " must define project() function"); } @@ -162,10 +162,10 @@ public class CompileEnvironmentUtil { } // TODO: includeRuntime should be not a flag but a path to runtime - public static void writeToJar(ClassFileFactory factory, final OutputStream fos, @Nullable FqName mainClass, boolean includeRuntime) { + public static void writeToJar(ClassFileFactory factory, OutputStream fos, @Nullable FqName mainClass, boolean includeRuntime) { try { Manifest manifest = new Manifest(); - final Attributes mainAttributes = manifest.getMainAttributes(); + Attributes mainAttributes = manifest.getMainAttributes(); mainAttributes.putValue("Manifest-Version", "1.0"); mainAttributes.putValue("Created-By", "JetBrains Kotlin"); if (mainClass != null) { @@ -193,7 +193,7 @@ public class CompileEnvironmentUtil { @Override public boolean process(File file) { if (file.isDirectory()) return true; - final String relativePath = FileUtil.getRelativePath(unpackedRuntimePath, file); + String relativePath = FileUtil.getRelativePath(unpackedRuntimePath, file); try { stream.putNextEntry(new JarEntry(FileUtil.toSystemIndependentName(relativePath))); FileInputStream fis = new FileInputStream(file); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java index 7a1df59b6ea..1cea16372d7 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java @@ -198,7 +198,7 @@ public class JetCoreEnvironment { projectEnvironment.addJarToClassPath(path); } else { - final VirtualFile root = applicationEnvironment.getLocalFileSystem().findFileByPath(path.getAbsolutePath()); + VirtualFile root = applicationEnvironment.getLocalFileSystem().findFileByPath(path.getAbsolutePath()); if (root == null) { report(WARNING, "Classpath entry points to a non-existent location: " + path); return; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index e896ccbe423..5c998bdfdbe 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -332,7 +332,7 @@ public class KotlinToJVMBytecodeCompiler { @NotNull private static GenerationState generate( - final JetCoreEnvironment environment, + JetCoreEnvironment environment, AnalyzeExhaust exhaust, boolean stubs) { Project project = environment.getProject(); @@ -373,7 +373,7 @@ public class KotlinToJVMBytecodeCompiler { @NotNull String scriptPath, @Nullable List scriptParameters, @Nullable List scriptDefinitions) { - final MessageRenderer messageRenderer = MessageRenderer.PLAIN; + MessageRenderer messageRenderer = MessageRenderer.PLAIN; GroupingMessageCollector messageCollector = new GroupingMessageCollector(new PrintingMessageCollector(System.err, messageRenderer, false)); Disposable rootDisposable = CompileEnvironmentUtil.createMockDisposable(); try { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java index e3643b4248a..97c436f9a93 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java @@ -269,7 +269,7 @@ public class ReplInterpreter { @Nullable private ScriptDescriptor doAnalyze(@NotNull JetFile psiFile, @NotNull MessageCollector messageCollector) { - final WritableScope scope = new WritableScopeImpl( + WritableScope scope = new WritableScopeImpl( JetScope.EMPTY, module, new TraceBasedRedeclarationHandler(trace), "Root scope in analyzeNamespace"); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java index 4012bf17a9a..51e41f50798 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java @@ -81,7 +81,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { @NotNull @Override - public ResolveSession getLazyResolveSession(@NotNull final Project fileProject, @NotNull Collection files) { + public ResolveSession getLazyResolveSession(@NotNull Project fileProject, @NotNull Collection files) { ModuleDescriptor javaModule = new ModuleDescriptor(Name.special("")); BindingTraceContext javaResolverTrace = new BindingTraceContext(); @@ -91,7 +91,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { // TODO: Replace with stub declaration provider LockBasedStorageManager storageManager = new LockBasedStorageManager(); - final FileBasedDeclarationProviderFactory declarationProviderFactory = new FileBasedDeclarationProviderFactory(storageManager, files, new Predicate() { + FileBasedDeclarationProviderFactory declarationProviderFactory = new FileBasedDeclarationProviderFactory(storageManager, files, new Predicate() { @Override public boolean apply(FqName fqName) { return psiClassFinder.findPsiPackage(fqName) != null || new FqName("jet").equals(fqName); @@ -199,7 +199,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade { Predicate filesToAnalyzeCompletely, boolean storeContextForBodiesResolve ) { - final ModuleDescriptor owner = new ModuleDescriptor(Name.special("")); + ModuleDescriptor owner = new ModuleDescriptor(Name.special("")); TopDownAnalysisParameters topDownAnalysisParameters = new TopDownAnalysisParameters( filesToAnalyzeCompletely, false, false, scriptParameters); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java index 116b2e4c73c..05885ca8f89 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeKotlinHacks.java @@ -82,7 +82,7 @@ public class JavaPsiFacadeKotlinHacks { return psiPackage; } - public PsiClass findClass(@NotNull final String qualifiedName, @NotNull GlobalSearchScope scope) { + public PsiClass findClass(@NotNull String qualifiedName, @NotNull GlobalSearchScope scope) { ProgressIndicatorProvider.checkCanceled(); // We hope this method is being called often enough to cancel daemon processes smoothly PsiClass aClass = javaFileManager.findClass(qualifiedName, scope); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java index 925de6daf4e..99b75d91ffa 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java @@ -55,7 +55,7 @@ public class JavaTypeTransformer { } @NotNull - private TypeProjection transformToTypeProjection(@NotNull final PsiType javaType, + private TypeProjection transformToTypeProjection(@NotNull PsiType javaType, @NotNull final TypeParameterDescriptor typeParameterDescriptor, @NotNull final TypeVariableResolver typeVariableByPsiResolver, @NotNull final TypeUsage howThisTypeIsUsed @@ -102,7 +102,7 @@ public class JavaTypeTransformer { @NotNull public JetType transformToType(@NotNull PsiType javaType, - @NotNull final TypeVariableResolver typeVariableResolver) { + @NotNull TypeVariableResolver typeVariableResolver) { return transformToType(javaType, TypeUsage.MEMBER_SIGNATURE_INVARIANT, typeVariableResolver); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java index 01857896fe1..c30acc3c4d0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java @@ -159,7 +159,7 @@ public class SignaturesPropagationData { List resultParameters = Lists.newArrayList(); - for (final ValueParameterDescriptor originalParam : parameters.getDescriptors()) { + for (ValueParameterDescriptor originalParam : parameters.getDescriptors()) { final int index = originalParam.getIndex(); List typesFromSuperMethods = ContainerUtil.map(superFunctions, new Function() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetClassAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetClassAnnotation.java index 63a21c5d4d8..e7c1f3570cb 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetClassAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetClassAnnotation.java @@ -53,7 +53,7 @@ public class JetClassAnnotation extends PsiAnnotationWithAbiVersion { @NotNull public static JetClassAnnotation get(PsiClass psiClass) { - final PsiAnnotation annotation = JavaAnnotationResolver.findOwnAnnotation(psiClass, + PsiAnnotation annotation = JavaAnnotationResolver.findOwnAnnotation(psiClass, JvmStdlibNames.JET_CLASS.getFqName().getFqName()); return annotation != null ? new JetClassAnnotation(annotation) : NULL_ANNOTATION; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetConstructorAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetConstructorAnnotation.java index 4b5e25fac09..65f8277994a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetConstructorAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetConstructorAnnotation.java @@ -47,7 +47,7 @@ public class JetConstructorAnnotation extends PsiAnnotationWithFlags { } public static JetConstructorAnnotation get(PsiMethod constructor) { - final PsiAnnotation annotation = + PsiAnnotation annotation = JavaAnnotationResolver.findOwnAnnotation(constructor, JvmStdlibNames.JET_CONSTRUCTOR.getFqName().getFqName()); return annotation != null ? new JetConstructorAnnotation(annotation) : NULL_ANNOTATION; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java index 29620b472eb..e1354bd4789 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java @@ -68,7 +68,7 @@ public class JetMethodAnnotation extends PsiAnnotationWithFlags { } public static JetMethodAnnotation get(PsiMethod psiMethod) { - final PsiAnnotation annotation = + PsiAnnotation annotation = JavaAnnotationResolver.findOwnAnnotation(psiMethod, JvmStdlibNames.JET_METHOD.getFqName().getFqName()); return annotation != null ? new JetMethodAnnotation(annotation) : NULL_ANNOTATION; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetPackageClassAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetPackageClassAnnotation.java index 519d82ba4de..db7f552fe0d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetPackageClassAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetPackageClassAnnotation.java @@ -35,7 +35,7 @@ public class JetPackageClassAnnotation extends PsiAnnotationWithAbiVersion { @NotNull public static JetPackageClassAnnotation get(PsiClass psiClass) { - final PsiAnnotation annotation = JavaAnnotationResolver.findOwnAnnotation(psiClass, + PsiAnnotation annotation = JavaAnnotationResolver.findOwnAnnotation(psiClass, JvmStdlibNames.JET_PACKAGE_CLASS.getFqName().getFqName()); return annotation != null ? new JetPackageClassAnnotation(annotation) : NULL_ANNOTATION; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetTypeParameterAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetTypeParameterAnnotation.java index f75e71028b6..dfee4f4cd85 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetTypeParameterAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetTypeParameterAnnotation.java @@ -39,7 +39,7 @@ public class JetTypeParameterAnnotation extends PsiAnnotationWrapper { @NotNull public static JetTypeParameterAnnotation get(@NotNull PsiParameter psiParameter) { - final PsiAnnotation annotation = + PsiAnnotation annotation = JavaAnnotationResolver.findOwnAnnotation(psiParameter, JvmStdlibNames.JET_TYPE_PARAMETER.getFqName().getFqName()); return annotation != null ? new JetTypeParameterAnnotation(annotation) : NULL_ANNOTATION; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java index 322b06d9a2d..b03e027d6cf 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java @@ -76,7 +76,7 @@ public class JetValueParameterAnnotation extends PsiAnnotationWrapper { } public static JetValueParameterAnnotation get(PsiParameter psiParameter) { - final PsiAnnotation annotation = + PsiAnnotation annotation = JavaAnnotationResolver.findOwnAnnotation(psiParameter, JvmStdlibNames.JET_VALUE_PARAMETER.getFqName().getFqName()); return annotation != null ? new JetValueParameterAnnotation(annotation) : NULL_ANNOTATION; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java index d2c92b30ae0..fccc0b2e414 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java @@ -49,7 +49,7 @@ public class KotlinSignatureAnnotation extends PsiAnnotationWrapper { @NotNull public static KotlinSignatureAnnotation get(PsiModifierListOwner psiModifierListOwner) { - final PsiAnnotation annotation = + PsiAnnotation annotation = JavaAnnotationResolver.findAnnotationWithExternal(psiModifierListOwner, JvmStdlibNames.KOTLIN_SIGNATURE.getFqName().getFqName()); return annotation != null ? new KotlinSignatureAnnotation(annotation) : NULL_ANNOTATION; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/MembersCache.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/MembersCache.java index 39ca4c79862..77ed6a2dcac 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/MembersCache.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/MembersCache.java @@ -263,7 +263,7 @@ public final class MembersCache { } // TODO: what if returnType == null? - final PsiType returnType = method.getReturnType(); + PsiType returnType = method.getReturnType(); assert returnType != null; TypeSource propertyType = new TypeSource(method.getJetMethodAnnotation().propertyType(), returnType, method.getPsiMethod()); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index 49cab36062e..2e9e3f4820f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -190,7 +190,7 @@ public final class JavaClassResolver { @NotNull private ClassDescriptor createJavaClassDescriptor( - @NotNull FqName fqName, @NotNull final PsiClass psiClass, + @NotNull FqName fqName, @NotNull PsiClass psiClass, @NotNull PostponedTasks taskList ) { @@ -292,7 +292,7 @@ public final class JavaClassResolver { } void checkFqNamesAreConsistent(@NotNull PsiClass psiClass, @NotNull FqName desiredFqName) { - final String qualifiedName = psiClass.getQualifiedName(); + String qualifiedName = psiClass.getQualifiedName(); assert qualifiedName != null; FqName fqName = new FqName(qualifiedName); @@ -315,7 +315,7 @@ public final class JavaClassResolver { @NotNull private static FqName getFqName(@NotNull PsiClass psiClass) { - final String qualifiedName = psiClass.getQualifiedName(); + String qualifiedName = psiClass.getQualifiedName(); assert qualifiedName != null; return new FqName(qualifiedName); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java index 2939528158d..383760e66aa 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java @@ -91,7 +91,7 @@ public final class JavaFunctionResolver { @Nullable private SimpleFunctionDescriptor resolveMethodToFunctionDescriptor( - @NotNull final PsiClass psiClass, final PsiMethodWrapper method, + @NotNull PsiClass psiClass, PsiMethodWrapper method, @NotNull PsiDeclarationProvider scopeData, @NotNull ClassOrNamespaceDescriptor ownerDescriptor ) { PsiType returnPsiType = method.getReturnType(); @@ -104,8 +104,8 @@ public final class JavaFunctionResolver { return null; } - final PsiMethod psiMethod = method.getPsiMethod(); - final PsiClass containingClass = psiMethod.getContainingClass(); + PsiMethod psiMethod = method.getPsiMethod(); + PsiClass containingClass = psiMethod.getContainingClass(); if (scopeData.getDeclarationOrigin() == KOTLIN) { // TODO: unless maybe class explicitly extends Object assert containingClass != null; @@ -119,7 +119,7 @@ public final class JavaFunctionResolver { return trace.get(BindingContext.FUNCTION, psiMethod); } - final SimpleFunctionDescriptorImpl functionDescriptorImpl = new SimpleFunctionDescriptorImpl( + SimpleFunctionDescriptorImpl functionDescriptorImpl = new SimpleFunctionDescriptorImpl( ownerDescriptor, annotationResolver.resolveAnnotations(psiMethod), Name.identifier(method.getName()), @@ -141,7 +141,7 @@ public final class JavaFunctionResolver { .resolveParameterDescriptors(functionDescriptorImpl, method.getParameters(), methodTypeVariableResolver); JetType returnType = makeReturnType(returnPsiType, method, methodTypeVariableResolver); - final List signatureErrors = Lists.newArrayList(); + List signatureErrors = Lists.newArrayList(); List superFunctions; if (ownerDescriptor instanceof ClassDescriptor) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMethodSignatureUtil.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMethodSignatureUtil.java index 8f4c9f1a292..946e3f5bb3b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMethodSignatureUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaMethodSignatureUtil.java @@ -58,7 +58,7 @@ class JavaMethodSignatureUtil { ) { if (superReturnType == null) return false; PsiType substitutedSuperReturnType; - final boolean isJdk15 = PsiUtil.isLanguageLevel5OrHigher(method); + boolean isJdk15 = PsiUtil.isLanguageLevel5OrHigher(method); if (isJdk15 && !superMethodSignature.isRaw() && superMethodSignature.equals(methodSignature)) { //see 8.4.5 PsiSubstitutor unifyingSubstitutor = MethodSignatureUtil.getSuperMethodSignatureSubstitutor(methodSignature, superMethodSignature); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSignatureResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSignatureResolver.java index aa26bd5a9b6..0f99a2a9d15 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSignatureResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSignatureResolver.java @@ -198,7 +198,7 @@ public final class JavaSignatureResolver { List r = new ArrayList(); @Override - public JetSignatureVisitor visitFormalTypeParameter(final String name, final TypeInfoVariance variance, boolean reified) { + public JetSignatureVisitor visitFormalTypeParameter(final String name, TypeInfoVariance variance, boolean reified) { TypeParameterDescriptorImpl typeParameter = TypeParameterDescriptorImpl.createForFurtherModification( containingDeclaration, Collections.emptyList(), // TODO: wrong @@ -274,7 +274,7 @@ public final class JavaSignatureResolver { private void initializeTypeParameter(TypeParameterDescriptorInitialization typeParameter, TypeVariableResolver typeVariableByPsiResolver) { TypeParameterDescriptorImpl typeParameterDescriptor = typeParameter.descriptor; if (typeParameter.origin == TypeParameterDescriptorOrigin.KOTLIN) { - final List upperBoundsForKotlin = typeParameter.upperBoundsForKotlin; + List upperBoundsForKotlin = typeParameter.upperBoundsForKotlin; assert upperBoundsForKotlin != null; if (upperBoundsForKotlin.size() == 0){ typeParameterDescriptor.addUpperBound(KotlinBuiltIns.getInstance().getNullableAnyType()); @@ -344,7 +344,7 @@ public final class JavaSignatureResolver { ) { List typeParametersIntialization; - final PsiMethod psiMethod = method.getPsiMethod(); + PsiMethod psiMethod = method.getPsiMethod(); if (method.getJetMethodAnnotation().typeParameters().length() > 0) { typeParametersIntialization = resolveMethodTypeParametersFromJetSignature( method.getJetMethodAnnotation().typeParameters(), psiMethod, functionDescriptor); @@ -353,7 +353,7 @@ public final class JavaSignatureResolver { typeParametersIntialization = makeUninitializedTypeParameters(functionDescriptor, psiMethod.getTypeParameters()); } - final PsiClass psiMethodContainingClass = psiMethod.getContainingClass(); + PsiClass psiMethodContainingClass = psiMethod.getContainingClass(); assert psiMethodContainingClass != null; String context = "method " + method.getName() + " in class " + psiMethodContainingClass.getQualifiedName(); initializeTypeParameters(typeParametersIntialization, functionDescriptor, context); @@ -371,9 +371,9 @@ public final class JavaSignatureResolver { * @see #resolveClassTypeParametersFromJetSignature(String, PsiClass, ClassDescriptor) */ private List resolveMethodTypeParametersFromJetSignature(String jetSignature, - final PsiMethod method, final DeclarationDescriptor functionDescriptor) + PsiMethod method, DeclarationDescriptor functionDescriptor) { - final PsiClass methodContainingClass = method.getContainingClass(); + PsiClass methodContainingClass = method.getContainingClass(); assert methodContainingClass != null; String context = "method " + method.getName() + " in class " + methodContainingClass.getQualifiedName(); JetSignatureTypeParametersVisitor jetSignatureTypeParametersVisitor = new JetSignatureTypeParametersVisitor(functionDescriptor, method, context); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java index ee230c16417..a5d01dd296f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java @@ -79,7 +79,7 @@ public final class JavaSupertypeResolver { @NotNull List typeParameters ) { - final List result = new ArrayList(); + List result = new ArrayList(); String context = "class " + psiClass.getQualifiedName(); @@ -179,7 +179,7 @@ public final class JavaSupertypeResolver { for (PsiClassType type : extendsListTypes) { PsiClass resolved = type.resolve(); if (resolved != null) { - final String qualifiedName = resolved.getQualifiedName(); + String qualifiedName = resolved.getQualifiedName(); assert qualifiedName != null; if (JvmStdlibNames.JET_OBJECT.getFqName().equalsTo(qualifiedName)) { continue; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/ScopeUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/ScopeUtils.java index b6b81cc8bfe..6f0c70255ef 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/ScopeUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/ScopeUtils.java @@ -40,7 +40,7 @@ public final class ScopeUtils { JavaSemanticServices javaSemanticServices ) { Collection result = Sets.newHashSet(); - final JavaDescriptorResolver descriptorResolver = javaSemanticServices.getDescriptorResolver(); + JavaDescriptorResolver descriptorResolver = javaSemanticServices.getDescriptorResolver(); for (PsiPackage psiSubPackage : psiPackage.getSubPackages()) { NamespaceDescriptor childNs = descriptorResolver.resolveNamespace( diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java index e6302ac46e8..f1ba2126f02 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java @@ -74,7 +74,7 @@ public class CheckerTestUtil { for (PsiErrorElement errorElement : AnalyzingUtils.getSyntaxErrorRanges(root)) { diagnostics.add(new SyntaxErrorDiagnostic(errorElement)); } - final List debugAnnotations = getDebugInfoDiagnostics(root, bindingContext); + List debugAnnotations = getDebugInfoDiagnostics(root, bindingContext); diagnostics.addAll(debugAnnotations); return diagnostics; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java index f07e58a077b..9abd6161422 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java @@ -370,7 +370,7 @@ public class JetControlFlowProcessor { @Override public void visitTryExpression(JetTryExpression expression) { builder.read(expression); - final JetFinallySection finallyBlock = expression.getFinallyBlock(); + JetFinallySection finallyBlock = expression.getFinallyBlock(); final FinallyBlockGenerator finallyBlockGenerator = new FinallyBlockGenerator(finallyBlock); if (finallyBlock != null) { builder.enterTryFinally(new GenerationTrigger() { @@ -388,7 +388,7 @@ public class JetControlFlowProcessor { } List catchClauses = expression.getCatchClauses(); - final boolean hasCatches = !catchClauses.isEmpty(); + boolean hasCatches = !catchClauses.isEmpty(); Label onException = null; if (hasCatches) { onException = builder.createUnboundLabel("onException"); @@ -786,7 +786,7 @@ public class JetControlFlowProcessor { } @Override - public void visitIsExpression(final JetIsExpression expression) { + public void visitIsExpression(JetIsExpression expression) { generateInstructions(expression.getLeftHandSide(), inCondition); // no CF for types // TODO : builder.read(expression.getPattern()); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java index 4f4299e6cf6..e8a200f7d81 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java @@ -130,7 +130,7 @@ public class PseudocodeVariablesData { Set usedVariables = getUsedVariables(pseudocode); Set declaredVariables = getDeclaredVariables(pseudocode, false); Map initialMap = Collections.emptyMap(); - final Map initialMapForStartInstruction = prepareInitializersMapForStartInstruction( + Map initialMapForStartInstruction = prepareInitializersMapForStartInstruction( usedVariables, declaredVariables); Map>> variableInitializersMap = PseudocodeTraverser.collectData( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java index 1d939e41624..3d70aee01ba 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java @@ -134,7 +134,7 @@ import static org.jetbrains.jet.lexer.JetTokens.*; myBuilder.advanceLexer(); } - protected void advanceAtSet(final TokenSet set) { + protected void advanceAtSet(TokenSet set) { assert _atSet(set); myBuilder.advanceLexer(); } @@ -161,7 +161,7 @@ import static org.jetbrains.jet.lexer.JetTokens.*; return false; } - protected boolean at(final IElementType expectation) { + protected boolean at(IElementType expectation) { if (_at(expectation)) return true; IElementType token = tt(); if (token == IDENTIFIER && expectation instanceof JetKeywordToken) { @@ -191,7 +191,7 @@ import static org.jetbrains.jet.lexer.JetTokens.*; /** * Side-effect-free version of atSet() */ - protected boolean _atSet(final TokenSet set) { + protected boolean _atSet(TokenSet set) { IElementType token = tt(); if (set.contains(token)) return true; if (set.contains(EOL_OR_SEMICOLON)) { @@ -206,7 +206,7 @@ import static org.jetbrains.jet.lexer.JetTokens.*; return atSet(TokenSet.create(tokens)); } - protected boolean atSet(final TokenSet set) { + protected boolean atSet(TokenSet set) { if (_atSet(set)) return true; IElementType token = tt(); if (token == IDENTIFIER) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java index f6758ba19d0..fa6da4f6347 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java @@ -57,7 +57,7 @@ public class JetParsing extends AbstractJetParsing { return jetParsing; } - private static JetParsing createForByClause(final SemanticWhitespaceAwarePsiBuilder builder) { + private static JetParsing createForByClause(SemanticWhitespaceAwarePsiBuilder builder) { final SemanticWhitespaceAwarePsiBuilderForByClause builderForByClause = new SemanticWhitespaceAwarePsiBuilderForByClause(builder); JetParsing jetParsing = new JetParsing(builderForByClause); jetParsing.myExpressionParsing = new JetExpressionParsing(builderForByClause, jetParsing) { @@ -753,7 +753,7 @@ public class JetParsing extends AbstractJetParsing { advance(); // CLASS_KEYWORD - final PsiBuilder.Marker objectDeclaration = mark(); + PsiBuilder.Marker objectDeclaration = mark(); parseObject(false, true); objectDeclaration.done(OBJECT_DECLARATION); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java index 6e3fe7f75dc..3e4242d8d48 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java @@ -35,7 +35,7 @@ public class SemanticWhitespaceAwarePsiBuilderImpl extends PsiBuilderAdapter imp private final Stack newlinesEnabled = new Stack(); - public SemanticWhitespaceAwarePsiBuilderImpl(final PsiBuilder delegate) { + public SemanticWhitespaceAwarePsiBuilderImpl(PsiBuilder delegate) { super(delegate); newlinesEnabled.push(true); joinComplexTokens.push(true); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java index e27bec5c2bb..67454adfe79 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java @@ -43,7 +43,7 @@ public class JetClass extends JetTypeParameterListOwnerStub imp super(node); } - public JetClass(@NotNull final PsiJetClassStub stub) { + public JetClass(@NotNull PsiJetClassStub stub) { super(stub, JetStubElementTypes.CLASS); } @@ -231,13 +231,13 @@ public class JetClass extends JetTypeParameterListOwnerStub imp return stub.getSuperNames(); } - final List specifiers = getDelegationSpecifiers(); + List specifiers = getDelegationSpecifiers(); if (specifiers.size() == 0) return Collections.emptyList(); List result = new ArrayList(); for (JetDelegationSpecifier specifier : specifiers) { - final JetUserType superType = specifier.getTypeAsUserType(); + JetUserType superType = specifier.getTypeAsUserType(); if (superType != null) { - final String referencedName = superType.getReferencedName(); + String referencedName = superType.getReferencedName(); if (referencedName != null) { addSuperName(result, referencedName); } @@ -249,7 +249,7 @@ public class JetClass extends JetTypeParameterListOwnerStub imp private void addSuperName(List result, String referencedName) { result.add(referencedName); if (getContainingFile() instanceof JetFile) { - final JetImportDirective directive = ((JetFile) getContainingFile()).findImportByAlias(referencedName); + JetImportDirective directive = ((JetFile) getContainingFile()).findImportByAlias(referencedName); if (directive != null) { JetExpression reference = directive.getImportedReference(); while (reference instanceof JetDotQualifiedExpression) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java index 961afe9c762..700b5dea0dc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java @@ -65,13 +65,13 @@ public class JetClassBody extends JetElementImpl implements JetDeclarationContai @Nullable public PsiElement getRBrace() { - final ASTNode[] children = getNode().getChildren(TokenSet.create(JetTokens.RBRACE)); + ASTNode[] children = getNode().getChildren(TokenSet.create(JetTokens.RBRACE)); return children.length == 1 ? children[0].getPsi() : null; } @Nullable public PsiElement getLBrace() { - final ASTNode[] children = getNode().getChildren(TokenSet.create(JetTokens.LBRACE)); + ASTNode[] children = getNode().getChildren(TokenSet.create(JetTokens.LBRACE)); return children.length == 1 ? children[0].getPsi() : null; } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java index 855af5ed27b..684814af14c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java @@ -43,9 +43,9 @@ public class JetDelegationSpecifier extends JetElementImpl { @Nullable public JetUserType getTypeAsUserType() { - final JetTypeReference reference = getTypeReference(); + JetTypeReference reference = getTypeReference(); if (reference != null) { - final JetTypeElement element = reference.getTypeElement(); + JetTypeElement element = reference.getTypeElement(); if (element instanceof JetUserType) { return ((JetUserType) element); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java index b4fec9696bb..acfbf443b3c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java @@ -79,7 +79,7 @@ public class JetDelegatorToSuperCall extends JetDelegationSpecifier implements J @Override public JetTypeArgumentList getTypeArgumentList() { - final JetUserType userType = getTypeAsUserType(); + JetUserType userType = getTypeAsUserType(); return userType != null ? userType.getTypeArgumentList() : null; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java index fa8ccb57da3..0a42f6a2910 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java @@ -89,7 +89,7 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub { public static final ArrayFactory ARRAY_FACTORY = new ArrayFactory() { @Override - public JetParameter[] create(final int count) { + public JetParameter[] create(int count) { return count == 0 ? EMPTY_ARRAY : new JetParameter[count]; } }; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java index 0cb991fb309..22a01dffef3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java @@ -32,7 +32,7 @@ public class JetTypeParameter extends JetNamedDeclarationStub ARRAY_FACTORY = new ArrayFactory() { @Override - public JetTypeParameter[] create(final int count) { + public JetTypeParameter[] create(int count) { return count == 0 ? EMPTY_ARRAY : new JetTypeParameter[count]; } }; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java index 95a4b33da87..94d7da8d493 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java @@ -57,31 +57,31 @@ public class JetFileElementType extends IStubFileElementType { } @Override - public void serialize(final PsiJetFileStub stub, final StubOutputStream dataStream) + public void serialize(PsiJetFileStub stub, StubOutputStream dataStream) throws IOException { dataStream.writeName(stub.getPackageName()); dataStream.writeBoolean(stub.isScript()); } @Override - public PsiJetFileStub deserialize(final StubInputStream dataStream, final StubElement parentStub) throws IOException { + public PsiJetFileStub deserialize(StubInputStream dataStream, StubElement parentStub) throws IOException { StringRef packName = dataStream.readName(); boolean isScript = dataStream.readBoolean(); return new PsiJetFileStubImpl(null, packName, isScript); } @Override - protected ASTNode doParseContents(@NotNull final ASTNode chameleon, @NotNull final PsiElement psi) { - final Project project = psi.getProject(); + protected ASTNode doParseContents(@NotNull ASTNode chameleon, @NotNull PsiElement psi) { + Project project = psi.getProject(); Language languageForParser = getLanguageForParser(psi); - final PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, null, languageForParser, chameleon.getChars()); - final JetParser parser = (JetParser) LanguageParserDefinitions.INSTANCE.forLanguage(languageForParser).createParser(project); + PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, null, languageForParser, chameleon.getChars()); + JetParser parser = (JetParser) LanguageParserDefinitions.INSTANCE.forLanguage(languageForParser).createParser(project); return parser.parse(this, builder, psi.getContainingFile()).getFirstChildNode(); } @Override - public void indexStub(final PsiJetFileStub stub, final IndexSink sink) { + public void indexStub(PsiJetFileStub stub, IndexSink sink) { StubIndexServiceFactory.getInstance().indexFile(stub, sink); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java index bb724854c36..31dbf10bfdb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java @@ -64,8 +64,8 @@ public class JetFunctionElementType extends JetStubElementType implements PsiJetCla public PsiJetClassStubImpl( JetClassElementType type, StubElement parent, - @Nullable final String qualifiedName, + @Nullable String qualifiedName, String name, List superNames, boolean isTrait, boolean isEnumClass, boolean isEnumEntry, boolean isAnnotation, boolean isInner) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterListStubImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterListStubImpl.java index e95ccad5fbb..147e5b9c107 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterListStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterListStubImpl.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.psi.JetTypeParameterList; import org.jetbrains.jet.lang.psi.stubs.PsiJetTypeParameterListStub; public class PsiJetTypeParameterListStubImpl extends StubBase implements PsiJetTypeParameterListStub { - public PsiJetTypeParameterListStubImpl(@NotNull IStubElementType elementType, final StubElement parent) { + public PsiJetTypeParameterListStubImpl(@NotNull IStubElementType elementType, StubElement parent) { super(parent, elementType); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterStubImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterStubImpl.java index c270b75aee5..113d90785f0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterStubImpl.java @@ -29,7 +29,7 @@ public class PsiJetTypeParameterStubImpl extends StubBase impl private final boolean isInVariance; private final boolean isOutVariance; - public PsiJetTypeParameterStubImpl(JetTypeParameterElementType type, final StubElement parent, + public PsiJetTypeParameterStubImpl(JetTypeParameterElementType type, StubElement parent, StringRef name, StringRef extendBoundTypeText, boolean isInVariance, boolean isOutVariance) { super(parent, type); @@ -39,7 +39,7 @@ public class PsiJetTypeParameterStubImpl extends StubBase impl this.isOutVariance = isOutVariance; } - public PsiJetTypeParameterStubImpl(JetTypeParameterElementType type, final StubElement parent, + public PsiJetTypeParameterStubImpl(JetTypeParameterElementType type, StubElement parent, String name, String extendBoundTypeText, boolean isInVariance, boolean isOutVariance) { this(type, parent, StringRef.fromString(name), StringRef.fromString(extendBoundTypeText), isInVariance, isOutVariance); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java index 7aa9960d1fc..0f045115468 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java @@ -152,14 +152,14 @@ public class BodyResolver { } } - private void resolveDelegationSpecifierList(JetClassOrObject jetClass, final MutableClassDescriptor descriptor) { + private void resolveDelegationSpecifierList(JetClassOrObject jetClass, MutableClassDescriptor descriptor) { resolveDelegationSpecifierList(jetClass, descriptor, descriptor.getUnsubstitutedPrimaryConstructor(), descriptor.getScopeForSupertypeResolution(), descriptor.getScopeForMemberResolution()); } - public void resolveDelegationSpecifierList(@NotNull final JetClassOrObject jetClass, @NotNull final ClassDescriptor descriptor, + public void resolveDelegationSpecifierList(@NotNull JetClassOrObject jetClass, @NotNull final ClassDescriptor descriptor, @Nullable final ConstructorDescriptor primaryConstructor, @NotNull JetScope scopeForSupertypeResolution, @NotNull final JetScope scopeForMemberResolution) { @@ -378,7 +378,7 @@ public class BodyResolver { MutableClassDescriptor classDescriptor = entry.getValue(); for (JetProperty property : jetClass.getProperties()) { - final PropertyDescriptor propertyDescriptor = this.context.getProperties().get(property); + PropertyDescriptor propertyDescriptor = this.context.getProperties().get(property); assert propertyDescriptor != null; computeDeferredType(propertyDescriptor.getReturnType()); @@ -403,7 +403,7 @@ public class BodyResolver { if (!context.completeAnalysisNeeded(property)) continue; if (processed.contains(property)) continue; - final PropertyDescriptor propertyDescriptor = entry.getValue(); + PropertyDescriptor propertyDescriptor = entry.getValue(); computeDeferredType(propertyDescriptor.getReturnType()); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java index 00076c1940b..b79eb0bb056 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java @@ -60,7 +60,7 @@ public class ControlFlowAnalyzer { JetNamedFunction function = entry.getKey(); SimpleFunctionDescriptor functionDescriptor = entry.getValue(); if (!bodiesResolveContext.completeAnalysisNeeded(function)) continue; - final JetType expectedReturnType = !function.hasBlockBody() && !function.hasDeclaredReturnType() + JetType expectedReturnType = !function.hasBlockBody() && !function.hasDeclaredReturnType() ? NO_EXPECTED_TYPE : functionDescriptor.getReturnType(); checkFunction(function, expectedReturnType); @@ -94,7 +94,7 @@ public class ControlFlowAnalyzer { } } - private void checkFunction(JetDeclarationWithBody function, final @NotNull JetType expectedReturnType) { + private void checkFunction(JetDeclarationWithBody function, @NotNull JetType expectedReturnType) { assert function instanceof JetDeclaration; JetExpression bodyExpression = function.getBodyExpression(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java index 528ef00f9ee..70ef3758692 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java @@ -110,7 +110,7 @@ public class DelegationResolver { private static boolean isNotTrait(DeclarationDescriptor descriptor) { if (descriptor instanceof ClassDescriptor) { - final ClassKind kind = ((ClassDescriptor) descriptor).getKind(); + ClassKind kind = ((ClassDescriptor) descriptor).getKind(); return kind != ClassKind.TRAIT; } return false; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 8a20825ab15..2bc72262ddb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -289,7 +289,7 @@ public class DescriptorResolver { returnType = KotlinBuiltIns.getInstance().getUnitType(); } else { - final JetExpression bodyExpression = function.getBodyExpression(); + JetExpression bodyExpression = function.getBodyExpression(); if (bodyExpression != null) { returnType = DeferredType.create(trace, new RecursionIntolerantLazyValueWithDefault(ErrorUtils.createErrorType("Recursive dependency")) { @@ -1024,7 +1024,7 @@ public class DescriptorResolver { @NotNull DeclarationDescriptorWithVisibility descriptor, @NotNull JetNamedDeclaration declaration, @NotNull JetType type, - @NotNull final BindingTrace trace + @NotNull BindingTrace trace ) { ClassifierDescriptor classifierDescriptor = type.getConstructor().getDeclarationDescriptor(); if (!DescriptorUtils.isAnonymous(classifierDescriptor)) { @@ -1052,7 +1052,7 @@ public class DescriptorResolver { private JetType resolveInitializerType( @NotNull JetScope scope, @NotNull JetExpression initializer, - @NotNull final DataFlowInfo dataFlowInfo, + @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace ) { return expressionTypingServices.safeGetType(scope, initializer, TypeUtils.NO_EXPECTED_TYPE, dataFlowInfo, trace); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java index 88b6f50114f..a215b082834 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -47,8 +47,8 @@ import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_ public class DescriptorUtils { @NotNull - public static D substituteBounds(@NotNull final D functionDescriptor) { - final List typeParameters = functionDescriptor.getTypeParameters(); + public static D substituteBounds(@NotNull D functionDescriptor) { + List typeParameters = functionDescriptor.getTypeParameters(); if (typeParameters.isEmpty()) return functionDescriptor; // TODO: this does not handle any recursion in the bounds diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index 63f611edc4f..1cdb458e755 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -95,7 +95,7 @@ public class OverrideResolver { } private void generateOverridesAndDelegationInAClass( - @NotNull final MutableClassDescriptor classDescriptor, + @NotNull MutableClassDescriptor classDescriptor, @NotNull Set processed, @NotNull Set classesBeingAnalyzed // to filter out classes such as stdlib and others that come from dependencies diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index 8db12b90668..baddf410dfb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -181,7 +181,7 @@ public class TopDownAnalyzer { public static void processClassOrObject( @NotNull Project project, - @NotNull final BindingTrace trace, + @NotNull BindingTrace trace, @NotNull JetScope outerScope, @NotNull final DeclarationDescriptor containingDeclaration, @NotNull JetClassOrObject object @@ -234,7 +234,7 @@ public class TopDownAnalyzer { public void analyzeFiles( @NotNull Collection files, @NotNull List scriptParameters) { - final WritableScope scope = new WritableScopeImpl( + WritableScope scope = new WritableScopeImpl( JetScope.EMPTY, moduleDescriptor, new TraceBasedRedeclarationHandler(trace), "Root scope in analyzeNamespace"); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java index f1336810244..4cf4a074da2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java @@ -183,11 +183,11 @@ public class TypeHierarchyResolver { @Nullable private Collection collectNamespacesAndClassifiers( - @NotNull final JetScope outerScope, - @NotNull final NamespaceLikeBuilder owner, + @NotNull JetScope outerScope, + @NotNull NamespaceLikeBuilder owner, @NotNull Iterable declarations ) { - final Collection forDeferredResolve = new ArrayList(); + Collection forDeferredResolve = new ArrayList(); ClassifierCollector collector = new ClassifierCollector(outerScope, owner, forDeferredResolve); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java index 359755c8d53..130d0081505 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java @@ -69,11 +69,11 @@ public class TypeResolver { } @NotNull - public JetType resolveType(@NotNull final JetScope scope, @NotNull final JetTypeReference typeReference, BindingTrace trace, boolean checkBounds) { + public JetType resolveType(@NotNull JetScope scope, @NotNull JetTypeReference typeReference, BindingTrace trace, boolean checkBounds) { JetType cachedType = trace.getBindingContext().get(BindingContext.TYPE, typeReference); if (cachedType != null) return cachedType; - final List annotations = annotationResolver.getResolvedAnnotations(typeReference.getAnnotations(), trace); + List annotations = annotationResolver.getResolvedAnnotations(typeReference.getAnnotations(), trace); JetTypeElement typeElement = typeReference.getTypeElement(); JetType type = resolveTypeElement(scope, annotations, typeElement, trace, checkBounds); @@ -276,7 +276,7 @@ public class TypeResolver { } private List resolveTypes(JetScope scope, List argumentElements, BindingTrace trace, boolean checkBounds) { - final List arguments = new ArrayList(); + List arguments = new ArrayList(); for (JetTypeReference argumentElement : argumentElements) { arguments.add(resolveType(scope, argumentElement, trace, checkBounds)); } @@ -285,7 +285,7 @@ public class TypeResolver { @NotNull private List resolveTypeProjections(JetScope scope, TypeConstructor constructor, List argumentElements, BindingTrace trace, boolean checkBounds) { - final List arguments = new ArrayList(); + List arguments = new ArrayList(); for (int i = 0, argumentElementsSize = argumentElements.size(); i < argumentElementsSize; i++) { JetTypeProjection argumentElement = argumentElements.get(i); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java index 58a33a34d1e..d0533e31165 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java @@ -113,7 +113,7 @@ public class CallResolver { @NotNull public OverloadResolutionResults resolveCallWithGivenName( @NotNull BasicCallResolutionContext context, - @NotNull final JetReferenceExpression functionReference, + @NotNull JetReferenceExpression functionReference, @NotNull Name name) { List> tasks = TaskPrioritizer.computePrioritizedTasks(context, name, functionReference, CallableDescriptorCollectors.FUNCTIONS_AND_VARIABLES); @@ -140,7 +140,7 @@ public class CallResolver { List> prioritizedTasks; JetExpression calleeExpression = context.call.getCalleeExpression(); - final JetReferenceExpression functionReference; + JetReferenceExpression functionReference; if (calleeExpression instanceof JetSimpleNameExpression) { JetSimpleNameExpression expression = (JetSimpleNameExpression) calleeExpression; functionReference = expression; @@ -262,10 +262,10 @@ public class CallResolver { private OverloadResolutionResultsImpl doResolveCallOrGetCachedResults( @NotNull WritableSlice> resolutionResultsSlice, - @NotNull final BasicCallResolutionContext context, - @NotNull final List> prioritizedTasks, + @NotNull BasicCallResolutionContext context, + @NotNull List> prioritizedTasks, @NotNull CallTransformer callTransformer, - @NotNull final JetReferenceExpression reference + @NotNull JetReferenceExpression reference ) { PsiElement element = context.call.getCallElement(); OverloadResolutionResultsImpl results = null; @@ -379,10 +379,10 @@ public class CallResolver { @NotNull private OverloadResolutionResultsImpl doResolveCall( - @NotNull final BasicCallResolutionContext context, - @NotNull final List> prioritizedTasks, // high to low priority + @NotNull BasicCallResolutionContext context, + @NotNull List> prioritizedTasks, // high to low priority @NotNull CallTransformer callTransformer, - @NotNull final JetReferenceExpression reference) { + @NotNull JetReferenceExpression reference) { ResolutionDebugInfo.Data debugInfo = ResolutionDebugInfo.create(); context.trace.record(ResolutionDebugInfo.RESOLUTION_DEBUG_INFO, context.call.getCallElement(), debugInfo); @@ -435,7 +435,7 @@ public class CallResolver { } private OverloadResolutionResults resolveFunctionArguments( - @NotNull final BasicCallResolutionContext context, + @NotNull BasicCallResolutionContext context, @NotNull OverloadResolutionResults results ) { if (results.isSingleResult()) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java index 23aedd22b3b..0a89cc347f8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java @@ -173,10 +173,10 @@ public class CallTransformer { @NotNull @Override - public Collection> transformCall(@NotNull final CallCandidateResolutionContext context, - @NotNull CallResolver callResolver, @NotNull final ResolutionTask task) { + public Collection> transformCall(@NotNull CallCandidateResolutionContext context, + @NotNull CallResolver callResolver, @NotNull ResolutionTask task) { - final CallableDescriptor descriptor = context.candidateCall.getCandidateDescriptor(); + CallableDescriptor descriptor = context.candidateCall.getCandidateDescriptor(); if (descriptor instanceof FunctionDescriptor) { return super.transformCall(context, callResolver, task); } @@ -191,7 +191,7 @@ public class CallTransformer { Call functionCall = createFunctionCall(context, task, returnType); - final DelegatingBindingTrace variableCallTrace = context.candidateCall.getTrace(); + DelegatingBindingTrace variableCallTrace = context.candidateCall.getTrace(); BasicCallResolutionContext basicCallResolutionContext = BasicCallResolutionContext.create( variableCallTrace, context.scope, functionCall, context.expectedType, context.dataFlowInfo, context.resolveMode, context.expressionPosition); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java index abc878a5ffd..0a38520bfba 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java @@ -327,7 +327,7 @@ public class CandidateResolver { JetElement statementExpression = JetPsiUtil.getLastStatementInABlock(((JetFunctionLiteralExpression) argumentExpression).getBodyExpression()); if (statementExpression == null) return; - final boolean[] mismatch = new boolean[1]; + boolean[] mismatch = new boolean[1]; ObservableBindingTrace errorInterceptingTrace = ExpressionTypingUtils.makeTraceInterceptingTypeMismatch( traceToResolveFunctionLiteral, statementExpression, mismatch); CallCandidateResolutionContext newContext = diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java index eba045cdf79..6fb4db3b121 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.java @@ -87,7 +87,7 @@ public class TaskPrioritizer { else { scope = context.scope; } - final Predicate> visibleStrategy = new Predicate>() { + Predicate> visibleStrategy = new Predicate>() { @Override public boolean apply(@Nullable ResolutionCandidate call) { if (call == null) return false; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java index acfbe5c193d..115ecfd8f6d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java @@ -115,10 +115,10 @@ public class ResolveSessionUtils { } public static @NotNull BindingContext resolveToExpression( - @NotNull final ResolveSession resolveSession, + @NotNull ResolveSession resolveSession, @NotNull JetExpression expression ) { - final DelegatingBindingTrace trace = new DelegatingBindingTrace( + DelegatingBindingTrace trace = new DelegatingBindingTrace( resolveSession.getBindingContext(), "trace to resolve expression", expression); JetFile file = (JetFile) expression.getContainingFile(); @@ -158,8 +158,9 @@ public class ResolveSessionUtils { return trace.getBindingContext(); } - private static void delegationSpecifierAdditionalResolve(final KotlinCodeAnalyzer analyzer, - final JetDelegationSpecifierList specifier, DelegatingBindingTrace trace, JetFile file) { + private static void delegationSpecifierAdditionalResolve( + KotlinCodeAnalyzer analyzer, + JetDelegationSpecifierList specifier, DelegatingBindingTrace trace, JetFile file) { BodyResolver bodyResolver = createBodyResolverWithEmptyContext(trace, file, analyzer.getModuleConfiguration()); JetClassOrObject classOrObject = (JetClassOrObject) specifier.getParent(); @@ -174,7 +175,7 @@ public class ResolveSessionUtils { descriptor.getScopeForMemberDeclarationResolution()); } - private static void propertyAdditionalResolve(final ResolveSession resolveSession, final JetProperty jetProperty, DelegatingBindingTrace trace, JetFile file) { + private static void propertyAdditionalResolve(ResolveSession resolveSession, final JetProperty jetProperty, DelegatingBindingTrace trace, JetFile file) { final JetScope propertyResolutionScope = resolveSession.getInjector().getScopeProvider().getResolutionScopeForDeclaration( jetProperty); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java index f26fe38f6ba..e1e26923bfa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java @@ -65,7 +65,7 @@ public class ScopeProvider { } @NotNull - public JetScope getFileScope(final JetFile file) { + public JetScope getFileScope(JetFile file) { return fileScopes.fun(file); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java index 5249dd9b8e3..32ce00a3e9e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java @@ -73,7 +73,7 @@ public abstract class JetClassOrObjectInfo implement PsiFile file = element.getContainingFile(); if (file instanceof JetFile) { JetFile jetFile = (JetFile) file; - final JetNamespaceHeader header = jetFile.getNamespaceHeader(); + JetNamespaceHeader header = jetFile.getNamespaceHeader(); return header != null ? header.getFqName() : FqName.ROOT; } throw new IllegalArgumentException("Not in a JetFile: " + element); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java index 83b9f6c879d..8fcb4f78688 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java @@ -145,7 +145,7 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope result) { + protected void getNonDeclaredFunctions(@NotNull Name name, @NotNull Set result) { Collection fromSupertypes = Lists.newArrayList(); for (JetType supertype : thisDescriptor.getTypeConstructor().getSupertypes()) { fromSupertypes.addAll(supertype.getMemberScope().getFunctions(name)); @@ -229,7 +229,7 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope result) { + protected void getNonDeclaredProperties(@NotNull Name name, @NotNull Set result) { JetClassLikeInfo classInfo = declarationProvider.getOwnerInfo(); // From primary constructor parameters diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java index 5dc35822588..b5cef06bcc3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/storage/LockBasedStorageManager.java @@ -44,7 +44,7 @@ public class LockBasedStorageManager implements StorageManager { @NotNull @Override public MemoizedFunctionToNotNull createMemoizedFunction( - @NotNull final Function compute, @NotNull final ReferenceKind valuesReferenceKind + @NotNull Function compute, @NotNull ReferenceKind valuesReferenceKind ) { ConcurrentMap map = createConcurrentMap(valuesReferenceKind); return new MapBasedMemoizedFunctionToNotNull(lock, map, compute); @@ -53,7 +53,7 @@ public class LockBasedStorageManager implements StorageManager { @NotNull @Override public MemoizedFunctionToNullable createMemoizedFunctionWithNullableValues( - @NotNull final Function compute, @NotNull final ReferenceKind valuesReferenceKind + @NotNull Function compute, @NotNull ReferenceKind valuesReferenceKind ) { ConcurrentMap map = createConcurrentMap(valuesReferenceKind); return new MapBasedMemoizedFunction(lock, map, compute); @@ -187,7 +187,7 @@ public class LockBasedStorageManager implements StorageManager { @Override @Nullable - public V fun(@NotNull final K input) { + public V fun(@NotNull K input) { Object value = cache.get(input); if (value != null) return Nulls.unescape(value); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java index d8f37b14bc8..56edb67ee93 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java @@ -54,7 +54,7 @@ public final class JetScopeUtils { * @return extension descriptors. */ public static Collection getAllExtensions(@NotNull JetScope scope) { - final Set result = Sets.newHashSet(); + Set result = Sets.newHashSet(); for (DeclarationDescriptor descriptor : scope.getAllDescriptors()) { if (descriptor instanceof CallableDescriptor) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/CommonSupertypes.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/CommonSupertypes.java index 2a2d93b8076..6c43f506593 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/CommonSupertypes.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/CommonSupertypes.java @@ -88,7 +88,7 @@ public class CommonSupertypes { private static Map> computeCommonRawSupertypes(@NotNull Collection types) { assert !types.isEmpty(); - final Map> constructorToAllInstances = new HashMap>(); + Map> constructorToAllInstances = new HashMap>(); Set commonSuperclasses = null; List order = null; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java index 4a129e4f18c..0203e106743 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java @@ -97,7 +97,7 @@ public class DescriptorSubstitutor { @NotNull public static TypeSubstitutor createUpperBoundsSubstitutor( - @NotNull final List typeParameters + @NotNull List typeParameters ) { Map mutableSubstitution = Maps.newHashMap(); TypeSubstitutor substitutor = TypeSubstitutor.create(mutableSubstitution); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java index 12e6514aefd..c84ca3f9332 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java @@ -128,7 +128,7 @@ public class ExpressionTypingServices { } @NotNull - public JetTypeInfo getTypeInfo(@NotNull final JetScope scope, @NotNull JetExpression expression, @NotNull JetType expectedType, @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace) { + public JetTypeInfo getTypeInfo(@NotNull JetScope scope, @NotNull JetExpression expression, @NotNull JetType expectedType, @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace) { ExpressionTypingContext context = ExpressionTypingContext.newContext( this, trace, scope, dataFlowInfo, expectedType, ExpressionPosition.FREE ); @@ -136,7 +136,7 @@ public class ExpressionTypingServices { } @Nullable - public JetType getType(@NotNull final JetScope scope, @NotNull JetExpression expression, @NotNull JetType expectedType, @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace) { + public JetType getType(@NotNull JetScope scope, @NotNull JetExpression expression, @NotNull JetType expectedType, @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace) { return getTypeInfo(scope, expression, expectedType, dataFlowInfo, trace).getType(); } @@ -174,8 +174,8 @@ public class ExpressionTypingServices { JetExpression bodyExpression = function.getBodyExpression(); if (bodyExpression == null) return; - final boolean blockBody = function.hasBlockBody(); - final ExpressionTypingContext newContext = + boolean blockBody = function.hasBlockBody(); + ExpressionTypingContext newContext = blockBody ? context.replaceExpectedType(NO_EXPECTED_TYPE) : context; @@ -289,19 +289,19 @@ public class ExpressionTypingServices { JetTypeInfo result = JetTypeInfo.create(null, context.dataFlowInfo); for (Iterator iterator = block.iterator(); iterator.hasNext(); ) { - final JetElement statement = iterator.next(); + JetElement statement = iterator.next(); if (!(statement instanceof JetExpression)) { continue; } trace.record(STATEMENT, statement); - final JetExpression statementExpression = (JetExpression) statement; + JetExpression statementExpression = (JetExpression) statement; //TODO constructor assert context.expectedType != FORBIDDEN : "" if (!iterator.hasNext()) { if (context.expectedType != NO_EXPECTED_TYPE) { if (coercionStrategyForLastExpression == CoercionStrategy.COERCION_TO_UNIT && KotlinBuiltIns.getInstance().isUnit(context.expectedType)) { // This implements coercion to Unit TemporaryBindingTrace temporaryTraceExpectingUnit = TemporaryBindingTrace.create(trace, "trace to resolve coercion to unit with expected type"); - final boolean[] mismatch = new boolean[1]; + boolean[] mismatch = new boolean[1]; ObservableBindingTrace errorInterceptingTrace = makeTraceInterceptingTypeMismatch(temporaryTraceExpectingUnit, statementExpression, mismatch); newContext = createContext(newContext, errorInterceptingTrace, scope, newContext.dataFlowInfo, context.expectedType); result = blockLevelVisitor.getTypeInfo(statementExpression, newContext, true); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java index 6f6dae90bae..1042cb88c9e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java @@ -286,7 +286,7 @@ public class ExpressionTypingUtils { int index = 0; List fakeArguments = Lists.newArrayList(); for (JetType type : argumentTypes) { - final JetReferenceExpression fakeArgument = JetPsiFactory.createSimpleName(context.expressionTypingServices.getProject(), "fakeArgument" + index++); + JetReferenceExpression fakeArgument = JetPsiFactory.createSimpleName(context.expressionTypingServices.getProject(), "fakeArgument" + index++); fakeArguments.add(fakeArgument); traceWithFakeArgumentInfo.record(EXPRESSION_TYPE, fakeArgument, type); } @@ -336,7 +336,7 @@ public class ExpressionTypingUtils { ) { int componentIndex = 1; for (JetMultiDeclarationEntry entry : multiDeclaration.getEntries()) { - final Name componentName = Name.identifier(DescriptorResolver.COMPONENT_FUNCTION_NAME_PREFIX + componentIndex); + Name componentName = Name.identifier(DescriptorResolver.COMPONENT_FUNCTION_NAME_PREFIX + componentIndex); componentIndex++; JetType expectedType = getExpectedTypeForComponent(context, entry); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java index 26866f6bc70..e4ba036ea08 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java @@ -43,7 +43,7 @@ public class ExpressionTypingVisitorDispatcher extends JetVisitor javaArgs = new ArrayList(); javaArgs.add("-cp"); @@ -97,7 +97,7 @@ public abstract class KotlinIntegrationTestBase { } private static String replacePath(String content, File path, String pathId) { - final String absolutePath = path.getAbsolutePath(); + String absolutePath = path.getAbsolutePath(); return content .replace(absolutePath + "/", pathId + "/") @@ -113,17 +113,17 @@ public abstract class KotlinIntegrationTestBase { } protected void check(String baseName, String content) throws IOException { - final File actualFile = new File(testDataDir, baseName + ".actual"); - final File expectedFile = new File(testDataDir, baseName + ".expected"); + File actualFile = new File(testDataDir, baseName + ".actual"); + File expectedFile = new File(testDataDir, baseName + ".expected"); - final String normalizedContent = normalizeOutput(content); + String normalizedContent = normalizeOutput(content); if (!expectedFile.isFile()) { Files.write(normalizedContent, actualFile, Charsets.UTF_8); fail("No .expected file " + expectedFile); } else { - final String goldContent = FileUtil.loadFile(expectedFile, CharsetToolkit.UTF8, true); + String goldContent = FileUtil.loadFile(expectedFile, CharsetToolkit.UTF8, true); try { assertEquals(goldContent, normalizedContent); actualFile.delete(); @@ -135,7 +135,7 @@ public abstract class KotlinIntegrationTestBase { } } - protected static int runProcess(final GeneralCommandLine commandLine, final StringBuilder executionLog) throws ExecutionException { + protected static int runProcess(GeneralCommandLine commandLine, StringBuilder executionLog) throws ExecutionException { OSProcessHandler handler = new OSProcessHandler(commandLine.createProcess(), commandLine.getCommandLineString(), commandLine.getCharset()); @@ -175,23 +175,23 @@ public abstract class KotlinIntegrationTestBase { } protected static File getJavaRuntime() { - final File javaHome = new File(System.getProperty("java.home")); - final String javaExe = SystemInfo.isWindows ? "java.exe" : "java"; + File javaHome = new File(System.getProperty("java.home")); + String javaExe = SystemInfo.isWindows ? "java.exe" : "java"; - final File runtime = new File(javaHome, "bin" + File.separator + javaExe); + File runtime = new File(javaHome, "bin" + File.separator + javaExe); assertTrue("no java runtime at " + runtime, runtime.isFile()); return runtime; } protected static File getCompilerLib() { - final File file = new File(getKotlinProjectHome(), "dist" + File.separator + "kotlinc" + File.separator + "lib"); + File file = new File(getKotlinProjectHome(), "dist" + File.separator + "kotlinc" + File.separator + "lib"); assertTrue("no kotlin compiler lib at " + file, file.isDirectory()); return file; } protected static String getKotlinRuntimePath() { - final File file = new File(getCompilerLib(), "kotlin-runtime.jar"); + File file = new File(getCompilerLib(), "kotlin-runtime.jar"); assertTrue("no kotlin runtime at " + file, file.isFile()); return file.getAbsolutePath(); } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java index 6c050ff5eca..e5476108a11 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java @@ -95,7 +95,7 @@ class ClsWrapperStubPsiFactory extends StubPsiFactory { @Override public PsiMethod createMethod(PsiMethodStub stub) { - final PsiElement origin = ((StubBase) stub).getUserData(ORIGIN_ELEMENT); + PsiElement origin = ((StubBase) stub).getUserData(ORIGIN_ELEMENT); if (origin == null) { return delegate.createMethod(stub); } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java index b0047b134db..41239f5b720 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java @@ -70,7 +70,7 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade @Override public PsiClass findClass(@NotNull String qualifiedName, @NotNull GlobalSearchScope scope) { - final PsiClass[] allClasses = findClasses(qualifiedName, scope); + PsiClass[] allClasses = findClasses(qualifiedName, scope); return allClasses.length > 0 ? allClasses[0] : null; } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java index 66987395684..c2281f8dfdc 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetCodeBlockModificationListener.java @@ -31,12 +31,12 @@ public class JetCodeBlockModificationListener implements PsiTreeChangePreprocess private final PsiModificationTrackerImpl myModificationTracker; - public JetCodeBlockModificationListener(final PsiModificationTracker modificationTracker) { + public JetCodeBlockModificationListener(PsiModificationTracker modificationTracker) { myModificationTracker = (PsiModificationTrackerImpl) modificationTracker; } @Override - public void treeChanged(final PsiTreeChangeEventImpl event) { + public void treeChanged(PsiTreeChangeEventImpl event) { if (!(event.getFile() instanceof JetFile)) return; switch (event.getCode()) { case BEFORE_CHILDREN_CHANGE: @@ -71,7 +71,7 @@ public class JetCodeBlockModificationListener implements PsiTreeChangePreprocess } } - private void processChange(final PsiElement parent, final PsiElement child1, final PsiElement child2) { + private void processChange(PsiElement parent, PsiElement child1, PsiElement child2) { try { if (!isInsideCodeBlock(parent)) { if (parent != null && parent.getContainingFile() instanceof JetFile) { @@ -91,7 +91,7 @@ public class JetCodeBlockModificationListener implements PsiTreeChangePreprocess } } - private static boolean containsClassesInside(final PsiElement element) { + private static boolean containsClassesInside(PsiElement element) { if (element == null) return false; if (element instanceof PsiClass) return true; diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java index b045a0aaccf..660ef482d63 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java @@ -216,7 +216,7 @@ public class KotlinLightClassForExplicitDeclaration extends AbstractLightClass i } @Override - public Icon getElementIcon(final int flags) { + public Icon getElementIcon(int flags) { throw new UnsupportedOperationException("This should be done byt JetIconProvider"); } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java index 04da14f37dd..6c75391ed8f 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java @@ -125,7 +125,7 @@ public class KotlinLightClassForPackage extends KotlinLightClassForPackageBase i } @Override - public Icon getElementIcon(final int flags) { + public Icon getElementIcon(int flags) { throw new UnsupportedOperationException("This should be done byt JetIconProvider"); } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java index 245e625fc50..33540a8a4e6 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java @@ -51,7 +51,7 @@ public class KotlinLightTypeParameter extends AbstractLightClass implements PsiT } @Override - public void accept(@NotNull final PsiElementVisitor visitor) { + public void accept(@NotNull PsiElementVisitor visitor) { if (visitor instanceof JavaElementVisitor) { ((JavaElementVisitor) visitor).visitTypeParameter(this); } @@ -89,13 +89,13 @@ public class KotlinLightTypeParameter extends AbstractLightClass implements PsiT } @Override - public PsiAnnotation findAnnotation(@NotNull final String qualifiedName) { + public PsiAnnotation findAnnotation(@NotNull String qualifiedName) { return getDelegate().findAnnotation(qualifiedName); } @NotNull @Override - public PsiAnnotation addAnnotation(@NotNull final String qualifiedName) { + public PsiAnnotation addAnnotation(@NotNull String qualifiedName) { return getDelegate().addAnnotation(qualifiedName); } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java index 0af3e050409..01ec5211092 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java @@ -89,7 +89,7 @@ public class StubClassBuilder extends ClassBuilder { @Override public MethodVisitor newMethod(@Nullable PsiElement origin, int access, String name, String desc, @Nullable String signature, @Nullable String[] exceptions) { - final MethodVisitor internalVisitor = super.newMethod(origin, access, name, desc, signature, exceptions); + MethodVisitor internalVisitor = super.newMethod(origin, access, name, desc, signature, exceptions); if (internalVisitor != null) { // If stub for method generated @@ -101,7 +101,7 @@ public class StubClassBuilder extends ClassBuilder { @Override public FieldVisitor newField(@Nullable PsiElement origin, int access, String name, String desc, @Nullable String signature, @Nullable Object value) { - final FieldVisitor internalVisitor = super.newField(origin, access, name, desc, signature, value); + FieldVisitor internalVisitor = super.newField(origin, access, name, desc, signature, value); if (internalVisitor != null) { // If stub for field generated @@ -112,7 +112,7 @@ public class StubClassBuilder extends ClassBuilder { } private void markLastChild(@Nullable PsiElement origin) { - final List children = v.getResult().getChildrenStubs(); + List children = v.getResult().getChildrenStubs(); StubBase last = (StubBase) children.get(children.size() - 1); PsiElement oldOrigin = last.getUserData(ClsWrapperStubPsiFactory.ORIGIN_ELEMENT); @@ -126,7 +126,7 @@ public class StubClassBuilder extends ClassBuilder { @Override public void done() { if (!isNamespace) { - final StubElement pop = parentStack.pop(); + StubElement pop = parentStack.pop(); assert pop == v.getResult(); } super.done(); diff --git a/compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java b/compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java index b4a21cdea80..5b0538a95d5 100644 --- a/compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java +++ b/compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java @@ -34,7 +34,7 @@ public final class InTextDirectivesUtils { @Nullable public static Integer getPrefixedInt(String fileText, String prefix) { - final String[] numberStrings = findArrayWithPrefix(prefix, fileText); + String[] numberStrings = findArrayWithPrefix(prefix, fileText); if (numberStrings.length > 0) { return Integer.parseInt(numberStrings[0]); } diff --git a/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java b/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java index c65f48afcb3..4c2170204a8 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java +++ b/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java @@ -59,13 +59,13 @@ public abstract class JetTestCaseBuilder { } @NotNull - public static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, @NotNull NamedTestFactory factory) { + public static TestSuite suiteForDirectory(String baseDataDir, @NotNull String dataPath, boolean recursive, @NotNull NamedTestFactory factory) { return suiteForDirectory(baseDataDir, dataPath, recursive, KOTLIN_FILTER, factory); } @NotNull - public static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, - @NotNull final FilenameFilter filter, @NotNull NamedTestFactory factory) { + public static TestSuite suiteForDirectory(String baseDataDir, @NotNull String dataPath, boolean recursive, + @NotNull FilenameFilter filter, @NotNull NamedTestFactory factory) { TestSuite suite = new TestSuite(dataPath); appendTestsInDirectory(baseDataDir, dataPath, recursive, filter, factory, suite); return suite; diff --git a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java index c878de00d4d..feab6b38daf 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java +++ b/compiler/tests/org/jetbrains/jet/cfg/JetControlFlowTest.java @@ -69,7 +69,7 @@ public class JetControlFlowTest extends JetLiteFixture { protected void runTest() throws Throwable { JetFile file = loadPsiFile(myName + ".jet"); - final Map data = new LinkedHashMap(); + Map data = new LinkedHashMap(); AnalyzeExhaust analyzeExhaust = JetTestUtils.analyzeFile(file); List declarations = file.getDeclarations(); BindingContext bindingContext = analyzeExhaust.getBindingContext(); @@ -271,7 +271,7 @@ public class JetControlFlowTest extends JetLiteFixture { } public void dumpEdges(List instructions, final PrintStream out, final int[] count, final Map nodeToName) { - for (final Instruction fromInst : instructions) { + for (Instruction fromInst : instructions) { fromInst.accept(new InstructionVisitor() { @Override public void visitLocalDeclarationInstruction(LocalDeclarationInstruction instruction) { diff --git a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java index 1e6d9cc49aa..9be4115ad97 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java @@ -119,7 +119,7 @@ public class CheckerTestUtilTest extends JetLiteFixture { makeTestData(diagnostics, diagnosedRanges); - final List expectedMessages = Lists.newArrayList(expected); + List expectedMessages = Lists.newArrayList(expected); final List actualMessages = Lists.newArrayList(); CheckerTestUtil.diagnosticsDiff(diagnosedRanges, diagnostics, new CheckerTestUtil.DiagnosticDiffCallbacks() { diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java index 62b236b786b..0ba32fd1758 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java @@ -65,7 +65,7 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), text, jetCoreEnvironment.getProject()); assert psiFile != null; - final ClassFileFactory factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); + ClassFileFactory factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); String modifiedTestName = ktFile.getName().replace(".kt", ".class"); boolean isClassFound = false; @@ -73,8 +73,8 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT if (filename.equals(modifiedTestName)) { isClassFound = true; ClassReader cr = new ClassReader(factory.asBytes(filename)); - final List expectedLocalVariables = parseExpectations(); - final List actualLocalVariables = readLocalVariable(cr, parseMethodName()); + List expectedLocalVariables = parseExpectations(); + List actualLocalVariables = readLocalVariable(cr, parseMethodName()); assertEquals("Count of variables are different", expectedLocalVariables.size(), actualLocalVariables.size()); @@ -173,7 +173,7 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT } @Override - public MethodVisitor visitMethod(int access, String name, final String desc, final String signature, String[] exceptions) { + public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { if (methodName.equals(name + desc)) { return new MethodVisitor(Opcodes.ASM4) { @Override diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java index e1a1d71441e..396da87af41 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ClassGenTest.java @@ -39,95 +39,95 @@ public class ClassGenTest extends CodegenTestCase { public void testPSVMClass() { loadFile("classes/simpleClass.kt"); - final Class aClass = generateClass("SimpleClass"); - final Method[] methods = aClass.getDeclaredMethods(); + Class aClass = generateClass("SimpleClass"); + Method[] methods = aClass.getDeclaredMethods(); // public int SimpleClass.foo() assertEquals(1, methods.length); } public void testArrayListInheritance() throws Exception { loadFile("classes/inheritingFromArrayList.kt"); - final Class aClass = generateClass("Foo"); + Class aClass = generateClass("Foo"); assertInstanceOf(aClass.newInstance(), List.class); } public void testDelegationToVal() throws Exception { loadFile("classes/delegationToVal.kt"); - final ClassFileFactory state = generateClassesInFile(); - final GeneratedClassLoader loader = createClassLoader(state); - final Class aClass = loader.loadClass(PackageClassUtils.getPackageClassName(FqName.ROOT)); + ClassFileFactory state = generateClassesInFile(); + GeneratedClassLoader loader = createClassLoader(state); + Class aClass = loader.loadClass(PackageClassUtils.getPackageClassName(FqName.ROOT)); assertEquals("OK", aClass.getMethod("box").invoke(null)); - final Class test = loader.loadClass("Test"); + Class test = loader.loadClass("Test"); try { test.getDeclaredField("$delegate_0"); fail("$delegate_0 field generated for class Test but should not"); } catch (NoSuchFieldException e) {} - final Class test2 = loader.loadClass("Test2"); + Class test2 = loader.loadClass("Test2"); try { test2.getDeclaredField("$delegate_0"); fail("$delegate_0 field generated for class Test2 but should not"); } catch (NoSuchFieldException e) {} - final Class test3 = loader.loadClass("Test3"); - final Class iActing = loader.loadClass("IActing"); - final Object obj = test3.newInstance(); + Class test3 = loader.loadClass("Test3"); + Class iActing = loader.loadClass("IActing"); + Object obj = test3.newInstance(); assertTrue(iActing.isInstance(obj)); - final Method iActingMethod = iActing.getMethod("act"); + Method iActingMethod = iActing.getMethod("act"); assertEquals("OK", iActingMethod.invoke(obj)); assertEquals("OKOK", iActingMethod.invoke(test3.getMethod("getActing").invoke(obj))); } public void testNewInstanceExplicitConstructor() throws Exception { loadFile("classes/newInstanceDefaultConstructor.kt"); - final Method method = generateFunction("test"); - final Integer returnValue = (Integer) method.invoke(null); + Method method = generateFunction("test"); + Integer returnValue = (Integer) method.invoke(null); assertEquals(610, returnValue.intValue()); } public void testAbstractMethod() throws Exception { loadText("abstract class Foo { abstract fun x(): String; fun y(): Int = 0 }"); - final Class aClass = generateClass("Foo"); + Class aClass = generateClass("Foo"); assertNotNull(aClass.getMethod("x")); assertNotNull(findDeclaredMethodByName(aClass, "y")); } public void testAbstractClass() throws Exception { loadText("abstract class SimpleClass() { }"); - final Class aClass = generateClass("SimpleClass"); + Class aClass = generateClass("SimpleClass"); assertTrue((aClass.getModifiers() & Modifier.ABSTRACT) != 0); } public void testClassObjectInterface() throws Exception { loadFile("classes/classObjectInterface.kt"); - final Method method = generateFunction(); + Method method = generateFunction(); Object result = method.invoke(null); assertInstanceOf(result, Runnable.class); } public void testEnumClass() throws Exception { loadText("enum class Direction { NORTH; SOUTH; EAST; WEST }"); - final Class direction = generateClass("Direction"); - final Field north = direction.getField("NORTH"); + Class direction = generateClass("Direction"); + Field north = direction.getField("NORTH"); assertEquals(direction, north.getType()); assertInstanceOf(north.get(null), direction); } public void testEnumConstantConstructors() throws Exception { loadText("enum class Color(val rgb: Int) { RED: Color(0xFF0000); GREEN: Color(0x00FF00); }"); - final Class colorClass = generateClass("Color"); - final Field redField = colorClass.getField("RED"); - final Object redValue = redField.get(null); - final Method rgbMethod = colorClass.getMethod("getRgb"); + Class colorClass = generateClass("Color"); + Field redField = colorClass.getField("RED"); + Object redValue = redField.get(null); + Method rgbMethod = colorClass.getMethod("getRgb"); assertEquals(0xFF0000, rgbMethod.invoke(redValue)); } public void testKt309() { loadText("fun box() = null"); - final Method method = generateFunction("box"); + Method method = generateFunction("box"); assertEquals(method.getReturnType().getName(), "java.lang.Object"); } diff --git a/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java b/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java index 45739327be8..2919e199d1c 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java @@ -40,14 +40,14 @@ public class ControlStructuresTest extends CodegenTestCase { public void testIf() throws Exception { loadFile(); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(15, main.invoke(null, true)); assertEquals(20, main.invoke(null, false)); } public void testSingleBranchIf() throws Exception { loadFile(); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(15, main.invoke(null, true)); assertEquals(20, main.invoke(null, false)); } @@ -66,42 +66,42 @@ public class ControlStructuresTest extends CodegenTestCase { private void factorialTest(String name) throws Exception { loadFile(name); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(6, main.invoke(null, 3)); assertEquals(120, main.invoke(null, 5)); } public void testContinue() throws Exception { loadFile(); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(3, main.invoke(null, 4)); assertEquals(7, main.invoke(null, 5)); } public void testIfNoElse() throws Exception { loadFile(); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(5, main.invoke(null, 5, true)); assertEquals(10, main.invoke(null, 5, false)); } public void testCondJumpOnStack() throws Exception { loadText("import java.lang.Boolean as jlBoolean; fun foo(a: String): Int = if (jlBoolean.parseBoolean(a)) 5 else 10"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(5, main.invoke(null, "true")); assertEquals(10, main.invoke(null, "false")); } public void testFor() throws Exception { loadFile(); - final Method main = generateFunction(); + Method main = generateFunction(); List args = Arrays.asList("IntelliJ", " ", "IDEA"); assertEquals("IntelliJ IDEA", main.invoke(null, args)); } public void testIfBlock() throws Exception { loadFile(); - final Method main = generateFunction(); + Method main = generateFunction(); List args = Arrays.asList("IntelliJ", " ", "IDEA"); assertEquals("TTT", main.invoke(null, args)); args = Arrays.asList("JetBrains"); @@ -110,14 +110,14 @@ public class ControlStructuresTest extends CodegenTestCase { public void testForInArray() throws Exception { loadFile(); - final Method main = generateFunction(); + Method main = generateFunction(); String[] args = new String[] { "IntelliJ", " ", "IDEA" }; assertEquals("IntelliJ IDEA", main.invoke(null, new Object[] { args })); } public void testForInRange() throws Exception { loadText("fun foo(sb: StringBuilder) { for(x in 1..4) sb.append(x) }"); - final Method main = generateFunction(); + Method main = generateFunction(); StringBuilder stringBuilder = new StringBuilder(); main.invoke(null, stringBuilder); assertEquals("1234", stringBuilder.toString()); @@ -125,20 +125,20 @@ public class ControlStructuresTest extends CodegenTestCase { public void testThrowCheckedException() throws Exception { loadText("fun foo() { throw Exception(); }"); - final Method main = generateFunction(); + Method main = generateFunction(); assertThrows(main, Exception.class, null); } public void testTryCatch() throws Exception { loadFile(); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals("no message", main.invoke(null, "0")); assertEquals("For input string: \"a\"", main.invoke(null, "a")); } public void testTryFinally() throws Exception { loadFile(); - final Method main = generateFunction(); + Method main = generateFunction(); StringBuilder sb = new StringBuilder(); main.invoke(null, sb, "9"); assertEquals("foo9bar", sb.toString()); @@ -157,7 +157,7 @@ public class ControlStructuresTest extends CodegenTestCase { assertTrue(text.contains("IFNE")); assertFalse(text.contains("IF_ICMPEQ")); assertFalse(text.contains("IF_ICMPNE")); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(true, main.invoke(null, 0, 1)); assertEquals(false, main.invoke(null, 1, 0)); } @@ -166,14 +166,14 @@ public class ControlStructuresTest extends CodegenTestCase { loadText("fun foo(a: String?, b: String?): Boolean = a == null && b !== null && null == a && null !== b"); String text = generateToText(); assertTrue(!text.contains("java/lang/Object.equals")); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(true, main.invoke(null, null, "lala")); assertEquals(false, main.invoke(null, null, null)); } public void testCompareToNonnullableEq() throws Exception { loadText("fun foo(a: String?, b: String): Boolean = a == b || b == a"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(false, main.invoke(null, null, "lala")); assertEquals(true, main.invoke(null, "papa", "papa")); } @@ -182,7 +182,7 @@ public class ControlStructuresTest extends CodegenTestCase { loadText("fun foo(a: String?, b: String): Boolean = a != b"); String text = generateToText(); assertTrue(text.contains("IXOR")); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(true, main.invoke(null, null, "lala")); assertEquals(false, main.invoke(null, "papa", "papa")); } diff --git a/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java index 8a2a6281c76..6df1d4ccd67 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/EnumGenTest.java @@ -58,10 +58,10 @@ public class EnumGenTest extends CodegenTestCase { public void testEnumConstantConstructors() throws Exception { loadText("enum class Color(val rgb: Int) { RED: Color(0xFF0000); GREEN: Color(0x00FF00); }"); - final Class colorClass = generateClass("Color"); - final Field redField = colorClass.getField("RED"); - final Object redValue = redField.get(null); - final Method rgbMethod = colorClass.getMethod("getRgb"); + Class colorClass = generateClass("Color"); + Field redField = colorClass.getField("RED"); + Object redValue = redField.get(null); + Method rgbMethod = colorClass.getMethod("getRgb"); assertEquals(0xFF0000, rgbMethod.invoke(redValue)); } diff --git a/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java index 8dadb1a51fa..16a987fbdb9 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/FunctionGenTest.java @@ -39,11 +39,11 @@ public class FunctionGenTest extends CodegenTestCase { public void testNoRefToOuter() throws InvocationTargetException, IllegalAccessException, NoSuchMethodException, InstantiationException { loadText("class A() { fun f() : ()->String { val s = \"OK\"; return { -> s } } }"); Class foo = generateClass("A"); - final Object obj = foo.newInstance(); - final Method f = foo.getMethod("f"); - final Object closure = f.invoke(obj); - final Class aClass = closure.getClass(); - final Field[] fields = aClass.getDeclaredFields(); + Object obj = foo.newInstance(); + Method f = foo.getMethod("f"); + Object closure = f.invoke(obj); + Class aClass = closure.getClass(); + Field[] fields = aClass.getDeclaredFields(); assertEquals(1, fields.length); assertEquals("$s", fields[0].getName()); } diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java index a12e0074b5e..acbc2d66bea 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java +++ b/compiler/tests/org/jetbrains/jet/codegen/GenerationUtils.java @@ -41,14 +41,14 @@ public class GenerationUtils { @NotNull public static GenerationState compileFileGetGenerationStateForTest(@NotNull JetFile psiFile) { - final AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors( + AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors( psiFile, Collections.emptyList()); return compileFilesGetGenerationState(psiFile.getProject(), analyzeExhaust, Collections.singletonList(psiFile)); } @NotNull public static GenerationState compileManyFilesGetGenerationStateForTest(@NotNull Project project, @NotNull List files) { - final AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationAndCheckForErrors( + AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationAndCheckForErrors( project, files, Collections.emptyList(), Predicates.alwaysTrue()); return compileFilesGetGenerationState(project,analyzeExhaust, files); } diff --git a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java b/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java index 7347e564752..568c728990e 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java @@ -176,7 +176,7 @@ public class LineNumberTest extends TestCaseWithTmpdir { ClassVisitor visitor = new ClassVisitor(Opcodes.ASM4) { @Override - public MethodVisitor visitMethod(int access, String name, final String desc, final String signature, String[] exceptions) { + public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { return new MethodVisitor(Opcodes.ASM4) { private Label lastLabel; diff --git a/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java index 3b00bce8571..add094fc43e 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java @@ -37,51 +37,51 @@ public class NamespaceGenTest extends CodegenTestCase { public void testPSVM() throws Exception { loadFile("PSVM.kt"); - final Method main = generateFunction(); + Method main = generateFunction(); Object[] args = new Object[] { new String[0] }; main.invoke(null, args); } public void testReturnOne() throws Exception { loadText("fun f() : Int { return 42; }"); - final Method main = generateFunction(); - final Object returnValue = main.invoke(null, new Object[0]); + Method main = generateFunction(); + Object returnValue = main.invoke(null, new Object[0]); assertEquals(new Integer(42), returnValue); } public void testReturnA() throws Exception { loadText("fun foo(a : Int) = a"); - final Method main = generateFunction(); - final Object returnValue = main.invoke(null, 50); + Method main = generateFunction(); + Object returnValue = main.invoke(null, 50); assertEquals(new Integer(50), returnValue); } public void testLocalProperty() throws Exception { loadFile("localProperty.kt"); - final Method main = generateFunction(); - final Object returnValue = main.invoke(null, 76); + Method main = generateFunction(); + Object returnValue = main.invoke(null, 76); assertEquals(new Integer(50), returnValue); } public void testCurrentTime() throws Exception { loadText("fun f() : Long { return System.currentTimeMillis(); }"); - final Method main = generateFunction(); - final long returnValue = (Long) main.invoke(null); + Method main = generateFunction(); + long returnValue = (Long) main.invoke(null); assertIsCurrentTime(returnValue); } public void testIdentityHashCode() throws Exception { loadText("fun f(o: Any) : Int { return System.identityHashCode(o); }"); - final Method main = generateFunction(); + Method main = generateFunction(); Object o = new Object(); - final int returnValue = (Integer) main.invoke(null, o); + int returnValue = (Integer) main.invoke(null, o); assertEquals(returnValue, System.identityHashCode(o)); } public void testSystemOut() throws Exception { loadFile("systemOut.kt"); - final Method main = generateFunction(); - final Object returnValue = main.invoke(null); + Method main = generateFunction(); + Object returnValue = main.invoke(null); assertEquals(returnValue, System.out); } @@ -93,58 +93,58 @@ public class NamespaceGenTest extends CodegenTestCase { public void testAssign() throws Exception { loadFile("assign.kt"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(2, main.invoke(null)); } public void testBoxedInt() throws Exception { loadText("fun foo(a: Int?) = if (a != null) a else 239"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(610, main.invoke(null, 610)); assertEquals(239, main.invoke(null, new Object[]{null})); } public void testIntBoxed() throws Exception { loadText("fun foo(s: String): Int? = Integer.getInteger(s, 239)"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(239, main.invoke(null, "no.such.system.property")); } public void testBoxConstant() throws Exception { loadText("fun foo(): Int? = 239"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(239, main.invoke(null)); } public void testBoxVariable() throws Exception { loadText("fun foo(): Int? { var x = 239; return x; }"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(239, main.invoke(null)); } public void testAugAssign() throws Exception { loadText("fun foo(a: Int): Int { var x = a; x += 5; return x; }"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(10, main.invoke(null, 5)); } public void testBooleanNot() throws Exception { loadText("fun foo(b: Boolean): Boolean = !b"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(true, main.invoke(null, false)); assertEquals(false, main.invoke(null, true)); } public void testBooleanNotJump() throws Exception { loadText("fun foo(a: Int) : Int = if (!(a < 5)) a else 0"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(6, main.invoke(null, 6)); assertEquals(0, main.invoke(null, 4)); } public void testAnd() throws Exception { loadText("fun foo(a : Int): Boolean = a > 0 && a/0 > 0"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(false, main.invoke(null, 0)); boolean hadException = false; try { @@ -159,7 +159,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testOr() throws Exception { loadText("fun foo(a : Int): Boolean = a > 0 || a/0 > 0"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(true, main.invoke(null, 5)); boolean hadException = false; try { @@ -174,41 +174,41 @@ public class NamespaceGenTest extends CodegenTestCase { public void testBottles2() throws Exception { loadFile("bottles2.kt"); - final Method main = generateFunction(); + Method main = generateFunction(); main.invoke(null); // ensure no exception } public void testJavaConstructor() throws Exception { loadText("fun foo(): StringBuilder = StringBuilder()"); - final Method main = generateFunction(); - final Object result = main.invoke(null); + Method main = generateFunction(); + Object result = main.invoke(null); assertTrue(result instanceof StringBuilder); } public void testJavaConstructorWithParameters() throws Exception { loadText("fun foo(): StringBuilder = StringBuilder(\"beer\")"); - final Method main = generateFunction(); - final StringBuilder result = (StringBuilder) main.invoke(null); + Method main = generateFunction(); + StringBuilder result = (StringBuilder) main.invoke(null); assertEquals("beer", result.toString()); } public void testJavaEquals() throws Exception { loadText("fun foo(s1: String, s2: String) = s1 == s2"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(Boolean.TRUE, main.invoke(null, new String("jet"), new String("jet"))); assertEquals(Boolean.FALSE, main.invoke(null, new String("jet"), new String("ceylon"))); } public void testJavaNotEquals() throws Exception { loadText("fun foo(s1: String, s2: String) = s1 != s2"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(Boolean.FALSE, main.invoke(null, new String("jet"), new String("jet"))); assertEquals(Boolean.TRUE, main.invoke(null, new String("jet"), new String("ceylon"))); } public void testJavaEqualsNull() throws Exception { loadText("fun foo(s1: String?, s2: String?) = s1 == s2"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(Boolean.TRUE, main.invoke(null, null, null)); assertEquals(Boolean.FALSE, main.invoke(null, "jet", null)); assertEquals(Boolean.FALSE, main.invoke(null, null, "jet")); @@ -216,14 +216,14 @@ public class NamespaceGenTest extends CodegenTestCase { public void testEqualsNullLiteral() throws Exception { loadText("fun foo(s: String?) = s == null"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(Boolean.TRUE, main.invoke(null, new Object[] { null })); assertEquals(Boolean.FALSE, main.invoke(null, "jet")); } public void testTripleEq() throws Exception { loadText("fun foo(s1: String?, s2: String?) = s1 === s2"); - final Method main = generateFunction(); + Method main = generateFunction(); String s1 = new String("jet"); String s2 = new String("jet"); assertEquals(Boolean.TRUE, main.invoke(null, s1, s1)); @@ -232,7 +232,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testTripleNotEq() throws Exception { loadText("fun foo(s1: String?, s2: String?) = s1 !== s2"); - final Method main = generateFunction(); + Method main = generateFunction(); String s1 = new String("jet"); String s2 = new String("jet"); assertEquals(Boolean.FALSE, main.invoke(null, s1, s1)); @@ -241,62 +241,62 @@ public class NamespaceGenTest extends CodegenTestCase { public void testFunctionCall() throws Exception { loadFile("functionCall.kt"); - final Method main = generateFunction("f"); + Method main = generateFunction("f"); assertEquals("foo", main.invoke(null)); } public void testStringPlus() throws Exception { loadText("fun foo(s1: String, s2: String) = s1 + s2"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals("jetLang", main.invoke(null, "jet", "Lang")); } public void testStringPlusChained() throws Exception { loadText("fun foo(s1: String, s2: String, s3: String) = s1 + s2 + s3"); - final String text = generateToText(); - final int firstStringBuilderCreation = text.indexOf("NEW java/lang/StringBuilder"); + String text = generateToText(); + int firstStringBuilderCreation = text.indexOf("NEW java/lang/StringBuilder"); assertEquals(-1, text.indexOf("NEW java/lang/StringBuilder", firstStringBuilderCreation + 1)); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals("jet Lang", main.invoke(null, "jet", " ", "Lang")); } public void testStringPlusEq() throws Exception { loadText("fun foo(s: String) : String { var result = s; result += s; return result; } "); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals("JarJar", main.invoke(null, "Jar")); } public void testStringCompare() throws Exception { loadText("fun foo(s1: String, s2: String) = s1 < s2"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(Boolean.TRUE, main.invoke(null, "Ceylon", "Java")); assertEquals(Boolean.FALSE, main.invoke(null, "Jet", "Java")); } public void testElvis() throws Exception { loadText("fun foo(s: String?) = s ?: \"null\""); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals("jet", main.invoke(null, "jet")); assertEquals("null", main.invoke(null, new Object[] { null })); } public void testElvisInt() throws Exception { loadText("fun foo(a: Int?): Int = a ?: 239"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(610, main.invoke(null, 610)); assertEquals(239, main.invoke(null, new Object[]{null})); } public void testVarargs() throws Exception { loadText("fun foo() = java.util.Arrays.asList(\"IntelliJ\", \"IDEA\")"); - final Method main = generateFunction(); + Method main = generateFunction(); java.util.List list = (java.util.List) main.invoke(null); assertEquals(Arrays.asList("IntelliJ", "IDEA"), list); } public void testFieldRead() throws Exception { loadText("import java.awt.*; fun foo(c: GridBagConstraints) = c.gridx"); - final Method main = generateFunction(); + Method main = generateFunction(); GridBagConstraints c = new GridBagConstraints(); c.gridx = 239; assertEquals(239, main.invoke(null, c)); @@ -304,7 +304,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testFieldWrite() throws Exception { loadText("import java.awt.*; fun foo(c: GridBagConstraints) { c.gridx = 239 }"); - final Method main = generateFunction(); + Method main = generateFunction(); GridBagConstraints c = new GridBagConstraints(); main.invoke(null, c); assertEquals(239, c.gridx); @@ -312,7 +312,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testFieldIncrement() throws Exception { loadText("import java.awt.*; fun foo(c: GridBagConstraints) { c.gridx++; return; }"); - final Method main = generateFunction(); + Method main = generateFunction(); GridBagConstraints c = new GridBagConstraints(); c.gridx = 609; main.invoke(null, c); @@ -321,7 +321,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testFieldAugAssign() throws Exception { loadText("import java.awt.*; fun foo(c: GridBagConstraints) { c.gridx *= 2; return; }"); - final Method main = generateFunction(); + Method main = generateFunction(); GridBagConstraints c = new GridBagConstraints(); c.gridx = 305; main.invoke(null, c); @@ -335,13 +335,13 @@ public class NamespaceGenTest extends CodegenTestCase { public void testArrayRead() throws Exception { loadText("fun foo(c: Array) = c[0]"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals("main", main.invoke(null, new Object[]{new String[]{"main"}})); } public void testArrayWrite() throws Exception { loadText("fun foo(c: Array) { c[0] = \"jet\"; }"); - final Method main = generateFunction(); + Method main = generateFunction(); String[] array = new String[] { null }; main.invoke(null, new Object[] { array }); assertEquals("jet", array[0]); @@ -349,7 +349,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testArrayAugAssign() throws Exception { loadText("fun foo(c: Array) { c[0] *= 2 }"); - final Method main = generateFunction(); + Method main = generateFunction(); Integer[] data = new Integer[] { 5 }; main.invoke(null, new Object[] { data }); assertEquals(10, data[0].intValue()); @@ -357,7 +357,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testArrayAugAssignLong() throws Exception { loadText("fun foo(c: LongArray) { c[0] *= 2.toLong() }"); - final Method main = generateFunction(); + Method main = generateFunction(); long[] data = new long[] { 5 }; main.invoke(null, new Object[] { data }); assertEquals(10L, data[0]); @@ -365,7 +365,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testArrayNew() throws Exception { loadText("fun foo() = Array(4, { it })"); - final Method main = generateFunction(); + Method main = generateFunction(); Integer[] result = (Integer[]) main.invoke(null); assertEquals(4, result.length); assertEquals(0, result[0].intValue()); @@ -376,20 +376,20 @@ public class NamespaceGenTest extends CodegenTestCase { public void testArrayNewNullable() throws Exception { loadText("fun foo() = arrayOfNulls(4)"); - final Method main = generateFunction(); + Method main = generateFunction(); Integer[] result = (Integer[]) main.invoke(null); assertEquals(4, result.length); } public void testFloatArrayNew() throws Exception { loadText("fun foo() = FloatArray(4)"); - final Method main = generateFunction(); + Method main = generateFunction(); float[] result = (float[]) main.invoke(null); assertEquals(4, result.length); } public void testFloatArrayArrayNew() throws Exception { loadText("fun foo() = Array(4, { FloatArray(5-it) })"); - final Method main = generateFunction(); + Method main = generateFunction(); float[][] result = (float[][]) main.invoke(null); assertEquals(4, result.length); assertEquals(2, result[3].length); @@ -397,7 +397,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testArraySize() throws Exception { loadText("fun foo(a: Array) = a.size"); - final Method main = generateFunction(); + Method main = generateFunction(); Object[] args = new Object[] { new Integer[4] }; int result = (Integer) main.invoke(null, args); assertEquals(4, result); @@ -405,7 +405,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testIntArraySize() throws Exception { loadText("fun foo(a: IntArray) = a.size"); - final Method main = generateFunction(); + Method main = generateFunction(); Object[] args = new Object[] { new int[4] }; int result = (Integer) main.invoke(null, args); assertEquals(4, result); @@ -413,7 +413,7 @@ public class NamespaceGenTest extends CodegenTestCase { public void testIntRange() throws Exception { loadText("fun foo() = 1..10"); - final Method main = generateFunction(); + Method main = generateFunction(); IntRange result = (IntRange) main.invoke(null); assertTrue(result.contains(1)); assertTrue(result.contains(10)); @@ -422,37 +422,37 @@ public class NamespaceGenTest extends CodegenTestCase { public void testSubstituteJavaMethodTypeParameters() throws Exception { loadText("import java.util.*; fun foo(l: ArrayList) { l.add(10) }"); - final Method main = generateFunction(); - final ArrayList l = new ArrayList(); + Method main = generateFunction(); + ArrayList l = new ArrayList(); main.invoke(null, l); assertEquals(10, l.get(0).intValue()); } public void testCallMethodDeclaredInSuperclass() throws Exception { loadText("fun foo(sb: StringBuilder) = sb.charAt(0)"); - final Method main = generateFunction(); - final StringBuilder sb = new StringBuilder("x"); + Method main = generateFunction(); + StringBuilder sb = new StringBuilder("x"); assertEquals('x', ((Character) main.invoke(null, sb)).charValue()); } public void testPutBooleanAsVoid() throws Exception { loadText("class C(val x: Int) { { x > 0 } } fun box() { val c = C(0) } "); - final Method main = generateFunction(); + Method main = generateFunction(); main.invoke(null); // must not fail } public void testJavaInterfaceMethod() throws Exception { loadText("import java.util.*; fun foo(l: ArrayList) { l.add(\"foo\") }"); - final Method main = generateFunction(); - final ArrayList list = new ArrayList(); + Method main = generateFunction(); + ArrayList list = new ArrayList(); main.invoke(null, list); assertEquals("foo", list.get(0)); } public void testArrayAccessForArrayList() throws Exception { loadText("import java.util.*; fun foo(l: ArrayList) { l[0] = \"Jet\" + l[0]; }"); - final Method main = generateFunction(); - final ArrayList list = new ArrayList(); + Method main = generateFunction(); + ArrayList list = new ArrayList(); list.add("Language"); main.invoke(null, list); assertEquals("JetLanguage", list.get(0)); @@ -460,38 +460,38 @@ public class NamespaceGenTest extends CodegenTestCase { public void testEscapeSequence() throws Exception { loadText("fun foo() = \"a\\nb\\$\""); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals("a\nb$", main.invoke(null)); } public void testStringTemplate() throws Exception { loadText("fun foo(a: String) = \"IntelliJ $a Rulezzz\""); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals("IntelliJ IDEA Rulezzz", main.invoke(null, "IDEA")); } public void testExplicitCallOfBinaryOpIntrinsic() throws Exception { loadText("fun foo(a: Int) = a.plus(1)"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(2, ((Integer) main.invoke(null, 1)).intValue()); } public void testExplicitCallOfUnaryMinusIntrinsic() throws Exception { loadText("fun foo(a: Int) = a.minus()"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(-1, ((Integer) main.invoke(null, 1)).intValue()); } public void testExplicitCallOfBooleanNotIntrinsic() throws Exception { loadText("fun foo(a: Boolean) = a.not()"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(false, ((Boolean) main.invoke(null, true)).booleanValue()); } public void testAppendArrayToString() throws Exception { loadText("fun foo(a: String, b: Array) = a + b"); - final Method main = generateFunction(); - final String[] args = new String[] { "foo", "bar" }; + Method main = generateFunction(); + String[] args = new String[] { "foo", "bar" }; //noinspection ImplicitArrayToString assertEquals("s" + args.toString(), main.invoke(null, "s", args)); } diff --git a/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java b/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java index 739ac38c72b..b1125ff1e39 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/PrimitiveTypesTest.java @@ -30,15 +30,15 @@ public class PrimitiveTypesTest extends CodegenTestCase { public void testPlus() throws Exception { loadText("fun f(a: Int, b: Int): Int { return a + b }"); - final Method main = generateFunction(); - final int returnValue = (Integer) main.invoke(null, 37, 5); + Method main = generateFunction(); + int returnValue = (Integer) main.invoke(null, 37, 5); assertEquals(42, returnValue); } public void testGt() throws Exception { loadText("fun foo(f: Int): Boolean { if (f > 0) return true; return false; }"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(true, main.invoke(null, 1)); assertEquals(false, main.invoke(null, 0)); } @@ -53,28 +53,28 @@ public class PrimitiveTypesTest extends CodegenTestCase { public void testNE() throws Exception { loadText("fun foo(a: Int, b: Int): Int = if (a != b) 1 else 0"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(0, main.invoke(null, 5, 5)); assertEquals(1, main.invoke(null, 5, 3)); } public void testGE() throws Exception { loadText("fun foo(a: Int, b: Int): Int = if (a >= b) 1 else 0"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(1, main.invoke(null, 5, 5)); assertEquals(0, main.invoke(null, 3, 5)); } public void testReturnCmp() throws Exception { loadText("fun foo(a: Int, b: Int): Boolean = a == b"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(true, main.invoke(null, 1, 1)); assertEquals(false, main.invoke(null, 1, 2)); } public void testLong() throws Exception { loadText("fun foo(a: Long, b: Long): Long = a + b"); - final Method main = generateFunction(); + Method main = generateFunction(); long arg = (long) Integer.MAX_VALUE; long expected = 2 * (long) Integer.MAX_VALUE; assertEquals(expected, main.invoke(null, arg, arg)); @@ -82,7 +82,7 @@ public class PrimitiveTypesTest extends CodegenTestCase { public void testLongCmp() throws Exception { loadText("fun foo(a: Long, b: Long): Long = if (a == b) 0xffffffff else 0xfffffffe"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(0xffffffffL, main.invoke(null, 1, 1)); assertEquals(0xfffffffeL, main.invoke(null, 1, 0)); } @@ -114,7 +114,7 @@ public class PrimitiveTypesTest extends CodegenTestCase { public void testBooleanConstant() throws Exception { loadText("fun foo(): Boolean = true"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(true, main.invoke(null)); } @@ -141,26 +141,26 @@ public class PrimitiveTypesTest extends CodegenTestCase { public void testDoubleToJava() throws Exception { loadText("import java.lang.Double as jlDouble; fun foo(d: Double): String? = jlDouble.toString(d)"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals("1.0", main.invoke(null, 1.0)); } public void testDoubleToInt() throws Exception { loadText("fun foo(a: Double): Int = a.toInt()"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(1, main.invoke(null, 1.0)); } public void testCastConstant() throws Exception { loadText("fun foo(): Double = 1.toDouble()"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(1.0, main.invoke(null)); } public void testCastOnStack() throws Exception { loadText("fun foo(): Double = System.currentTimeMillis().toDouble()"); - final Class mainClass = generateNamespaceSrcClass(); - final Method main = mainClass.getDeclaredMethod("foo"); + Class mainClass = generateNamespaceSrcClass(); + Method main = mainClass.getDeclaredMethod("foo"); double currentTimeMillis = (double) System.currentTimeMillis(); double result = (Double) main.invoke(null); double delta = Math.abs(currentTimeMillis - result); @@ -169,43 +169,43 @@ public class PrimitiveTypesTest extends CodegenTestCase { public void testNeg() throws Exception { loadText("fun foo(a: Int): Int = -a"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(-10, main.invoke(null, 10)); } public void testPreIncrement() throws Exception { loadText("fun foo(a: Int): Int { var x = a; ++x; return x;}"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(11, main.invoke(null, 10)); } public void testPreIncrementValue() throws Exception { loadText("fun foo(a: Int): Int { var x = a; return ++x;}"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(11, main.invoke(null, 10)); } public void testPreDecrement() throws Exception { loadText("fun foo(a0: Int): Int { var a = a0; return --a;}"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(9, main.invoke(null, 10)); } public void testPreIncrementLong() throws Exception { loadText("fun foo(a0: Long): Long { var a = a0; return ++a}"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(11L, main.invoke(null, 10L)); } public void testPreIncrementFloat() throws Exception { loadText("fun foo(a0: Float): Float { var a = a0; return ++a }"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(2.0f, main.invoke(null, 1.0f)); } public void testPreIncrementDouble() throws Exception { loadText("fun foo(a0: Double): Double {var a = a0; return ++a }"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(2.0, main.invoke(null, 1.0)); } @@ -231,7 +231,7 @@ public class PrimitiveTypesTest extends CodegenTestCase { public void testBitInv() throws Exception { loadText("fun foo(a: Int): Int = a.inv()"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(0xffff0000, main.invoke(null, 0x0000ffff)); } @@ -245,31 +245,31 @@ public class PrimitiveTypesTest extends CodegenTestCase { public void testPostIncrementTypeInferenceFail() throws Exception { loadText("fun foo(a: Int): Int { var x = a; var y = x++; if (y+1 != x) return -1; return x; }"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(6, main.invoke(null, 5)); } public void testPostIncrement() throws Exception { loadText("fun foo(a: Int): Int { var x = a; var y = x++; return x*y; }"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(6, main.invoke(null, 2)); } public void testPostIncrementLong() throws Exception { loadText("fun foo(a: Long): Long { var x = a; var y = x++; return x*y; }"); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(6L, main.invoke(null, 2L)); } public void testDecrementAsStatement() throws Exception { loadFile("bottles.kt"); - final Method main = generateFunction(); + Method main = generateFunction(); main.invoke(null); // ensure no exception } - private void binOpTest(final String text, final Object arg1, final Object arg2, final Object expected) throws Exception { + private void binOpTest(String text, Object arg1, Object arg2, Object expected) throws Exception { loadText(text); - final Method main = generateFunction(); + Method main = generateFunction(); assertEquals(expected, main.invoke(null, arg1, arg2)); } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java index fb3f2ff27c1..bc4b5bc329c 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/PropertyGenTest.java @@ -40,17 +40,17 @@ public class PropertyGenTest extends CodegenTestCase { public void testPrivateVal() throws Exception { loadFile(); - final Class aClass = generateClass("PrivateVal"); - final Field[] fields = aClass.getDeclaredFields(); + Class aClass = generateClass("PrivateVal"); + Field[] fields = aClass.getDeclaredFields(); assertEquals(1, fields.length); // prop - final Field field = fields[0]; + Field field = fields[0]; assertEquals("prop", field.getName()); } public void testPrivateVar() throws Exception { loadFile(); - final Class aClass = generateClass("PrivateVar"); - final Object instance = aClass.newInstance(); + Class aClass = generateClass("PrivateVar"); + Object instance = aClass.newInstance(); Method setter = findDeclaredMethodByName(aClass, "setValueOfX"); setter.invoke(instance, 239); Method getter = findDeclaredMethodByName(aClass, "getValueOfX"); @@ -59,8 +59,8 @@ public class PropertyGenTest extends CodegenTestCase { public void testPublicVar() throws Exception { loadText("class PublicVar() { public var foo : Int = 0; }"); - final Class aClass = generateClass("PublicVar"); - final Object instance = aClass.newInstance(); + Class aClass = generateClass("PublicVar"); + Object instance = aClass.newInstance(); Method setter = findDeclaredMethodByName(aClass, "setFoo"); setter.invoke(instance, 239); Method getter = findDeclaredMethodByName(aClass, "getFoo"); @@ -69,17 +69,17 @@ public class PropertyGenTest extends CodegenTestCase { public void testAccessorsInInterface() { loadText("class AccessorsInInterface() { public var foo : Int = 0; }"); - final Class aClass = generateClass("AccessorsInInterface"); + Class aClass = generateClass("AccessorsInInterface"); assertNotNull(findDeclaredMethodByName(aClass, "getFoo")); assertNotNull(findDeclaredMethodByName(aClass, "setFoo")); } public void testPrivatePropertyInNamespace() throws Exception { loadText("private val x = 239"); - final Class nsClass = generateNamespaceSrcClass(); - final Field[] fields = nsClass.getDeclaredFields(); + Class nsClass = generateNamespaceSrcClass(); + Field[] fields = nsClass.getDeclaredFields(); assertEquals(1, fields.length); - final Field field = fields[0]; + Field field = fields[0]; field.setAccessible(true); assertEquals("x", field.getName()); assertEquals(Modifier.STATIC | Modifier.FINAL, field.getModifiers()); @@ -88,20 +88,20 @@ public class PropertyGenTest extends CodegenTestCase { public void testFieldPropertyAccess() throws Exception { loadFile("properties/fieldPropertyAccess.kt"); - final Method method = generateFunction("increment"); + Method method = generateFunction("increment"); assertEquals(1, method.invoke(null)); assertEquals(2, method.invoke(null)); } public void testFieldGetter() throws Exception { loadText("val now: Long get() = System.currentTimeMillis(); fun foo() = now"); - final Method method = generateFunction("foo"); + Method method = generateFunction("foo"); assertIsCurrentTime((Long) method.invoke(null)); } public void testFieldSetter() throws Exception { loadFile(); - final Method method = generateFunction("append"); + Method method = generateFunction("append"); method.invoke(null, "IntelliJ "); String value = (String) method.invoke(null, "IDEA"); if (!value.equals("IntelliJ IDEA")) { @@ -113,7 +113,7 @@ public class PropertyGenTest extends CodegenTestCase { public void testFieldSetterPlusEq() throws Exception { loadFile(); - final Method method = generateFunction("append"); + Method method = generateFunction("append"); method.invoke(null, "IntelliJ "); String value = (String) method.invoke(null, "IDEA"); assertEquals("IntelliJ IDEA", value); @@ -121,61 +121,61 @@ public class PropertyGenTest extends CodegenTestCase { public void testAccessorsWithoutBody() throws Exception { loadText("class AccessorsWithoutBody() { protected var foo: Int = 349\n get\n private set\n fun setter() { foo = 610; } } "); - final Class aClass = generateClass("AccessorsWithoutBody"); - final Object instance = aClass.newInstance(); - final Method getFoo = findDeclaredMethodByName(aClass, "getFoo"); + Class aClass = generateClass("AccessorsWithoutBody"); + Object instance = aClass.newInstance(); + Method getFoo = findDeclaredMethodByName(aClass, "getFoo"); getFoo.setAccessible(true); assertTrue((getFoo.getModifiers() & Modifier.PROTECTED) != 0); assertEquals(349, getFoo.invoke(instance)); - final Method setFoo = findDeclaredMethodByName(aClass, "setFoo"); + Method setFoo = findDeclaredMethodByName(aClass, "setFoo"); setFoo.setAccessible(true); assertTrue((setFoo.getModifiers() & Modifier.PRIVATE) != 0); - final Method setter = findDeclaredMethodByName(aClass, "setter"); + Method setter = findDeclaredMethodByName(aClass, "setter"); setter.invoke(instance); assertEquals(610, getFoo.invoke(instance)); } public void testInitializersForNamespaceProperties() throws Exception { loadText("val x = System.currentTimeMillis()"); - final Method method = generateFunction("getX"); + Method method = generateFunction("getX"); method.setAccessible(true); assertIsCurrentTime((Long) method.invoke(null)); } public void testPropertyReceiverOnStack() throws Exception { loadFile(); - final Class aClass = generateClass("Evaluator"); - final Constructor constructor = aClass.getConstructor(StringBuilder.class); + Class aClass = generateClass("Evaluator"); + Constructor constructor = aClass.getConstructor(StringBuilder.class); StringBuilder sb = new StringBuilder("xyzzy"); - final Object instance = constructor.newInstance(sb); - final Method method = aClass.getMethod("evaluateArg"); + Object instance = constructor.newInstance(sb); + Method method = aClass.getMethod("evaluateArg"); Integer result = (Integer) method.invoke(instance); assertEquals(5, result.intValue()); } public void testAbstractVal() throws Exception { loadText("abstract class Foo { public abstract val x: String }"); - final Class aClass = generateClass("Foo"); + Class aClass = generateClass("Foo"); assertNotNull(aClass.getMethod("getX")); } public void testVolatileProperty() throws Exception { loadText("abstract class Foo { public volatile var x: String = \"\"; }"); - final Class aClass = generateClass("Foo"); + Class aClass = generateClass("Foo"); Field x = aClass.getDeclaredField("x"); assertTrue((x.getModifiers() & Modifier.VOLATILE) != 0); } public void testKt160() throws Exception { loadText("internal val s = java.lang.Double.toString(1.0)"); - final Method method = generateFunction("getS"); + Method method = generateFunction("getS"); method.setAccessible(true); assertEquals(method.invoke(null), "1.0"); } public void testKt1846() { loadFile("regressions/kt1846.kt"); - final Class aClass = generateClass("A"); + Class aClass = generateClass("A"); try { Method v1 = aClass.getMethod("getV1"); System.out.println(generateToText()); @@ -195,7 +195,7 @@ public class PropertyGenTest extends CodegenTestCase { public void testKt2589() { loadFile("regressions/kt2589.kt"); - final Class aClass = generateClass("Foo"); + Class aClass = generateClass("Foo"); assertTrue((aClass.getModifiers() & Opcodes.ACC_FINAL) == 0); try { @@ -223,8 +223,8 @@ public class PropertyGenTest extends CodegenTestCase { public void testKt2677() { loadFile("regressions/kt2677.kt"); - final Class aClass = generateClass("DerivedWeatherReport"); - final Class bClass = aClass.getSuperclass(); + Class aClass = generateClass("DerivedWeatherReport"); + Class bClass = aClass.getSuperclass(); try { { diff --git a/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java index 27d4d934e1c..b7a03acf621 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java @@ -189,7 +189,7 @@ public class ScriptGenTest extends CodegenTestCase { public void testLanguage() { JetScriptDefinitionProvider.getInstance(myEnvironment.getProject()).addScriptDefinition(FIB_SCRIPT_DEFINITION); loadFile("script/fib.lang.kt"); - final Class aClass = generateClass("Fib"); + Class aClass = generateClass("Fib"); try { Constructor constructor = aClass.getConstructor(int.class); Field result = aClass.getDeclaredField("result"); @@ -205,7 +205,7 @@ public class ScriptGenTest extends CodegenTestCase { public void testLanguageWithPackage() { JetScriptDefinitionProvider.getInstance(myEnvironment.getProject()).addScriptDefinition(FIB_SCRIPT_DEFINITION); loadFile("script/fibwp.lang.kt"); - final Class aClass = generateClass("test.Fibwp"); + Class aClass = generateClass("test.Fibwp"); try { Constructor constructor = aClass.getConstructor(int.class); Field result = aClass.getDeclaredField("result"); @@ -221,7 +221,7 @@ public class ScriptGenTest extends CodegenTestCase { public void testDependentScripts() { JetScriptDefinitionProvider.getInstance(myEnvironment.getProject()).addScriptDefinition(FIB_SCRIPT_DEFINITION); loadFiles("script/fibwp.lang.kt", "script/fibwprunner.ktscript"); - final Class aClass = generateClass("Fibwprunner"); + Class aClass = generateClass("Fibwprunner"); try { Constructor constructor = aClass.getConstructor(); Field result = aClass.getDeclaredField("result"); @@ -244,7 +244,7 @@ public class ScriptGenTest extends CodegenTestCase { public void testScriptWhereMethodHasClosure() { JetScriptDefinitionProvider.getInstance(myEnvironment.getProject()).addScriptDefinition(FIB_SCRIPT_DEFINITION); loadFile("script/methodWithClosure.lang.kt"); - final Class aClass = generateClass("MethodWithClosure"); + Class aClass = generateClass("MethodWithClosure"); try { Constructor constructor = aClass.getConstructor(int.class); Object script = constructor.newInstance(239); diff --git a/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java b/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java index 041fad6e258..9860cd73f47 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/VarArgTest.java @@ -31,28 +31,28 @@ public class VarArgTest extends CodegenTestCase { public void testStringArray() throws InvocationTargetException, IllegalAccessException { loadText("fun test(vararg ts: String) = ts"); - final Method main = generateFunction(); + Method main = generateFunction(); String[] args = {"mama", "papa"}; assertTrue(args == main.invoke(null, new Object[]{ args } )); } public void testIntArray() throws InvocationTargetException, IllegalAccessException { loadText("fun test(vararg ts: Int) = ts"); - final Method main = generateFunction(); + Method main = generateFunction(); int[] args = {3, 4}; assertTrue(args == main.invoke(null, new Object[]{ args })); } public void testIntArrayKotlinNoArgs() throws InvocationTargetException, IllegalAccessException { loadText("fun test() = testf(); fun testf(vararg ts: Int) = ts"); - final Method main = generateFunction("test"); + Method main = generateFunction("test"); Object res = main.invoke(null); assertTrue(((int[])res).length == 0); } public void testIntArrayKotlin() throws InvocationTargetException, IllegalAccessException { loadText("fun test() = testf(239, 7); fun testf(vararg ts: Int) = ts"); - final Method main = generateFunction("test"); + Method main = generateFunction("test"); Object res = main.invoke(null); assertTrue(((int[])res).length == 2); assertTrue(((int[])res)[0] == 239); @@ -61,7 +61,7 @@ public class VarArgTest extends CodegenTestCase { public void testNullableIntArrayKotlin() throws InvocationTargetException, IllegalAccessException { loadText("fun test() = testf(239.toByte(), 7.toByte()); fun testf(vararg ts: Byte?) = ts"); - final Method main = generateFunction("test"); + Method main = generateFunction("test"); Object res = main.invoke(null); assertTrue(((Byte[])res).length == 2); assertTrue(((Byte[])res)[0] == (byte)239); @@ -70,7 +70,7 @@ public class VarArgTest extends CodegenTestCase { public void testIntArrayKotlinObj() throws InvocationTargetException, IllegalAccessException { loadText("fun test() = testf(\"239\"); fun testf(vararg ts: String) = ts"); - final Method main = generateFunction("test"); + Method main = generateFunction("test"); Object res = main.invoke(null); assertTrue(((String[])res).length == 1); assertTrue(((String[])res)[0].equals("239")); @@ -78,7 +78,7 @@ public class VarArgTest extends CodegenTestCase { public void testArrayT() throws InvocationTargetException, IllegalAccessException { loadText("fun test() = _array(2, 4); fun _array(vararg elements : T) = elements"); - final Method main = generateFunction("test"); + Method main = generateFunction("test"); Object res = main.invoke(null); assertTrue(((Integer[])res).length == 2); assertTrue(((Integer[])res)[0].equals(2)); @@ -87,14 +87,14 @@ public class VarArgTest extends CodegenTestCase { public void testArrayAsVararg() throws InvocationTargetException, IllegalAccessException { loadText("private fun asList(vararg elems: String) = elems; fun test(ts: Array) = asList(*ts); "); - final Method main = generateFunction("test"); + Method main = generateFunction("test"); String[] args = {"mama", "papa"}; assertTrue(args == main.invoke(null, new Object[]{ args } )); } public void testArrayAsVararg2() throws InvocationTargetException, IllegalAccessException { loadText("private fun asList(vararg elems: String) = elems; fun test(ts1: Array, ts2: String) = asList(*ts1, ts2); "); - final Method main = generateFunction("test"); + Method main = generateFunction("test"); Object invoke = main.invoke(null, new Object[] {new String[] {"mama"}, "papa" }); assertInstanceOf(invoke, String[].class); assertEquals(2, Array.getLength(invoke)); diff --git a/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java index 202d1f4164c..08de35b1b43 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java @@ -66,7 +66,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase { JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), fileText, jetCoreEnvironment.getProject()); assertTrue("Cannot create JetFile from text", psiFile != null); - final ClassFileFactory factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); + ClassFileFactory factory = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile); TestedObject testedObject = parseExpectedTestedObject(fileText); diff --git a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestPackJdkAnnotations.java b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestPackJdkAnnotations.java index f7b403f997b..b1561ec6a24 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestPackJdkAnnotations.java +++ b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestPackJdkAnnotations.java @@ -63,7 +63,7 @@ public class ForTestPackJdkAnnotations { if (ForTestCompileSomething.ACTUALLY_COMPILE) { return getJarFile(); } - final File jdkAnnotations = new File("dist/kotlinc/lib/kotlin-jdk-annotations.jar"); + File jdkAnnotations = new File("dist/kotlinc/lib/kotlin-jdk-annotations.jar"); if (!jdkAnnotations.exists()) { throw new RuntimeException("Kotlin JDK annotations jar not found; please run 'ant dist' to build it"); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java index 4e8ab9b6456..73a8f133efb 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java @@ -56,7 +56,7 @@ public class CompileEnvironmentTest extends TestCase { try { JarInputStream is = new JarInputStream(fileInputStream); try { - final List entries = listEntries(is); + List entries = listEntries(is); assertTrue(entries.contains("Smoke/" + PackageClassUtils.getPackageClassName(new FqName("Smoke")) + ".class")); assertEquals(2, entries.size()); } @@ -97,7 +97,7 @@ public class CompileEnvironmentTest extends TestCase { private static List listEntries(JarInputStream is) throws IOException { List entries = new ArrayList(); while (true) { - final JarEntry jarEntry = is.getNextJarEntry(); + JarEntry jarEntry = is.getNextJarEntry(); if (jarEntry == null) { break; } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java index fef1034222b..1dd31921ecd 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java @@ -82,7 +82,7 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase { public void testNoErrorsInAlternativeSignatures() { List affectedClasses = getAffectedClasses("file://jdk-annotations"); - final Map> errors = Maps.newLinkedHashMap(); + Map> errors = Maps.newLinkedHashMap(); for (int chunkIndex = 0; chunkIndex < affectedClasses.size() / CLASSES_IN_CHUNK + 1; chunkIndex++) { Disposable parentDisposable = CompileEnvironmentUtil.createMockDisposable(); @@ -127,7 +127,7 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase { } } - static List getAffectedClasses(final String rootUrl) { + static List getAffectedClasses(String rootUrl) { Disposable myDisposable = CompileEnvironmentUtil.createMockDisposable(); try { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java index a21004ac2bd..df8e6b67fd1 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java @@ -89,7 +89,7 @@ public class WriteSignatureTest extends TestCaseWithTmpdir { Disposer.dispose(myTestRootDisposable); - final Expectation expectation = parseExpectations(); + Expectation expectation = parseExpectations(); ActualSignature actualSignature = readSignature(expectation.className, expectation.methodName); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index c87faed5d5f..c1c854062b7 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -89,7 +89,7 @@ public class LazyResolveTestUtil { ModuleDescriptor javaModule = new ModuleDescriptor(Name.special("")); - final Project project = environment.getProject(); + Project project = environment.getProject(); BindingTrace sharedTrace = CliLightClassGenerationSupport.getInstanceForCli(environment.getProject()).getTrace(); InjectorForJavaDescriptorResolver injector = new InjectorForJavaDescriptorResolver(project, sharedTrace, javaModule); @@ -98,7 +98,7 @@ public class LazyResolveTestUtil { LockBasedStorageManager storageManager = new LockBasedStorageManager(); - final FileBasedDeclarationProviderFactory declarationProviderFactory = new FileBasedDeclarationProviderFactory(storageManager, files, new Predicate() { + FileBasedDeclarationProviderFactory declarationProviderFactory = new FileBasedDeclarationProviderFactory(storageManager, files, new Predicate() { @Override public boolean apply(FqName fqName) { return psiClassFinder.findPsiPackage(fqName) != null || new FqName("jet").equals(fqName); diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 2201f9ff865..0b2ca100c4f 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -158,7 +158,7 @@ public abstract class ExpectedResolveData { public final void checkResult(BindingContext bindingContext) { KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance(); - final Set unresolvedReferences = Sets.newHashSet(); + Set unresolvedReferences = Sets.newHashSet(); for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) { unresolvedReferences.add(diagnostic.getPsiElement()); diff --git a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java index 1274a3df0d9..7d9c17ddd57 100644 --- a/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java +++ b/ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/KotlinCompilerRunner.java @@ -100,7 +100,7 @@ public class KotlinCompilerRunner { CompilerEnvironment environment, File scriptFile ) { - final SimpleJavaParameters params = new SimpleJavaParameters(); + SimpleJavaParameters params = new SimpleJavaParameters(); params.setJdk(new SimpleJavaSdkType().createJdk("tmp", SystemProperties.getJavaHome())); params.setMainClass("org.jetbrains.jet.cli.jvm.K2JVMCompiler"); @@ -117,7 +117,7 @@ public class KotlinCompilerRunner { Sdk sdk = params.getJdk(); - final GeneralCommandLine commandLine = JdkUtil.setupJVMCommandLine( + GeneralCommandLine commandLine = JdkUtil.setupJVMCommandLine( ((JavaSdkType) sdk.getSdkType()).getVMExecutablePath(sdk), params, false); messageCollector.report(CompilerMessageSeverity.INFO, diff --git a/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java b/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java index 315594581ca..5646c25cac2 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java +++ b/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java @@ -38,7 +38,7 @@ public class JetPairMatcher implements PairedBraceMatcher { } @Override - public boolean isPairedBracesAllowedBeforeType(@NotNull final IElementType lbraceType, @Nullable final IElementType contextType) { + public boolean isPairedBracesAllowedBeforeType(@NotNull IElementType lbraceType, @Nullable IElementType contextType) { return JetTokens.WHITE_SPACE_OR_COMMENT_BIT_SET.contains(contextType) || contextType == JetTokens.SEMICOLON || contextType == JetTokens.COMMA @@ -49,7 +49,7 @@ public class JetPairMatcher implements PairedBraceMatcher { } @Override - public int getCodeConstructStart(final PsiFile file, final int openingBraceOffset) { + public int getCodeConstructStart(PsiFile file, int openingBraceOffset) { return openingBraceOffset; } diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index 368facac826..b99933f42fe 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -80,7 +80,7 @@ public class JetQuickDocumentationProvider extends AbstractDocumentationProvider return renderedDecl; } else if (mergeKotlinAndJava) { - final String originalInfo = new JavaDocumentationProvider().getQuickNavigateInfo(element, originalElement); + String originalInfo = new JavaDocumentationProvider().getQuickNavigateInfo(element, originalElement); if (originalInfo != null) { return renderedDecl + "\nJava declaration:\n" + originalInfo; } diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java index 9411bde9687..243274acf76 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java @@ -34,7 +34,7 @@ import static org.jetbrains.jet.plugin.actions.JavaToKotlinActionUtil.*; public class JavaToKotlinAction extends AnAction { @Override - public void actionPerformed(final AnActionEvent e) { + public void actionPerformed(AnActionEvent e) { VirtualFile[] virtualFiles = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); assert virtualFiles != null; final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext()); @@ -60,7 +60,7 @@ public class JavaToKotlinAction extends AnAction { new Runnable() { @Override public void run() { - final List newFiles = convertFiles(converter, allJavaFilesNear); + List newFiles = convertFiles(converter, allJavaFilesNear); if (finalRemoveIt) { deleteFiles(allJavaFilesNear); } @@ -93,7 +93,7 @@ public class JavaToKotlinAction extends AnAction { @Override public void update(AnActionEvent e) { - final boolean enabled = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY) != null; + boolean enabled = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY) != null; e.getPresentation().setVisible(enabled); e.getPresentation().setEnabled(enabled); } diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinActionUtil.java b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinActionUtil.java index ce298d98cf4..e34aead9d45 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinActionUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinActionUtil.java @@ -55,10 +55,10 @@ public class JavaToKotlinActionUtil { @NotNull /*package*/ static List getAllJavaFiles(@NotNull VirtualFile[] vFiles, Project project) { Set filesSet = allVirtualFiles(vFiles); - final PsiManager manager = PsiManager.getInstance(project); - final List res = new ArrayList(); - for (final VirtualFile file : filesSet) { - final PsiFile psiFile = manager.findFile(file); + PsiManager manager = PsiManager.getInstance(project); + List res = new ArrayList(); + for (VirtualFile file : filesSet) { + PsiFile psiFile = manager.findFile(file); if (psiFile != null && psiFile.getFileType() instanceof JavaFileType) { res.add(psiFile); } @@ -138,7 +138,7 @@ public class JavaToKotlinActionUtil { //noinspection CallToPrintStackTrace e.printStackTrace(); } - final PsiManager manager = psiFile.getManager(); + PsiManager manager = psiFile.getManager(); assert manager != null; VirtualFile copy = virtualFile.copy(manager, virtualFile.getParent(), virtualFile.getNameWithoutExtension() + ".kt"); copy.setBinaryContent(CharsetToolkit.getUtf8Bytes(result)); diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java index c400029b7eb..5bdfc70e97e 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java @@ -146,7 +146,7 @@ public class JetAddImportAction implements QuestionAction { }; } - protected static void addImport(final PsiElement element, final Project project, final FqName selectedImport) { + protected static void addImport(final PsiElement element, Project project, final FqName selectedImport) { PsiDocumentManager.getInstance(project).commitAllDocuments(); CommandProcessor.getInstance().executeCommand(project, new Runnable() { diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java b/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java index cfdb495f9d9..8f33d91c7d4 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java @@ -151,7 +151,7 @@ class JetFromJavaDescriptorHelper { PsiClass containingClass = method.getContainingClass(); if (containingClass != null) { - final String qualifiedName = containingClass.getQualifiedName(); + String qualifiedName = containingClass.getQualifiedName(); assert qualifiedName != null; FqName classFQN = new FqName(qualifiedName); @@ -199,7 +199,7 @@ class JetFromJavaDescriptorHelper { Collection annotations = JavaAnnotationIndex.getInstance().get(annotationName, project, scope); for (PsiAnnotation annotation : annotations) { PsiModifierList modifierList = (PsiModifierList) annotation.getParent(); - final PsiElement owner = modifierList.getParent(); + PsiElement owner = modifierList.getParent(); if (owner instanceof PsiClass) { classes.add((PsiClass) owner); } diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java b/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java index fec6919340b..58d6c0e95b8 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java @@ -60,7 +60,7 @@ public class JetGotoClassContributor implements GotoClassContributor { @NotNull @Override public NavigationItem[] getItemsByName(String name, String pattern, Project project, boolean includeNonProjectItems) { - final GlobalSearchScope scope = GlobalSearchScope.allScope(project); + GlobalSearchScope scope = GlobalSearchScope.allScope(project); PsiClass[] classes = JetShortNamesCache.getKotlinInstance(project).getClassesByName(name, scope); Collection javaQualifiedNames = new HashSet(); diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoSymbolContributor.java b/idea/src/org/jetbrains/jet/plugin/caches/JetGotoSymbolContributor.java index 36d85756629..e5082e92f4a 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoSymbolContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/JetGotoSymbolContributor.java @@ -53,7 +53,7 @@ public class JetGotoSymbolContributor implements ChooseByNameContributor { Collection properties = StubIndex.getInstance().get( JetShortPropertiesNameIndex.getInstance().getKey(), name, project, scope); - final List items = new ArrayList(Collections2.filter(functions, Predicates.notNull())); + List items = new ArrayList(Collections2.filter(functions, Predicates.notNull())); items.addAll(properties); return ArrayUtil.toObjectArray(items, NavigationItem.class); diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java index 2bb464a12e5..f0e8e565501 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java @@ -113,7 +113,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport } @NotNull - public MultiMap getAllPackageClasses(@NotNull final GlobalSearchScope scope) { + public MultiMap getAllPackageClasses(@NotNull GlobalSearchScope scope) { Collection packageFqNames = JetAllPackagesIndex.getInstance().getAllKeys(project); MultiMap result = new MultiMap(); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java index 1d26e095d70..c3a25a2bbab 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java @@ -67,7 +67,7 @@ public class DescriptorClassMember extends MemberChooserObjectBase implements Cl @Override public MemberChooserObject getParentNodeDelegate() { - final DeclarationDescriptor parent = myDescriptor.getContainingDeclaration(); + DeclarationDescriptor parent = myDescriptor.getContainingDeclaration(); PsiElement declaration; if (myPsiElement instanceof JetDeclaration) { // kotlin diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java index 06750bd49e2..bd7ef16d1cc 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java @@ -57,7 +57,7 @@ public class GotoSuperActionHandler implements CodeInsightActionHandler { final BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile((JetFile) file).getBindingContext(); - final DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, funOrClass); + DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, funOrClass); Collection superDescriptors; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index f637cc09325..7a956d29c9b 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java @@ -80,7 +80,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns } List elementsToCompact = new ArrayList(); - final JetFile file = (JetFile) classOrObject.getContainingFile(); + JetFile file = (JetFile) classOrObject.getContainingFile(); for (JetElement element : generateOverridingMembers(selectedElements, file)) { PsiElement added = body.addAfter(element, afterAnchor); afterAnchor = added; @@ -116,7 +116,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns private static List generateOverridingMembers(List selectedElements, JetFile file) { List overridingMembers = new ArrayList(); for (DescriptorClassMember selectedElement : selectedElements) { - final DeclarationDescriptor descriptor = selectedElement.getDescriptor(); + DeclarationDescriptor descriptor = selectedElement.getDescriptor(); if (descriptor instanceof SimpleFunctionDescriptor) { overridingMembers.add(overrideFunction(file.getProject(), (SimpleFunctionDescriptor) descriptor)); } @@ -225,8 +225,8 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns if (!isAbstractFun) { delegationBuilder.append(")"); } - final JetType returnType = descriptor.getReturnType(); - final KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance(); + JetType returnType = descriptor.getReturnType(); + KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance(); boolean returnsNotUnit = returnType != null && !builtIns.getUnitType().equals(returnType); if (returnsNotUnit) { @@ -254,7 +254,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns @NotNull public Set collectMethodsToGenerate(@NotNull JetClassOrObject classOrObject, BindingContext bindingContext) { - final DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, classOrObject); + DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, classOrObject); if (descriptor instanceof MutableClassDescriptor) { return collectMethodsToGenerate((MutableClassDescriptor) descriptor); } @@ -267,7 +267,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns Project project, DescriptorClassMember[] members ) { - final MemberChooser chooser = new MemberChooser(members, true, true, project); + MemberChooser chooser = new MemberChooser(members, true, true, project); chooser.setTitle(getChooserTitle()); chooser.show(); if (chooser.getExitCode() != DialogWrapper.OK_EXIT_CODE) return null; @@ -281,15 +281,15 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns if (!(file instanceof JetFile)) { return false; } - final PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); - final JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(elementAtCaret, JetClassOrObject.class); + PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); + JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(elementAtCaret, JetClassOrObject.class); return classOrObject != null; } protected abstract String getNoMethodsFoundHint(); - public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull PsiFile file, boolean implementAll) { - final PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); + public void invoke(@NotNull Project project, @NotNull final Editor editor, @NotNull PsiFile file, boolean implementAll) { + PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); final JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(elementAtCaret, JetClassOrObject.class); assert classOrObject != null : "ClassObject should be checked in isValidFor method"; @@ -310,7 +310,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns selectedElements = members; } else { - final MemberChooser chooser = showOverrideImplementChooser( + MemberChooser chooser = showOverrideImplementChooser( project, members.toArray(new DescriptorClassMember[members.size()])); @@ -331,7 +331,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns } @Override - public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull PsiFile file) { + public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { invoke(project, editor, file, false); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java index 695a641537d..77966904202 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java @@ -26,7 +26,7 @@ import java.util.Set; public class OverrideMethodsHandler extends OverrideImplementMethodsHandler { @Override protected Set collectMethodsToGenerate(MutableClassDescriptor descriptor) { - final Set superMethods = OverrideResolver.collectSuperMethods(descriptor).keySet(); + Set superMethods = OverrideResolver.collectSuperMethods(descriptor).keySet(); for (CallableMemberDescriptor member : descriptor.getDeclaredCallableMembers()) { superMethods.removeAll(member.getOverriddenDescriptors()); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.java index 94730a05111..3f39628aea8 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.java @@ -51,8 +51,8 @@ public final class TipsManager { @NotNull public static Collection getReferenceVariants( - @NotNull final JetSimpleNameExpression expression, - @NotNull final BindingContext context + @NotNull JetSimpleNameExpression expression, + @NotNull BindingContext context ) { JetExpression receiverExpression = expression.getReceiverExpression(); if (receiverExpression != null) { @@ -146,9 +146,9 @@ public final class TipsManager { } public static Collection excludeNotCallableExtensions( - @NotNull Collection descriptors, @NotNull final JetScope scope + @NotNull Collection descriptors, @NotNull JetScope scope ) { - final Set descriptorsSet = Sets.newHashSet(descriptors); + Set descriptorsSet = Sets.newHashSet(descriptors); final List result = scope.getImplicitReceiversHierarchy(); @@ -194,7 +194,7 @@ public final class TipsManager { private static Set includeExternalCallableExtensions( @NotNull Collection descriptors, - @NotNull final JetScope externalScope, + @NotNull JetScope externalScope, @NotNull final ReceiverValue receiverValue ) { // It's impossible to add extension function for namespace diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java index 60fbe7c763e..b1c3e181b3b 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java @@ -48,7 +48,7 @@ public abstract class KotlinIfSurrounderBase extends KotlinStatementsSurrounder // TODO move a comment for first statement - final JetBlockExpression thenBranch = (JetBlockExpression) ifExpression.getThen(); + JetBlockExpression thenBranch = (JetBlockExpression) ifExpression.getThen(); assert thenBranch != null : "Then branch should exist for created if expression: " + ifExpression.getText(); // Add statements in then branch of created if KotlinSurrounderUtils.addStatementsInBlock(thenBranch, statements); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinStatementsSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinStatementsSurrounder.java index 93dd50169c1..0e5695d09ea 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinStatementsSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinStatementsSurrounder.java @@ -46,9 +46,9 @@ public abstract class KotlinStatementsSurrounder implements Surrounder { @Nullable protected abstract TextRange surroundStatements( - final Project project, - final Editor editor, - final PsiElement container, - final PsiElement[] statements + Project project, + Editor editor, + PsiElement container, + PsiElement[] statements ); } diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java index 399711b84aa..f949d3d41ea 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java @@ -44,7 +44,7 @@ public abstract class KotlinTrySurrounderBase extends KotlinStatementsSurrounder // TODO move a comment for first statement - final JetBlockExpression tryBlock = tryExpression.getTryBlock(); + JetBlockExpression tryBlock = tryExpression.getTryBlock(); // Add statements in try block of created try - catch - finally KotlinSurrounderUtils.addStatementsInBlock(tryBlock, statements); diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java index d03fb2fa8ac..ba1ce134746 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java @@ -68,16 +68,17 @@ public class JetCompiler implements TranslatingCompiler { } @Override - public void compile(final CompileContext compileContext, + public void compile( + CompileContext compileContext, Chunk moduleChunk, - final VirtualFile[] virtualFiles, + VirtualFile[] virtualFiles, OutputSink outputSink) { if (virtualFiles.length == 0) return; List productionFiles = new ArrayList(); List testFiles = new ArrayList(); for (VirtualFile file : virtualFiles) { - final boolean inTests = ((CompileContextEx)compileContext).isInTestSourceContent(file); + boolean inTests = ((CompileContextEx)compileContext).isInTestSourceContent(file); if (inTests) { testFiles.add(file); } @@ -86,7 +87,7 @@ public class JetCompiler implements TranslatingCompiler { } } - final Module module = compileContext.getModuleByFile(virtualFiles[0]); + Module module = compileContext.getModuleByFile(virtualFiles[0]); doCompile(compileContext, moduleChunk, productionFiles, module, outputSink, false); doCompile(compileContext, moduleChunk, testFiles, module, outputSink, true); diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java index 3ba90ae07c9..a64f4f701e1 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java @@ -55,7 +55,7 @@ public class JetCompilerManager implements ProjectComponent { boolean aborted, int errors, int warnings, CompileContext compileContext ) { for (CompilerMessage error : compileContext.getMessages(CompilerMessageCategory.ERROR)) { - final String message = error.getMessage(); + String message = error.getMessage(); if (message.startsWith(INTERNAL_ERROR_PREFIX) || message.startsWith(PREFIX_WITH_COMPILER_NAME)) { LOG.error(new KotlinCompilerException(message)); } diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java index d0024fd420d..1a24c284f61 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java @@ -67,7 +67,7 @@ public final class K2JSCompiler implements TranslatingCompiler { } @Override - public void compile(final CompileContext context, Chunk moduleChunk, final VirtualFile[] files, OutputSink sink) { + public void compile(CompileContext context, Chunk moduleChunk, VirtualFile[] files, OutputSink sink) { if (files.length == 0) { return; } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java index c6acc68412a..7e5a174deae 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java @@ -192,7 +192,7 @@ public final class DescriptorLookupConverter { @NotNull Iterable descriptors) { List result = Lists.newArrayList(); - for (final DeclarationDescriptor descriptor : descriptors) { + for (DeclarationDescriptor descriptor : descriptors) { result.add(createLookupElement(analyzer, bindingContext, descriptor)); } @@ -206,7 +206,7 @@ public final class DescriptorLookupConverter { @Override public void handleInsert(InsertionContext context) { - final InsertHandler handler = getInsertHandler(); + InsertHandler handler = getInsertHandler(); if (handler != null) { //noinspection unchecked ((InsertHandler)handler).handleInsert(context, this); @@ -224,7 +224,7 @@ public final class DescriptorLookupConverter { @Override public void handleInsert(InsertionContext context) { - final InsertHandler handler = getInsertHandler(); + InsertHandler handler = getInsertHandler(); if (handler != null) { //noinspection unchecked ((InsertHandler)handler).handleInsert(context, this); diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetExtensionReceiverTypeContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetExtensionReceiverTypeContributor.java index 3d540bf4650..778ea5519f5 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetExtensionReceiverTypeContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetExtensionReceiverTypeContributor.java @@ -35,7 +35,7 @@ public class JetExtensionReceiverTypeContributor extends CompletionContributor { @Override protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, - final @NotNull CompletionResultSet result + @NotNull CompletionResultSet result ) { ResolveSession resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile( (JetFile) parameters.getPosition().getContainingFile()); diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java index 81f82314de5..e67a8bc87d5 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java @@ -238,7 +238,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { elements = Collections2.transform(elementsList, new Function() { @Override public LookupElement apply(String keyword) { - final LookupElementBuilder lookupElementBuilder = LookupElementBuilder.create(keyword).bold(); + LookupElementBuilder lookupElementBuilder = LookupElementBuilder.create(keyword).bold(); if (keyword.contains("<#<")) { return JetTemplateInsertHandler.lookup(keyword); @@ -255,7 +255,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { @Override protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, - @NotNull final CompletionResultSet result) { + @NotNull CompletionResultSet result) { result.withPrefixMatcher(new SimplePrefixMatcher(result.getPrefixMatcher().getPrefix())).addAllElements(elements); } } @@ -329,25 +329,25 @@ public class JetKeywordCompletionContributor extends CompletionContributor { CLASS_OBJECT_WITHOUT_CLASS_TEMPLATE); } - private void registerScopeKeywordsCompletion(final ElementFilter placeFilter, boolean notIdentifier, String... keywords) { + private void registerScopeKeywordsCompletion(ElementFilter placeFilter, boolean notIdentifier, String... keywords) { extend(CompletionType.BASIC, getPlacePattern(placeFilter, notIdentifier), new KeywordsCompletionProvider(keywords)); } - private void registerScopeKeywordsCompletion(final ElementFilter placeFilter, boolean notIdentifier, JetToken... keywords) { + private void registerScopeKeywordsCompletion(ElementFilter placeFilter, boolean notIdentifier, JetToken... keywords) { registerScopeKeywordsCompletion(placeFilter, notIdentifier, convertTokensToStrings(keywords)); } - private void registerScopeKeywordsCompletion(final ElementFilter placeFilter, String... keywords) { + private void registerScopeKeywordsCompletion(ElementFilter placeFilter, String... keywords) { registerScopeKeywordsCompletion(placeFilter, true, keywords); } - private void registerScopeKeywordsCompletion(final ElementFilter placeFilter, JetToken... keywords) { + private void registerScopeKeywordsCompletion(ElementFilter placeFilter, JetToken... keywords) { registerScopeKeywordsCompletion(placeFilter, convertTokensToStrings(keywords)); } private static String[] convertTokensToStrings(JetToken... keywords) { - final ArrayList strings = new ArrayList(keywords.length); + ArrayList strings = new ArrayList(keywords.length); for (JetToken keyword : keywords) { strings.add(keyword.toString()); } @@ -355,7 +355,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor { return ArrayUtil.toStringArray(strings); } - private static ElementPattern getPlacePattern(final ElementFilter placeFilter, boolean notIdentifier) { + private static ElementPattern getPlacePattern(ElementFilter placeFilter, boolean notIdentifier) { if (notIdentifier) { return PlatformPatterns.psiElement().and(new FilterPattern(new AndFilter(GENERAL_FILTER, NOT_IDENTIFIER_FILTER, placeFilter))); } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java index df9dbbbc729..d900b8c8777 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java @@ -48,7 +48,7 @@ public class JetPackagesContributor extends CompletionContributor { protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet result) { - final PsiElement position = parameters.getPosition(); + PsiElement position = parameters.getPosition(); if (!(position.getContainingFile() instanceof JetFile)) { return; } @@ -58,7 +58,7 @@ public class JetPackagesContributor extends CompletionContributor { return; } - final PsiReference ref = parameters.getPosition().getContainingFile().findReferenceAt(parameters.getOffset()); + PsiReference ref = parameters.getPosition().getContainingFile().findReferenceAt(parameters.getOffset()); if (ref instanceof JetSimpleNameReference) { JetSimpleNameReference simpleNameReference = (JetSimpleNameReference)ref; diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetReferenceCharFilter.java b/idea/src/org/jetbrains/jet/plugin/completion/JetReferenceCharFilter.java index bcb324b893a..dabe3f42e62 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetReferenceCharFilter.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetReferenceCharFilter.java @@ -26,7 +26,7 @@ public class JetReferenceCharFilter extends CharFilter { @Override @Nullable public Result acceptChar(char c, int prefixLength, Lookup lookup) { - final PsiFile psiFile = lookup.getPsiFile(); + PsiFile psiFile = lookup.getPsiFile(); if (!(psiFile instanceof JetFile)) { return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java b/idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java index efd941950d0..ffd130746de 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/JetTypesCompletionHelper.java @@ -35,8 +35,8 @@ public class JetTypesCompletionHelper { private JetTypesCompletionHelper() {} static void addJetTypes( - @NotNull final CompletionParameters parameters, - @NotNull final JetCompletionResultSet jetCompletionResult + @NotNull CompletionParameters parameters, + @NotNull JetCompletionResultSet jetCompletionResult ) { jetCompletionResult.addAllElements(KotlinBuiltIns.getInstance().getNonPhysicalClasses()); @@ -54,7 +54,7 @@ public class JetTypesCompletionHelper { * Add java elements with performing conversion to kotlin elements if necessary. */ static void addAdaptedJavaCompletion( - @NotNull final CompletionParameters parameters, + @NotNull CompletionParameters parameters, @NotNull final JetCompletionResultSet jetCompletionResult ) { CompletionResultSet tempResult = jetCompletionResult.getResult().withPrefixMatcher( diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java index 1f3efccfbf5..3c95830b35c 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java @@ -51,10 +51,10 @@ public class JetClassInsertHandler implements InsertHandler { if (context.getFile() instanceof JetFile && item.getObject() instanceof JetLookupObject) { JetLookupObject lookupObject = (JetLookupObject)item.getObject(); - final DeclarationDescriptor descriptor = lookupObject.getDescriptor(); + DeclarationDescriptor descriptor = lookupObject.getDescriptor(); PsiElement targetElement = lookupObject.getPsiElement(); if (descriptor != null) { - final FqName fqn = DescriptorUtils.getFQName(descriptor).toSafe(); + FqName fqn = DescriptorUtils.getFQName(descriptor).toSafe(); // TODO: Find out the way for getting psi element for JS libs if (targetElement != null) { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java index 6b1a10e1f09..75d8509ea30 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java @@ -181,7 +181,7 @@ public class JetFunctionInsertHandler implements InsertHandler { } if (context.getFile() instanceof JetFile && item.getObject() instanceof JetLookupObject) { - final DeclarationDescriptor descriptor = ((JetLookupObject) item.getObject()).getDescriptor(); + DeclarationDescriptor descriptor = ((JetLookupObject) item.getObject()).getDescriptor(); if (descriptor instanceof SimpleFunctionDescriptor) { final JetFile file = (JetFile) context.getFile(); @@ -197,7 +197,7 @@ public class JetFunctionInsertHandler implements InsertHandler { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - final FqName fqn = DescriptorUtils.getFQName(functionDescriptor).toSafe(); + FqName fqn = DescriptorUtils.getFQName(functionDescriptor).toSafe(); ImportInsertHelper.addImportDirective(fqn, file); } }); diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetJavaClassInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetJavaClassInsertHandler.java index 18c194b8ba0..42b8d471148 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetJavaClassInsertHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetJavaClassInsertHandler.java @@ -32,7 +32,7 @@ public class JetJavaClassInsertHandler implements InsertHandler INSTANCE = new JetJavaClassInsertHandler(); @Override - public void handleInsert(final InsertionContext context, final JavaPsiClassReferenceElement item) { + public void handleInsert(InsertionContext context, JavaPsiClassReferenceElement item) { PsiDocumentManager.getInstance(context.getProject()).commitAllDocuments(); if (context.getFile() instanceof JetFile) { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.java index 0a958769950..e3586aef34f 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.java @@ -64,7 +64,7 @@ public class JetKeywordInsertHandler implements InsertHandler { // Add space after keyword context.setAddCompletionChar(false); - final TailType tailType = TailType.SPACE; + TailType tailType = TailType.SPACE; tailType.processTail(context.getEditor(), context.getTailOffset()); } } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetTemplateInsertHandler.java b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetTemplateInsertHandler.java index 1f346becf36..1cabc32cdef 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetTemplateInsertHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetTemplateInsertHandler.java @@ -39,7 +39,7 @@ public class JetTemplateInsertHandler implements InsertHandler { Editor editor = context.getEditor(); String insertion = myInsertion; - final char currentChar = context.getTailOffset() < document.getTextLength() ? document.getCharsSequence().charAt(context.getTailOffset()) : 0; + char currentChar = context.getTailOffset() < document.getTextLength() ? document.getCharsSequence().charAt(context.getTailOffset()) : 0; if (insertion.endsWith(" ") && context.getCompletionChar() != ' ' && (currentChar == ')' || currentChar == ' ' || currentChar == '\t')) { insertion = insertion.trim(); } @@ -55,7 +55,7 @@ public class JetTemplateInsertHandler implements InsertHandler { context.setTailOffset(tailOffset); - final CodeFoldingManager foldManager = CodeFoldingManager.getInstance(context.getProject()); + CodeFoldingManager foldManager = CodeFoldingManager.getInstance(context.getProject()); foldManager.updateFoldRegions(editor); String text = document.getText(); diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.java b/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.java index 4654333a103..976a91b5e3c 100644 --- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.java +++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.java @@ -47,7 +47,7 @@ public class JavaCopyPastePostProcessor implements CopyPastePostProcessor buffer = getSelectedElements(file, startOffsets, endOffsets); StringBuilder result = new StringBuilder(); @@ -101,7 +101,7 @@ public class JavaCopyPastePostProcessor implements CopyPastePostProcessor indented, @NotNull final TextBlockTransferableData value) { + public void processTransferableData(Project project, @NotNull final Editor editor, @NotNull final RangeMarker bounds, int caretColumn, Ref indented, @NotNull TextBlockTransferableData value) { try { final PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); if (!(file instanceof JetFile)) { diff --git a/idea/src/org/jetbrains/jet/plugin/converters/JetRunConfigurationSettingsFormatConverterProvider.java b/idea/src/org/jetbrains/jet/plugin/converters/JetRunConfigurationSettingsFormatConverterProvider.java index 94e15217e49..ca650a0280c 100644 --- a/idea/src/org/jetbrains/jet/plugin/converters/JetRunConfigurationSettingsFormatConverterProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/converters/JetRunConfigurationSettingsFormatConverterProvider.java @@ -34,15 +34,15 @@ public class JetRunConfigurationSettingsFormatConverterProvider extends Converte @NotNull @Override - public ProjectConverter createConverter(@NotNull final ConversionContext context) { + public ProjectConverter createConverter(@NotNull ConversionContext context) { return new ProjectConverter() { @NotNull @Override public ConversionProcessor createRunConfigurationsConverter() { return new ConversionProcessor() { @Override - public boolean isConversionNeeded(@NotNull final RunManagerSettings settings) { - for (final Element runConfiguration : settings.getRunConfigurations()) { + public boolean isConversionNeeded(@NotNull RunManagerSettings settings) { + for (Element runConfiguration : settings.getRunConfigurations()) { if (isJetRunConfiguration(runConfiguration) && getOldSettings(runConfiguration) != null) { return true; } @@ -51,16 +51,16 @@ public class JetRunConfigurationSettingsFormatConverterProvider extends Converte } @Override - public void process(@NotNull final RunManagerSettings settings) throws CannotConvertException { - for (final Element runConfiguration : settings.getRunConfigurations()) { + public void process(@NotNull RunManagerSettings settings) throws CannotConvertException { + for (Element runConfiguration : settings.getRunConfigurations()) { if (isJetRunConfiguration(runConfiguration)) { - final Element oldSettings = getOldSettings(runConfiguration); + Element oldSettings = getOldSettings(runConfiguration); if (oldSettings == null) continue; - for (final Object optionObj : oldSettings.getChildren("option")) { + for (Object optionObj : oldSettings.getChildren("option")) { if (optionObj instanceof Element) { - final Element option = (Element)optionObj; - final String optionName = option.getAttributeValue("name"); - final String optionValue = option.getAttributeValue("value"); + Element option = (Element)optionObj; + String optionName = option.getAttributeValue("name"); + String optionValue = option.getAttributeValue("value"); if ("mainClassName".equals(optionName)) { runConfiguration.addContent(createOption("MAIN_CLASS_NAME", optionValue)); } @@ -84,18 +84,18 @@ public class JetRunConfigurationSettingsFormatConverterProvider extends Converte }; } - private static boolean isJetRunConfiguration(@NotNull final Element runConfiguration) { + private static boolean isJetRunConfiguration(@NotNull Element runConfiguration) { return "JetRunConfigurationType".equals(runConfiguration.getAttributeValue("type")); } @Nullable - private static Element getOldSettings(@NotNull final Element runConfiguration) { + private static Element getOldSettings(@NotNull Element runConfiguration) { return runConfiguration.getChild("JetRunConfigurationSettings"); } @NotNull - private static Element createOption(@NotNull final String name, @Nullable final String value) { - final Element option = new Element("option"); + private static Element createOption(@NotNull String name, @Nullable String value) { + Element option = new Element("option"); option.setAttribute("name", name); option.setAttribute("value", value == null ? "" : value); return option; diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java index 7d25be7fecf..0076c22be4f 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.java @@ -131,8 +131,8 @@ public class JetPositionManager implements PositionManager { @Override @SuppressWarnings("unchecked") public void run() { - final JetFile namespace = (JetFile) sourcePosition.getFile(); - final JetTypeMapper typeMapper = prepareTypeMapper(namespace); + JetFile namespace = (JetFile) sourcePosition.getFile(); + JetTypeMapper typeMapper = prepareTypeMapper(namespace); PsiElement element = PsiTreeUtil.getParentOfType(sourcePosition.getElementAt(), JetClassOrObject.class, JetFunctionLiteralExpression.class, JetNamedFunction.class); if (element instanceof JetClassOrObject) { @@ -164,7 +164,7 @@ public class JetPositionManager implements PositionManager { @Nullable private static String getJvmInternalNameForImpl(JetTypeMapper typeMapper, JetClassOrObject jetClass) { - final ClassDescriptor classDescriptor = typeMapper.getBindingContext().get(BindingContext.CLASS, jetClass); + ClassDescriptor classDescriptor = typeMapper.getBindingContext().get(BindingContext.CLASS, jetClass); if (classDescriptor == null) { return null; } @@ -185,12 +185,12 @@ public class JetPositionManager implements PositionManager { value = CachedValuesManager.getManager(file.getProject()).createCachedValue(new CachedValueProvider() { @Override public Result compute() { - final AnalyzeExhaust analyzeExhaust = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file); + AnalyzeExhaust analyzeExhaust = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file); analyzeExhaust.throwIfError(); List namespaceFiles = JetFilesProvider.getInstance(file.getProject()).allNamespaceFiles().fun(file); - final DelegatingBindingTrace bindingTrace = new DelegatingBindingTrace(analyzeExhaust.getBindingContext(), "trace created in JetPositionManager"); + DelegatingBindingTrace bindingTrace = new DelegatingBindingTrace(analyzeExhaust.getBindingContext(), "trace created in JetPositionManager"); JetTypeMapper typeMapper = new JetTypeMapper(bindingTrace, true, ClassBuilderMode.FULL); //noinspection unchecked CodegenBinding.initTrace(bindingTrace, namespaceFiles); @@ -228,7 +228,7 @@ public class JetPositionManager implements PositionManager { if (!(sourcePosition.getFile() instanceof JetFile)) { throw new NoDataException(); } - final String className = classNameForPosition(sourcePosition); + String className = classNameForPosition(sourcePosition); if (className == null) { return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/editor/JetLtGtTypingUtils.java b/idea/src/org/jetbrains/jet/plugin/editor/JetLtGtTypingUtils.java index bbfc1afb53b..0ffdabd3070 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/JetLtGtTypingUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/editor/JetLtGtTypingUtils.java @@ -42,7 +42,7 @@ final class JetLtGtTypingUtils { JavaBackspaceHandler.handleLTDeletion(editor, offset, JetTokens.LT, JetTokens.GT, INVALID_INSIDE_REFERENCE); } - static boolean shouldAutoCloseAngleBracket(int offset, final Editor editor) { + static boolean shouldAutoCloseAngleBracket(int offset, Editor editor) { return isAfterClassIdentifier(offset, editor) || isAfterFunKeyword(offset, editor); } diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java b/idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java index 8406562e775..94abc90b835 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java @@ -31,9 +31,9 @@ public class KotlinBackspaceHandler extends BackspaceHandlerDelegate { } @Override - public boolean charDeleted(final char c, final PsiFile file, final Editor editor) { + public boolean charDeleted(char c, PsiFile file, Editor editor) { int offset = editor.getCaretModel().getOffset(); - final CharSequence chars = editor.getDocument().getCharsSequence(); + CharSequence chars = editor.getDocument().getCharsSequence(); if (editor.getDocument().getTextLength() <= offset) return false; //virtual space after end of file char c1 = chars.charAt(offset); diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinQuoteHandler.java b/idea/src/org/jetbrains/jet/plugin/editor/KotlinQuoteHandler.java index f402083c800..7a591e7ba7d 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinQuoteHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/editor/KotlinQuoteHandler.java @@ -40,7 +40,7 @@ public class KotlinQuoteHandler implements QuoteHandler { @Override public boolean isOpeningQuote(HighlighterIterator iterator, int offset) { - final IElementType tokenType = iterator.getTokenType(); + IElementType tokenType = iterator.getTokenType(); if (tokenType == JetTokens.OPEN_QUOTE) { int start = iterator.getStart(); @@ -56,7 +56,7 @@ public class KotlinQuoteHandler implements QuoteHandler { @Override public boolean isInsideLiteral(HighlighterIterator iterator) { - final IElementType tokenType = iterator.getTokenType(); + IElementType tokenType = iterator.getTokenType(); return tokenType == JetTokens.REGULAR_STRING_PART || tokenType == JetTokens.OPEN_QUOTE || tokenType == JetTokens.CLOSING_QUOTE || diff --git a/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java b/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java index 2fc85dbec5e..ecaa14e392e 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java +++ b/idea/src/org/jetbrains/jet/plugin/editor/importOptimizer/JetImportOptimizer.java @@ -126,7 +126,7 @@ public class JetImportOptimizer implements ImportOptimizer { return false; } - public static Set extractUsedQualifiedNames(final JetFile jetFile) { + public static Set extractUsedQualifiedNames(JetFile jetFile) { final Set usedQualifiedNames = new HashSet(); jetFile.accept(new JetVisitorVoid() { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.java b/idea/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.java index 9ba5c525360..72bc1328052 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.java @@ -62,7 +62,7 @@ public class JetFindUsagesProvider implements FindUsagesProvider { @Override public String getDescriptiveName(@NotNull PsiElement psiElement) { if (psiElement instanceof PsiNamedElement) { - final String name = ((PsiNamedElement)psiElement).getName(); + String name = ((PsiNamedElement)psiElement).getName(); return name == null ? "" : name; } return ""; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.java b/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.java index 7fb03d8c248..d437d016757 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.java @@ -29,7 +29,7 @@ public class JetImportFilteringRule extends ImportFilteringRule { @Override public boolean isVisible(@NotNull Usage usage) { if (usage instanceof PsiElementUsage) { - final PsiElement psiElement = ((PsiElementUsage)usage).getElement(); + PsiElement psiElement = ((PsiElementUsage)usage).getElement(); if (psiElement.getContainingFile() instanceof JetFile) { return PsiTreeUtil.getParentOfType(psiElement, JetImportDirective.class) == null; } diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java index 2a5d68bb37a..34f3616a936 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java @@ -182,7 +182,7 @@ public class JetBlock extends AbstractBlock { @NotNull @Override public ChildAttributes getChildAttributes(int newChildIndex) { - final IElementType type = getNode().getElementType(); + IElementType type = getNode().getElementType(); if (CODE_BLOCKS.contains(type) || type == WHEN || type == IF || diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java index f6578f0856c..b30cd9184d5 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java @@ -34,7 +34,7 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder { @NotNull @Override public FormattingModel createModel(PsiElement element, CodeStyleSettings settings) { - final JetBlock block = new JetBlock( + JetBlock block = new JetBlock( element.getNode(), ASTAlignmentStrategy.getNullStrategy(), Indent.getNoneIndent(), null, settings, createSpacingBuilder(settings)); diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java index fef956c37e5..ee20d944baf 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java @@ -50,7 +50,7 @@ public class DebugInfoAnnotator implements Annotator { if (element instanceof JetFile) { JetFile file = (JetFile) element; try { - final BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file).getBindingContext(); + BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file).getBindingContext(); DebugInfoUtil.markDebugAnnotations(file, bindingContext, new DebugInfoUtil.DebugInfoReporter() { @Override public void reportElementWithErrorType(@NotNull JetReferenceExpression expression) { diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java index 23c26fa183e..b026f210505 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java @@ -76,7 +76,7 @@ public class DeclarationHintSupport extends AbstractProjectComponent { private LightweightHint lastHint; @Override - public void mouseMoved(final EditorMouseEvent e) { + public void mouseMoved(EditorMouseEvent e) { if (DumbService.getInstance(myProject).isDumb() || !myProject.isInitialized()) { return; } @@ -85,17 +85,17 @@ public class DeclarationHintSupport extends AbstractProjectComponent { return; } - final Editor editor = e.getEditor(); + Editor editor = e.getEditor(); PsiFile psiFile = PsiDocumentManager.getInstance(myProject).getPsiFile(editor.getDocument()); if (psiFile == null || psiFile.getLanguage() != JetLanguage.INSTANCE) { return; } - final JetFile jetFile = (JetFile) psiFile; + JetFile jetFile = (JetFile) psiFile; int offset = editor.logicalPositionToOffset(editor.xyToLogicalPosition(e.getMouseEvent().getPoint())); PsiElement elementAtCursor = psiFile.findElementAt(offset); - final JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(elementAtCursor, JetNamedDeclaration.class); + JetNamedDeclaration declaration = PsiTreeUtil.getParentOfType(elementAtCursor, JetNamedDeclaration.class); if (declaration != null && declaration.getNameIdentifier() == elementAtCursor) { if (lastNamedDeclaration == declaration) { diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java index ee0ee8d8e57..a2350388ffe 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -85,7 +85,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider { if (lightClass == null) { return null; } - final PsiElement[] children = lightClass.getDelegate().getChildren(); + PsiElement[] children = lightClass.getDelegate().getChildren(); return children.length > 0 ? children[0] : null; } @@ -100,21 +100,21 @@ public class JetLineMarkerProvider implements LineMarkerProvider { }; @Override - public LineMarkerInfo getLineMarkerInfo(@NotNull final PsiElement element) { + public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) { JetFile file = (JetFile)element.getContainingFile(); if (file == null) return null; if (!(element instanceof JetNamedFunction || element instanceof JetProperty)) return null; - final BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file).getBindingContext(); + BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file).getBindingContext(); - final DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element); + DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element); if (!(descriptor instanceof CallableMemberDescriptor)) { return null; } - final Set overriddenMembers = ((CallableMemberDescriptor)descriptor).getOverriddenDescriptors(); + Set overriddenMembers = ((CallableMemberDescriptor)descriptor).getOverriddenDescriptors(); if (overriddenMembers.size() == 0) { return null; } @@ -150,27 +150,27 @@ public class JetLineMarkerProvider implements LineMarkerProvider { JetFile file = (JetFile)elt.getContainingFile(); assert file != null; - final BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file).getBindingContext(); - final DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, elt); + BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file).getBindingContext(); + DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, elt); if (!(descriptor instanceof CallableMemberDescriptor)) { return; } - final Set overriddenMembers = ((CallableMemberDescriptor)descriptor).getOverriddenDescriptors(); + Set overriddenMembers = ((CallableMemberDescriptor)descriptor).getOverriddenDescriptors(); if (overriddenMembers.size() == 0) { return; } if (overriddenMembers.isEmpty()) return; - final List list = Lists.newArrayList(); + List list = Lists.newArrayList(); for (CallableMemberDescriptor overriddenMember : overriddenMembers) { PsiElement declarationPsiElement = BindingContextUtils.descriptorToDeclaration(bindingContext, overriddenMember); list.add(declarationPsiElement); } if (list.isEmpty()) { String myEmptyText = "empty text"; - final JComponent renderer = HintUtil.createErrorLabel(myEmptyText); - final JBPopup popup = JBPopupFactory.getInstance().createComponentPopupBuilder(renderer, renderer).createPopup(); + JComponent renderer = HintUtil.createErrorLabel(myEmptyText); + JBPopup popup = JBPopupFactory.getInstance().createComponentPopupBuilder(renderer, renderer).createPopup(); if (event != null) { popup.show(new RelativePoint(event)); } @@ -193,14 +193,14 @@ public class JetLineMarkerProvider implements LineMarkerProvider { JetFile file = (JetFile)element.getContainingFile(); if (file == null) return ""; - final BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file).getBindingContext(); + BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file).getBindingContext(); - final DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element); + DeclarationDescriptor descriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element); if (!(descriptor instanceof CallableMemberDescriptor)) { return ""; } - final Set overriddenMembers = ((CallableMemberDescriptor)descriptor).getOverriddenDescriptors(); + Set overriddenMembers = ((CallableMemberDescriptor)descriptor).getOverriddenDescriptors(); if (overriddenMembers.size() == 0) { return ""; } @@ -210,8 +210,8 @@ public class JetLineMarkerProvider implements LineMarkerProvider { allOverriddenAbstract &= function.getModality() == Modality.ABSTRACT; } - final String implementsOrOverrides = allOverriddenAbstract ? "implements" : "overrides"; - final String memberKind = element instanceof JetNamedFunction ? "function" : "property"; + String implementsOrOverrides = allOverriddenAbstract ? "implements" : "overrides"; + String memberKind = element instanceof JetNamedFunction ? "function" : "property"; StringBuilder builder = new StringBuilder(); @@ -258,7 +258,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider { } PsiClass inheritor = ClassInheritorsSearch.search(lightClass, false).findFirst(); if (inheritor != null) { - final PsiElement nameIdentifier = element.getNameIdentifier(); + PsiElement nameIdentifier = element.getNameIdentifier(); PsiElement anchor = nameIdentifier != null ? nameIdentifier : element; Icon mark = isTrait ? IMPLEMENTED_MARK : OVERRIDDEN_MARK; result.add(new LineMarkerInfo(anchor, anchor.getTextOffset(), mark, Pass.UPDATE_OVERRIDEN_MARKERS, diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java index 138ea669557..f28011548be 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java @@ -100,7 +100,7 @@ public class JetPsiChecker implements Annotator { } @Override - public void annotate(@NotNull PsiElement element, @NotNull final AnnotationHolder holder) { + public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { for (HighlightingVisitor visitor : getBeforeAnalysisVisitors(holder)) { element.accept(visitor); } @@ -143,7 +143,7 @@ public class JetPsiChecker implements Annotator { private static void registerDiagnosticAnnotations(@NotNull Diagnostic diagnostic, @NotNull Set redeclarations, - @NotNull final AnnotationHolder holder) { + @NotNull AnnotationHolder holder) { if (!diagnostic.isValid()) return; List textRanges = diagnostic.getTextRanges(); if (diagnostic.getSeverity() == Severity.ERROR) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/JetTypeLookupExpression.java b/idea/src/org/jetbrains/jet/plugin/intentions/JetTypeLookupExpression.java index b4dfb821a7a..729fea32c88 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/JetTypeLookupExpression.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/JetTypeLookupExpression.java @@ -57,7 +57,7 @@ public abstract class JetTypeLookupExpression extends Expression { LookupElement[] lookupElements = new LookupElement[lookupItems.size()]; Iterator iterator = lookupItems.iterator(); for (int i = 0; i < lookupElements.length; i++) { - final T suggestion = iterator.next(); + T suggestion = iterator.next(); lookupElements[i] = LookupElementBuilder.create(suggestion, getLookupString(suggestion)).withInsertHandler( new InsertHandler() { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java index 2551f8d810e..c5139a7e670 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java @@ -104,7 +104,7 @@ public class BytecodeToolwindow extends JPanel implements Disposable { StringBuilder answer = new StringBuilder(); - final ClassFileFactory factory = state.getFactory(); + ClassFileFactory factory = state.getFactory(); for (String filename : factory.files()) { answer.append("// ================"); answer.append(filename); @@ -116,7 +116,7 @@ public class BytecodeToolwindow extends JPanel implements Disposable { } @Override - protected void onResultReady(@NotNull Location requestInfo, final String resultText) { + protected void onResultReady(@NotNull Location requestInfo, String resultText) { Editor editor = requestInfo.getEditor(); assert editor != null; diff --git a/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolwindow.java b/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolwindow.java index 6da08b7a937..a3a0c6eac70 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolwindow.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/resolvewindow/ResolveToolwindow.java @@ -142,7 +142,7 @@ public class ResolveToolwindow extends JPanel implements Disposable { } @Override - protected void onResultReady(@NotNull Location requestInfo, @Nullable final String resultText) { + protected void onResultReady(@NotNull Location requestInfo, @Nullable String resultText) { if (resultText != null) { setText(resultText); } diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java index 8990ed851d5..e227e882731 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java +++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java @@ -31,7 +31,8 @@ import static org.jetbrains.jet.plugin.k2jsrun.K2JSRunnerUtils.openBrowser; public final class K2JSBrowserProgramRunner extends GenericProgramRunner { @Override - protected RunContentDescriptor doExecute(final Project project, + protected RunContentDescriptor doExecute( + Project project, Executor executor, RunProfileState state, RunContentDescriptor contentToReuse, diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfiguration.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfiguration.java index 825417ac4d5..bc7a9139f16 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfiguration.java +++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfiguration.java @@ -112,7 +112,7 @@ public final class K2JSRunConfiguration extends ModuleBasedConfiguration templates = listApplicableTemplates(file, offset); final Ref templatesShown = Ref.create(false); @@ -66,7 +66,7 @@ public class JetLiveTemplateCompletionContributor extends CompletionContributor private static void ensureTemplatesShown(Ref templatesShown, List templates, CompletionResultSet result) { if (!templatesShown.get()) { templatesShown.set(true); - for (final TemplateImpl possible : templates) { + for (TemplateImpl possible : templates) { result.addElement(new LiveTemplateLookupElement(possible, false)); } } @@ -75,8 +75,8 @@ public class JetLiveTemplateCompletionContributor extends CompletionContributor private static List listApplicableTemplates(PsiFile file, int offset) { Set contextTypes = TemplateManagerImpl.getApplicableContextTypes(file, offset); - final ArrayList result = CollectionFactory.arrayList(); - for (final TemplateImpl template : TemplateSettings.getInstance().getTemplates()) { + ArrayList result = CollectionFactory.arrayList(); + for (TemplateImpl template : TemplateSettings.getInstance().getTemplates()) { if (!template.isDeactivated() && !template.isSelectionTemplate() && TemplateManagerImpl.isApplicable(template, contextTypes)) { result.add(template); } diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java index 6edc10d8cc4..04d1c2548d9 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java @@ -51,7 +51,7 @@ public abstract class BaseJetVariableMacro extends Macro { private JetNamedDeclaration[] getVariables(Expression[] params, ExpressionContext context) { if (params.length != 0) return null; - final Project project = context.getProject(); + Project project = context.getProject(); PsiDocumentManager.getInstance(project).commitAllDocuments(); PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(context.getEditor().getDocument()); @@ -108,16 +108,16 @@ public abstract class BaseJetVariableMacro extends Macro { @Override public Result calculateResult(@NotNull Expression[] params, ExpressionContext context) { - final JetNamedDeclaration[] vars = getVariables(params, context); + JetNamedDeclaration[] vars = getVariables(params, context); if (vars == null || vars.length == 0) return null; return new JetPsiElementResult(vars[0]); } @Override public LookupElement[] calculateLookupItems(@NotNull Expression[] params, ExpressionContext context) { - final PsiNamedElement[] vars = getVariables(params, context); + PsiNamedElement[] vars = getVariables(params, context); if (vars == null || vars.length < 2) return null; - final Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); for (PsiNamedElement var : vars) { set.add(LookupElementBuilder.create(var)); } diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java index d100752f355..4384d87fcdf 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java @@ -58,7 +58,7 @@ public class JetAnonymousSuperMacro extends Macro { } @Override - public Result calculateResult(@NotNull Expression[] params, final ExpressionContext context) { + public Result calculateResult(@NotNull Expression[] params, ExpressionContext context) { AnonymousTemplateEditingListener.registerListener(context.getEditor(), context.getProject()); PsiNamedElement[] vars = getSupertypes(params, context); @@ -68,9 +68,9 @@ public class JetAnonymousSuperMacro extends Macro { @Override public LookupElement[] calculateLookupItems(@NotNull Expression[] params, ExpressionContext context) { - final PsiNamedElement[] vars = getSupertypes(params, context); + PsiNamedElement[] vars = getSupertypes(params, context); if (vars == null || vars.length < 2) return null; - final Set set = new LinkedHashSet(); + Set set = new LinkedHashSet(); for (PsiNamedElement var : vars) { set.add(LookupElementBuilder.create(var)); } diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java index 5e6c0dd7894..a171a3c761f 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java @@ -38,10 +38,10 @@ public class JetFunctionParametersMacro extends Macro { return JetBundle.message("macro.fun.parameters"); } - public Result calculateResult(@NotNull Expression[] params, final ExpressionContext context) { + public Result calculateResult(@NotNull Expression[] params, ExpressionContext context) { Project project = context.getProject(); int templateStartOffset = context.getTemplateStartOffset(); - final int offset = templateStartOffset > 0 ? context.getTemplateStartOffset() - 1 : context.getTemplateStartOffset(); + int offset = templateStartOffset > 0 ? context.getTemplateStartOffset() - 1 : context.getTemplateStartOffset(); PsiDocumentManager.getInstance(project).commitAllDocuments(); diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java index 09a4c01b17c..682c63b00cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.psi.JetClass; public class JetClassPresenter implements ItemPresentationProvider { @Override - public ItemPresentation getPresentation(final JetClass item) { + public ItemPresentation getPresentation(JetClass item) { return new JetDefaultNamedDeclarationPresentation(item); } } diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java index b415c01e732..62174cab01e 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java @@ -28,12 +28,12 @@ public class JetLightClassListCellRenderer extends PsiElementListCellRenderer { @Override - public ItemPresentation getPresentation(final JetProperty item) { + public ItemPresentation getPresentation(JetProperty item) { return new JetDefaultNamedDeclarationPresentation(item); } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java index 567966c5885..91db9951ae6 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java +++ b/idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java @@ -181,8 +181,8 @@ public final class AnalyzerFacadeWithCache { } @NotNull - public static ResolveSession getLazyResolveSession(@NotNull final JetFile file) { - final Project fileProject = file.getProject(); + public static ResolveSession getLazyResolveSession(@NotNull JetFile file) { + Project fileProject = file.getProject(); Collection files = JetFilesProvider.getInstance(fileProject).allInScope(GlobalSearchScope.allScope(fileProject)); diff --git a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java b/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java index 99427d99761..4a12628dc5e 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java @@ -70,7 +70,7 @@ public class PluginJetFilesProvider extends JetFilesProvider { if (file.isDirectory()) return true; if (!index.isInSourceContent(file) && !index.isInTestSourceContent(file)) return true; - final FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(file); + FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(file); if (fileType != JetFileType.INSTANCE) return true; PsiFile psiFile = PsiManager.getInstance(project).findFile(file); if (psiFile instanceof JetFile) { @@ -95,7 +95,7 @@ public class PluginJetFilesProvider extends JetFilesProvider { } @Override - public Collection allInScope(final GlobalSearchScope scope) { + public Collection allInScope(GlobalSearchScope scope) { final PsiManager manager = PsiManager.getInstance(project); Collection jetFiles = Collections2.transform(FileTypeIndex.getFiles(JetFileType.INSTANCE, scope), diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java index c27fdb7097c..c5bec6cd2cf 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java @@ -126,7 +126,7 @@ public class JetProjectViewProvider implements SelectableTreeStructureProvider, } private boolean fileInRoots(VirtualFile file) { - final ProjectFileIndex index = ProjectRootManager.getInstance(myProject).getFileIndex(); + ProjectFileIndex index = ProjectRootManager.getInstance(myProject).getFileIndex(); return file != null && (index.isInSourceContent(file) || index.isInLibraryClasses(file) || index.isInLibrarySource(file)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java index 3d6265c6e14..afc40cbee26 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java @@ -158,7 +158,7 @@ public class AddModifierFix extends JetIntentionAction { }; } - public static JetIntentionActionFactory createFactory(final JetKeywordToken modifier) { + public static JetIntentionActionFactory createFactory(JetKeywordToken modifier) { return createFactory(modifier, JetModifierListOwner.class); } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java index 722095255da..d8e692385af 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java @@ -68,7 +68,7 @@ public class AddWhenElseBranchFix extends JetIntentionAction element.addAfter(JetPsiFactory.createNewLine(project), insertedBranch); JetWhenEntry insertedWhenEntry = (JetWhenEntry) CodeInsightUtilBase.forcePsiPostprocessAndRestoreElement(insertedBranch); - final TextRange textRange = insertedWhenEntry.getTextRange(); + TextRange textRange = insertedWhenEntry.getTextRange(); int indexOfOpenBrace = insertedWhenEntry.getText().indexOf('{'); editor.getCaretModel().moveToOffset(textRange.getStartOffset() + indexOfOpenBrace + 1); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java index 8eecacca1e0..97397649c19 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java @@ -66,7 +66,7 @@ public class ChangeVariableMutabilityFix implements IntentionAction { } private static JetProperty getCorrespondingProperty(Editor editor, JetFile file) { - final PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); + PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); JetProperty property = PsiTreeUtil.getParentOfType(elementAtCaret, JetProperty.class); if (property != null) return property; JetSimpleNameExpression simpleNameExpression = PsiTreeUtil.getParentOfType(elementAtCaret, JetSimpleNameExpression.class); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java index 7294ea7c683..efb955cff18 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java @@ -109,7 +109,7 @@ public class ExclExclCallFix implements IntentionAction { } private static PsiElement getExclExclElement(Editor editor, PsiFile file) { - final PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); + PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); if (isExclExclLeaf(elementAtCaret)) { return elementAtCaret; } @@ -130,7 +130,7 @@ public class ExclExclCallFix implements IntentionAction { } private static JetExpression getExpressionForIntroduceCall(Editor editor, PsiFile file) { - final PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); + PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); if (elementAtCaret != null) { JetExpression expression = getExpressionForIntroduceCall(elementAtCaret); if (expression != null) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassAndFunFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassAndFunFix.java index da751f8c893..5a1b96a3d5a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassAndFunFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassAndFunFix.java @@ -80,7 +80,7 @@ public class ImportClassAndFunFix extends JetHintAction return Collections.emptyList(); } - final String referenceName = element.getReferencedName(); + String referenceName = element.getReferencedName(); if (!StringUtil.isNotEmpty(referenceName)) { return Collections.emptyList(); @@ -173,7 +173,7 @@ public class ImportClassAndFunFix extends JetHintAction return Lists.newArrayList(possibleResolveNames); } - private static Collection getClassesFromCache(@NotNull final String typeName, @NotNull final JetFile file) { + private static Collection getClassesFromCache(@NotNull String typeName, @NotNull final JetFile file) { PsiShortNamesCache cache = getShortNamesCache(file); PsiClass[] classes = cache.getClassesByName(typeName, GlobalSearchScope.allScope(file.getProject())); @@ -229,7 +229,7 @@ public class ImportClassAndFunFix extends JetHintAction return false; } - final Project project = editor.getProject(); + Project project = editor.getProject(); if (project == null) { return false; } @@ -268,7 +268,7 @@ public class ImportClassAndFunFix extends JetHintAction } @Override - public void invoke(@NotNull final Project project, @NotNull final Editor editor, final PsiFile file) + public void invoke(@NotNull final Project project, @NotNull final Editor editor, PsiFile file) throws IncorrectOperationException { CommandProcessor.getInstance().runUndoTransparentAction(new Runnable() { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java b/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java index 1f7b0e0c796..9946be0f829 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/JsModuleSetUp.java @@ -73,8 +73,8 @@ public final class JsModuleSetUp { refreshRootDir(module, continuation); } - private static void setUpLibraryAsSourceLibrary(final Module module, final @NotNull File rootDir) { - final File libJarFile = new File(rootDir, "lib/" + PathUtil.JS_LIB_JAR_NAME); + private static void setUpLibraryAsSourceLibrary(final Module module, @NotNull File rootDir) { + File libJarFile = new File(rootDir, "lib/" + PathUtil.JS_LIB_JAR_NAME); final VirtualFile libFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(libJarFile); if (libFile != null) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateSureInProjectFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateSureInProjectFix.java index 19f6c48ff2b..7aa2bb62494 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateSureInProjectFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateSureInProjectFix.java @@ -85,7 +85,7 @@ public class MigrateSureInProjectFix extends JetIntentionAction { } @Override - public void invoke(@NotNull Project project, Editor editor, final PsiFile file) throws IncorrectOperationException { + public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { JetFile initialFile = (JetFile) file; Collection files = PluginJetFilesProvider.WHOLE_PROJECT_DECLARATION_PROVIDER.fun(initialFile); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateTuplesInProjectFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateTuplesInProjectFix.java index 8c0bded7cf9..87a833f92a9 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateTuplesInProjectFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MigrateTuplesInProjectFix.java @@ -70,7 +70,7 @@ public class MigrateTuplesInProjectFix extends JetIntentionAction { } @Override - public void invoke(@NotNull Project project, Editor editor, final PsiFile file) throws IncorrectOperationException { + public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { JetFile initialFile = (JetFile) file; Collection files = PluginJetFilesProvider.WHOLE_PROJECT_DECLARATION_PROVIDER.fun(initialFile); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java index 20439d286cf..3355b0a2d02 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java @@ -104,7 +104,7 @@ public class RemoveModifierFix extends JetIntentionAction } - public static JetIntentionActionFactory createRemoveModifierFromListOwnerFactory(final JetKeywordToken modifier) { + public static JetIntentionActionFactory createRemoveModifierFromListOwnerFactory(JetKeywordToken modifier) { return createRemoveModifierFromListOwnerFactory(modifier, false); } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java index 80c103efb07..989c065792b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java @@ -88,7 +88,7 @@ public class ReplaceCallFix implements IntentionAction { } private JetQualifiedExpression getCallExpression(@NotNull Editor editor, @NotNull JetFile file) { - final PsiElement elementAtCaret = getElementAtCaret(editor, file); + PsiElement elementAtCaret = getElementAtCaret(editor, file); return PsiTreeUtil.getParentOfType(elementAtCaret, toSafe ? JetDotQualifiedExpression.class : JetSafeQualifiedExpression.class); } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java index a0252f73bd9..b30cc50e433 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java @@ -158,7 +158,7 @@ public class JetInplaceVariableIntroducer extends InplaceVariableIntroducer allReplaces; + List allReplaces; if (OccurrencesChooser.ReplaceChoice.ALL == replaceChoice) { if (allOccurrences.size() > 1) replaceOccurrence = true; allReplaces = allOccurrences; @@ -444,7 +444,7 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase { } @Override - public void visitExpression(final JetExpression expression) { + public void visitExpression(JetExpression expression) { if (PsiEquivalenceUtil.areElementsEquivalent(expression, actualExpression, null, new Comparator() { @Override public int compare(PsiElement element1, PsiElement element2) { diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java index 2ea146af7c0..34a31efcba0 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java @@ -72,9 +72,9 @@ public class JetJUnitConfigurationProducer extends RuntimeConfigurationProducer Location methodLocation = PsiLocation.fromPsiElement(method); if (JUnitUtil.isTestMethod(methodLocation, false)) { RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(context.getProject(), context); - final JUnitConfiguration configuration = (JUnitConfiguration) settings.getConfiguration(); + JUnitConfiguration configuration = (JUnitConfiguration) settings.getConfiguration(); - final Module originalModule = configuration.getConfigurationModule().getModule(); + Module originalModule = configuration.getConfigurationModule().getModule(); configuration.beMethodConfiguration(methodLocation); configuration.restoreOriginalModule(originalModule); JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration(configuration, location); @@ -100,9 +100,9 @@ public class JetJUnitConfigurationProducer extends RuntimeConfigurationProducer if (delegate != null && JUnitUtil.isTestClass(delegate)) { RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(context.getProject(), context); - final JUnitConfiguration configuration = (JUnitConfiguration) settings.getConfiguration(); + JUnitConfiguration configuration = (JUnitConfiguration) settings.getConfiguration(); - final Module originalModule = configuration.getConfigurationModule().getModule(); + Module originalModule = configuration.getConfigurationModule().getModule(); configuration.beClassConfiguration(delegate); configuration.restoreOriginalModule(originalModule); JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration(configuration, location); diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java index 2efe496681f..068fb6c60c1 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java @@ -69,7 +69,7 @@ public class JetRunConfiguration extends ModuleBasedConfiguration envs) { + public void setEnvs(@NotNull Map envs) { this.myEnvs = envs; } @@ -179,7 +179,7 @@ public class JetRunConfiguration extends ModuleBasedConfiguration moduleChooser = LabeledComponent.create(new JComboBox(), "Use classpath and JDK of module:"); myModuleChooserHolder.add(moduleChooser, BorderLayout.CENTER); myModuleSelector = new ConfigurationModuleSelector(project, moduleChooser.getComponent()); diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java index 26737031126..0c9273f2b07 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java @@ -51,7 +51,7 @@ public class JetRunConfigurationProducer extends RuntimeConfigurationProducer im @Override protected RunnerAndConfigurationSettings createConfigurationByElement(@NotNull Location location, ConfigurationContext configurationContext) { - final Module module = location.getModule(); + Module module = location.getModule(); if (module == null) { return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinAnnotatedElementsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/KotlinAnnotatedElementsSearcher.java index 93e13e74d92..33c4aac50a4 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/KotlinAnnotatedElementsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/KotlinAnnotatedElementsSearcher.java @@ -58,14 +58,14 @@ public class KotlinAnnotatedElementsSearcher extends AnnotatedElementsSearcher { private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.AnnotatedMembersSearcher"); @Override - public boolean execute(@NotNull final AnnotatedElementsSearch.Parameters p, @NotNull final Processor consumer) { - final PsiClass annClass = p.getAnnotationClass(); + public boolean execute(@NotNull AnnotatedElementsSearch.Parameters p, @NotNull final Processor consumer) { + PsiClass annClass = p.getAnnotationClass(); assert annClass.isAnnotationType() : "Annotation type should be passed to annotated members search"; final String annotationFQN = annClass.getQualifiedName(); assert annotationFQN != null; - final SearchScope useScope = p.getScope(); + SearchScope useScope = p.getScope(); for (final PsiElement elt : getJetAnnotationCandidates(annClass, useScope)) { if (notJetAnnotationEntry(elt)) continue; @@ -135,7 +135,7 @@ public class KotlinAnnotatedElementsSearcher extends AnnotatedElementsSearcher { }); } - private static boolean notJetAnnotationEntry(final PsiElement found) { + private static boolean notJetAnnotationEntry(PsiElement found) { if (found instanceof JetAnnotationEntry) return false; VirtualFile faultyContainer = PsiUtilCore.getVirtualFile(found); diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java index b4511bd41ae..42f092df06e 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/KotlinDefinitionsSearcher.java @@ -42,7 +42,7 @@ public class KotlinDefinitionsSearcher extends QueryExecutorBase query = ClassInheritorsSearch.search(psiClass, true); query.forEach(new Processor() { @Override - public boolean process(final PsiClass clazz) { + public boolean process(PsiClass clazz) { return consumer.process(clazz); } }); diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java index e5b0bc4d74d..023c175fcf5 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java @@ -50,9 +50,9 @@ public class KotlinReferencesSearcher extends QueryExecutorBase() { + PsiMethod method = ApplicationManager.getApplication().runReadAction(new Computable() { @Override public PsiMethod compute() { return LightClassUtil.getLightClassMethod(function); diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java index 2b4cc6243e8..d94a40efb59 100644 --- a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java +++ b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java @@ -118,7 +118,7 @@ public class JetStructureViewElement implements StructureViewTreeElement { @Override public TreeElement[] getChildren() { if (myElement instanceof JetFile) { - final JetFile jetFile = (JetFile) myElement; + JetFile jetFile = (JetFile) myElement; context = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(jetFile).getBindingContext(); return wrapDeclarations(jetFile.getDeclarations()); } @@ -153,7 +153,7 @@ public class JetStructureViewElement implements StructureViewTreeElement { if (myElement instanceof JetDeclaration) { JetDeclaration declaration = (JetDeclaration) myElement; - final DeclarationDescriptor descriptor = context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration); + DeclarationDescriptor descriptor = context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration); if (descriptor != null) { text = getDescriptorTreeText(descriptor); } diff --git a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java index 28f59c29da7..ca60317bd73 100644 --- a/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java +++ b/idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.psi.JetFile; public class JetStructureViewFactory implements PsiStructureViewFactory { @Override - public StructureViewBuilder getStructureViewBuilder(final PsiFile psiFile) { + public StructureViewBuilder getStructureViewBuilder(PsiFile psiFile) { if (psiFile instanceof JetFile) { final JetFile file = (JetFile) psiFile; diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllPackagesIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllPackagesIndex.java index 0307c75440f..7ba54e6b36b 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllPackagesIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllPackagesIndex.java @@ -49,7 +49,7 @@ public class JetAllPackagesIndex extends StringStubIndexExtension { } @Override - public Collection get(final String fqName, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String fqName, Project project, @NotNull GlobalSearchScope scope) { return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllShortFunctionNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllShortFunctionNameIndex.java index d9c267bc2b5..71b7bd24370 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllShortFunctionNameIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllShortFunctionNameIndex.java @@ -43,7 +43,7 @@ public class JetAllShortFunctionNameIndex extends StringStubIndexExtension get(final String s, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String s, Project project, @NotNull GlobalSearchScope scope) { return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java index 03c063fc8ee..0d3a73faf93 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java @@ -43,7 +43,7 @@ public class JetAnnotationsIndex extends StringStubIndexExtension get(final String s, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String s, Project project, @NotNull GlobalSearchScope scope) { return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetClassByPackageIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetClassByPackageIndex.java index 0c666a84191..7c7bf75c4d6 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetClassByPackageIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetClassByPackageIndex.java @@ -43,7 +43,7 @@ public class JetClassByPackageIndex extends StringStubIndexExtension get(final String fqName, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String fqName, Project project, @NotNull GlobalSearchScope scope) { return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java index 70adb40b33c..3fc566e7b7c 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java @@ -43,7 +43,7 @@ public class JetFullClassNameIndex extends StringStubIndexExtension get(final String fqName, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String fqName, Project project, @NotNull GlobalSearchScope scope) { return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortClassNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortClassNameIndex.java index 9f75b20d4e4..d32f098ea75 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortClassNameIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortClassNameIndex.java @@ -43,7 +43,7 @@ public class JetShortClassNameIndex extends StringStubIndexExtension get(final String s, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String s, Project project, @NotNull GlobalSearchScope scope) { return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortFunctionNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortFunctionNameIndex.java index 649cf99d6fb..6bcc5f0fd35 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortFunctionNameIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortFunctionNameIndex.java @@ -43,7 +43,7 @@ public class JetShortFunctionNameIndex extends StringStubIndexExtension get(final String s, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String s, Project project, @NotNull GlobalSearchScope scope) { return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortPropertiesNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortPropertiesNameIndex.java index 662dbd76ec1..ea69e932e28 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortPropertiesNameIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortPropertiesNameIndex.java @@ -43,7 +43,7 @@ public class JetShortPropertiesNameIndex extends StringStubIndexExtension get(final String s, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String s, Project project, @NotNull GlobalSearchScope scope) { return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java index 3cfbaa7fb3f..dfd44542223 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java @@ -43,7 +43,7 @@ public class JetSuperClassIndex extends StringStubIndexExtension get(final String s, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String s, Project project, @NotNull GlobalSearchScope scope) { return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionsFqnNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionsFqnNameIndex.java index 5211ccce8a2..04cc0945467 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionsFqnNameIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionsFqnNameIndex.java @@ -46,7 +46,7 @@ public class JetTopLevelFunctionsFqnNameIndex extends StringStubIndexExtension get(final String s, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String s, Project project, @NotNull GlobalSearchScope scope) { return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertiesFqnNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertiesFqnNameIndex.java index bfc128a7116..831528428de 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertiesFqnNameIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertiesFqnNameIndex.java @@ -43,7 +43,7 @@ public class JetTopLevelPropertiesFqnNameIndex extends StringStubIndexExtension< } @Override - public Collection get(final String s, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String s, Project project, @NotNull GlobalSearchScope scope) { return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java index 1e4331774d2..388c1c07961 100644 --- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java +++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java @@ -43,7 +43,7 @@ public class JetTopLevelShortObjectNameIndex extends StringStubIndexExtension get(final String s, final Project project, @NotNull final GlobalSearchScope scope) { + public Collection get(String s, Project project, @NotNull GlobalSearchScope scope) { return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope)); } } diff --git a/idea/src/org/jetbrains/jet/plugin/util/LongRunningReadTask.java b/idea/src/org/jetbrains/jet/plugin/util/LongRunningReadTask.java index b93173d6aef..06b28b4bc71 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/LongRunningReadTask.java +++ b/idea/src/org/jetbrains/jet/plugin/util/LongRunningReadTask.java @@ -204,7 +204,7 @@ public abstract class LongRunningReadTask { * @param action */ public static void runWithWriteActionPriority(@NotNull final ProgressIndicator indicator, @NotNull final Runnable action) { - final ApplicationAdapter listener = new ApplicationAdapter() { + ApplicationAdapter listener = new ApplicationAdapter() { @Override public void beforeWriteActionStart(Object action) { indicator.cancel(); diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java b/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java index 7ca9a11c6ce..9e14d8a286e 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/KotlinLibrariesNotificationProvider.java @@ -105,7 +105,7 @@ public class KotlinLibrariesNotificationProvider extends EditorNotifications.Pro if (CompilerManager.getInstance(myProject).isExcludedFromCompilation(file)) return null; - final Module module = ModuleUtilCore.findModuleForFile(file, myProject); + Module module = ModuleUtilCore.findModuleForFile(file, myProject); if (module == null) return null; if (!KotlinRuntimeLibraryUtil.isModuleAlreadyConfigured(module)) { @@ -129,7 +129,7 @@ public class KotlinLibrariesNotificationProvider extends EditorNotifications.Pro } private EditorNotificationPanel createConfigureRuntimeLibraryNotificationPanel(final Module module) { - final EditorNotificationPanel answer = new EditorNotificationPanel(); + EditorNotificationPanel answer = new EditorNotificationPanel(); answer.setText("Kotlin is not configured for module '" + module.getName() + "'"); answer.createActionLabel("Set up module '" + module.getName() + "' as JVM Kotlin module", new Runnable() { @@ -160,8 +160,8 @@ public class KotlinLibrariesNotificationProvider extends EditorNotifications.Pro JsModuleSetUp.doSetUpModule(module, updateNotifications); } - private EditorNotificationPanel createUnsupportedAbiVersionNotificationPanel(final Collection badRoots) { - final EditorNotificationPanel answer = new ErrorNotificationPanel(); + private EditorNotificationPanel createUnsupportedAbiVersionNotificationPanel(Collection badRoots) { + EditorNotificationPanel answer = new ErrorNotificationPanel(); VirtualFile kotlinRuntimeJar = KotlinRuntimeLibraryUtil.getLocalKotlinRuntimeJar(myProject); if (kotlinRuntimeJar != null && badRoots.contains(kotlinRuntimeJar)) { diff --git a/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java b/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java index afc3a6c8635..276dc661c74 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java @@ -35,7 +35,7 @@ import javax.swing.event.HyperlinkEvent; public class OutdatedKotlinRuntimeNotification extends AbstractProjectComponent { private static final String SUPPRESSED_PROPERTY_NAME = "oudtdated.runtime.suppressed.plugin.version"; - public OutdatedKotlinRuntimeNotification(final Project project) { + public OutdatedKotlinRuntimeNotification(Project project) { super(project); } diff --git a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java index b73a83a694c..7d90c890887 100644 --- a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java +++ b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java @@ -191,7 +191,7 @@ public class ExpectedCompletionUtils { } protected static List getItemsInformation(LookupElement[] items) { - final LookupElementPresentation presentation = new LookupElementPresentation(); + LookupElementPresentation presentation = new LookupElementPresentation(); List result = new ArrayList(); if (items != null) { diff --git a/idea/tests/org/jetbrains/jet/completion/JetCompletionMultiTestBase.java b/idea/tests/org/jetbrains/jet/completion/JetCompletionMultiTestBase.java index eb3848bd51a..fa106fa3288 100644 --- a/idea/tests/org/jetbrains/jet/completion/JetCompletionMultiTestBase.java +++ b/idea/tests/org/jetbrains/jet/completion/JetCompletionMultiTestBase.java @@ -32,8 +32,8 @@ public abstract class JetCompletionMultiTestBase extends CompletionTestCase { configureByFiles(null, fileNameList); complete(completionLevel); - final String fileText = getFile().getText(); - final ExpectedCompletionUtils completionUtils = new ExpectedCompletionUtils(); + String fileText = getFile().getText(); + ExpectedCompletionUtils completionUtils = new ExpectedCompletionUtils(); ExpectedCompletionUtils.assertContainsRenderedItems( completionUtils.itemsShouldExist(fileText), myItems, completionUtils.isWithOrder(fileText)); diff --git a/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java b/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java index 6d0413fed14..84e1edbcf75 100644 --- a/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java +++ b/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java @@ -41,10 +41,10 @@ public abstract class JetCompletionTestBase extends LightCompletionTestCase { protected void doTest() { try { - final String testName = getTestName(false); + String testName = getTestName(false); configureByFileNoComplete(testName + ".kt"); - final String fileText = getFile().getText(); + String fileText = getFile().getText(); type = getCompletionType(testName, fileText); boolean withKotlinRuntime = InTextDirectivesUtils.getPrefixedInt(fileText, "// RUNTIME:") != null; @@ -105,7 +105,7 @@ public abstract class JetCompletionTestBase extends LightCompletionTestCase { } @Override - protected void complete(final int time) { + protected void complete(int time) { new CodeCompletionHandlerBase(type, false, false, true).invokeCompletion(getProject(), getEditor(), time, false, false); Lookup lookup = LookupManager.getActiveLookup(myEditor); diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java index 5f76fb395c3..929b8ea33a5 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java +++ b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTest.java @@ -160,11 +160,11 @@ public class CompletionHandlerTest extends LightCompletionTestCase { @Nullable public static LookupElement getExistentLookupElement(@Nullable String lookupString, @Nullable String tailText) { - final LookupImpl lookup = (LookupImpl) LookupManager.getInstance(getProject()).getActiveLookup(); + LookupImpl lookup = (LookupImpl) LookupManager.getInstance(getProject()).getActiveLookup(); LookupElement foundElement = null; if (lookup != null) { - final LookupElementPresentation presentation = new LookupElementPresentation(); + LookupElementPresentation presentation = new LookupElementPresentation(); for (LookupElement lookupElement : lookup.getItems()) { boolean lookupOk; diff --git a/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java b/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java index 1eb59f3ad89..adb1bf4f26b 100644 --- a/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java +++ b/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java @@ -84,11 +84,11 @@ public abstract class AbstractJetFormatterTest extends LightIdeaTestCase { doTextTest(Action.REFORMAT, loadFile(fileNameBefore), loadFile(fileNameAfter), ""); } - public void doTextTest(@NonNls final String text, @NonNls String textAfter, String commentToTextCompare) throws IncorrectOperationException { + public void doTextTest(@NonNls String text, @NonNls String textAfter, String commentToTextCompare) throws IncorrectOperationException { doTextTest(Action.REFORMAT, text, textAfter, commentToTextCompare); } - public void doIndentTextTest(@NonNls final String text, @NonNls String textAfter) throws IncorrectOperationException { + public void doIndentTextTest(@NonNls String text, @NonNls String textAfter) throws IncorrectOperationException { doTextTest(Action.INDENT, text, textAfter, ""); } @@ -96,7 +96,7 @@ public abstract class AbstractJetFormatterTest extends LightIdeaTestCase { final PsiFile file = createFile("A.kt", text); if (myLineRange != null) { - final DocumentImpl document = new DocumentImpl(text); + DocumentImpl document = new DocumentImpl(text); myTextRange = new TextRange(document.getLineStartOffset(myLineRange.getStartOffset()), document.getLineEndOffset(myLineRange.getEndOffset())); } diff --git a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTest.java b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTest.java index 8cc1e004e22..22041d17aab 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTest.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTest.java @@ -128,7 +128,7 @@ public class JetTypingIndentationTest extends LightCodeInsightTestCase { @Override protected String getTestDataPath() { - final String testRelativeDir = "formatter/IndentationOnNewline"; + String testRelativeDir = "formatter/IndentationOnNewline"; return new File(PluginTestCaseBase.getTestDataPathBase(), testRelativeDir).getPath() + File.separator; } diff --git a/idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java b/idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java index b0bd0a286c2..5cce7d8b9d0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java @@ -60,7 +60,7 @@ public class WordSelectionTest extends LightCodeInsightFixtureTestCase { @Override public void setUp() throws Exception { super.setUp(); - final String testRelativeDir = "wordSelection"; + String testRelativeDir = "wordSelection"; myFixture.setTestDataPath(new File(PluginTestCaseBase.getTestDataPathBase(), testRelativeDir).getPath() + File.separator); } diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementLineMarkerTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementLineMarkerTest.java index 4c2e651aeb4..cbda076acc7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementLineMarkerTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementLineMarkerTest.java @@ -46,12 +46,12 @@ public class OverrideImplementLineMarkerTest extends LightCodeInsightFixtureTest } private void doTest(int count) { - final Editor editor = myFixture.getEditor(); - final Project project = myFixture.getProject(); + Editor editor = myFixture.getEditor(); + Project project = myFixture.getProject(); myFixture.doHighlighting(); - final List infoList = DaemonCodeAnalyzerImpl.getLineMarkers(editor.getDocument(), project); + List infoList = DaemonCodeAnalyzerImpl.getLineMarkers(editor.getDocument(), project); assertNotNull(infoList); assertEquals(count, infoList.size()); } diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java index 8ba064bbfaa..9a9da23c05d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OverrideImplementTest.java @@ -202,7 +202,7 @@ public class OverrideImplementTest extends LightCodeInsightFixtureTestCase { } private void doOverrideImplement(OverrideImplementMethodsHandler handler, @Nullable String memberToOverride) { - final PsiElement elementAtCaret = myFixture.getFile().findElementAt(myFixture.getEditor().getCaretModel().getOffset()); + PsiElement elementAtCaret = myFixture.getFile().findElementAt(myFixture.getEditor().getCaretModel().getOffset()); final JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(elementAtCaret, JetClassOrObject.class); assertNotNull("Caret should be inside class or object", classOrObject); @@ -210,7 +210,7 @@ public class OverrideImplementTest extends LightCodeInsightFixtureTestCase { final BindingContext bindingContext = WholeProjectAnalyzerFacade .analyzeProjectWithCacheOnAFile(jetFile) .getBindingContext(); - final Set descriptors = handler.collectMethodsToGenerate(classOrObject, bindingContext); + Set descriptors = handler.collectMethodsToGenerate(classOrObject, bindingContext); final CallableMemberDescriptor singleToOverride; if (memberToOverride == null) { @@ -245,7 +245,7 @@ public class OverrideImplementTest extends LightCodeInsightFixtureTestCase { } private void doMultiOverrideImplement(OverrideImplementMethodsHandler handler) { - final PsiElement elementAtCaret = myFixture.getFile().findElementAt(myFixture.getEditor().getCaretModel().getOffset()); + PsiElement elementAtCaret = myFixture.getFile().findElementAt(myFixture.getEditor().getCaretModel().getOffset()); final JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(elementAtCaret, JetClassOrObject.class); assertNotNull("Caret should be inside class or object", classOrObject); @@ -253,7 +253,7 @@ public class OverrideImplementTest extends LightCodeInsightFixtureTestCase { final BindingContext bindingContext = WholeProjectAnalyzerFacade .analyzeProjectWithCacheOnAFile(jetFile) .getBindingContext(); - final Set descriptors = handler.collectMethodsToGenerate(classOrObject, bindingContext); + Set descriptors = handler.collectMethodsToGenerate(classOrObject, bindingContext); final ArrayList descriptorsList = new ArrayList(descriptors); Collections.sort(descriptorsList, new Comparator() { diff --git a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/IDECompilerMessagingTest.java b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/IDECompilerMessagingTest.java index e91a33f9dbc..82164643b7e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/compilerMessages/IDECompilerMessagingTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/compilerMessages/IDECompilerMessagingTest.java @@ -35,12 +35,12 @@ public abstract class IDECompilerMessagingTest extends PlatformTestCase { protected void performTest(@NotNull Function1 whatToExpect, @NotNull TranslatingCompiler compiler, @NotNull String testDataPath) { - final String pathToTestDir = testDataPath + "/" + getTestName(true); + String pathToTestDir = testDataPath + "/" + getTestName(true); VirtualFile testDir = LocalFileSystem.getInstance().findFileByPath(pathToTestDir); Assert.assertNotNull(testDir); VirtualFile sampleFile = LocalFileSystem.getInstance().findFileByPath(pathToTestDir + "/src/test.kt"); VirtualFile outDirectory = getOutDirectory(pathToTestDir, testDir); - final String pathToSrc = pathToTestDir + "/src/"; + String pathToSrc = pathToTestDir + "/src/"; VirtualFile root = LocalFileSystem.getInstance().findFileByPath(pathToSrc); Assert.assertNotNull(root); MockCompileContext mockCompileContext = new MockCompileContext(myModule, outDirectory, root); diff --git a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java index ecde2fb6e1f..7d557931cc9 100644 --- a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java @@ -123,12 +123,12 @@ public class JetJavaFacadeTest extends LightCodeInsightFixtureTestCase { PsiField classobjField = theClass.findFieldByName("$classobj", false); assertNull(classobjField); - final PsiClass classObjectClass = theClass.findInnerClassByName("object", false); + PsiClass classObjectClass = theClass.findInnerClassByName("object", false); assertNotNull(classObjectClass); assertEquals("foo.TheClass.object", classObjectClass.getQualifiedName()); assertTrue(classObjectClass.hasModifierProperty(PsiModifier.STATIC)); - final PsiField instance = theClass.findFieldByName(JvmAbi.CLASS_OBJECT_FIELD, false); + PsiField instance = theClass.findFieldByName(JvmAbi.CLASS_OBJECT_FIELD, false); assertNotNull(instance); assertEquals("foo.TheClass.object", instance.getType().getCanonicalText()); assertTrue(instance.hasModifierProperty(PsiModifier.PUBLIC)); diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java index b83241c03b9..dbda75b5086 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java @@ -88,7 +88,7 @@ public class JetFunctionParameterInfoTest extends LightCodeInsightFixtureTestCas private void doTest() { myFixture.configureByFile(getTestName(false) + ".kt"); - final JetFile file = (JetFile) myFixture.getFile(); + JetFile file = (JetFile) myFixture.getFile(); PsiElement lastChild = file.getLastChild(); assert lastChild != null; String expectedResultText = null; @@ -102,9 +102,9 @@ public class JetFunctionParameterInfoTest extends LightCodeInsightFixtureTestCas assert expectedResultText != null; JetFunctionParameterInfoHandler parameterInfoHandler = new JetFunctionParameterInfoHandler(); MockCreateParameterInfoContext mockCreateParameterInfoContext = new MockCreateParameterInfoContext(file, myFixture); - final JetValueArgumentList parameterOwner = parameterInfoHandler.findElementForParameterInfo(mockCreateParameterInfoContext); + JetValueArgumentList parameterOwner = parameterInfoHandler.findElementForParameterInfo(mockCreateParameterInfoContext); - final MockUpdateParameterInfoContext updateContext = new MockUpdateParameterInfoContext(file, myFixture); + MockUpdateParameterInfoContext updateContext = new MockUpdateParameterInfoContext(file, myFixture); //to update current parameter index parameterInfoHandler.findElementForUpdatingParameterInfo(updateContext); diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java index 48a2c61ff42..bf6ae3cc54c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java @@ -70,11 +70,11 @@ public abstract class AbstractQuickFixMultiFileTest extends DaemonAnalyzerTestCa @Override public void run() { try { - final Pair pair = LightQuickFixTestCase.parseActionHint( + Pair pair = LightQuickFixTestCase.parseActionHint( getFile(),FileUtil.loadFile(new File(getTestDataPath() + beforeFileName))); - final String text = pair.getFirst(); + String text = pair.getFirst(); - final boolean actionShouldBeAvailable = pair.getSecond(); + boolean actionShouldBeAvailable = pair.getSecond(); QuickFixActionsUtils.checkForUnexpectedErrors((JetFile) getFile()); @@ -92,7 +92,7 @@ public abstract class AbstractQuickFixMultiFileTest extends DaemonAnalyzerTestCa } @SuppressWarnings({"HardCodedStringLiteral"}) - public void doAction(final String text, final boolean actionShouldBeAvailable, final String testFullPath) + public void doAction(String text, boolean actionShouldBeAvailable, String testFullPath) throws Exception { List availableActions = getAvailableActions(); IntentionAction action = LightQuickFixTestCase.findActionWithText(availableActions, text); @@ -120,7 +120,7 @@ public abstract class AbstractQuickFixMultiFileTest extends DaemonAnalyzerTestCa UIUtil.dispatchAllInvocationEvents(); if (!shouldBeAvailableAfterExecution()) { - final IntentionAction afterAction = LightQuickFixTestCase.findActionWithText(getAvailableActions(), text); + IntentionAction afterAction = LightQuickFixTestCase.findActionWithText(getAvailableActions(), text); if (afterAction != null) { fail("Action '" + text + "' is still available after its invocation in test " + testFullPath); diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java index 64e7301aa07..831b9774119 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java @@ -52,7 +52,7 @@ public abstract class AbstractQuickFixTest extends LightQuickFixTestCase { public void checkAvailableActionsAreExpected() { List actions = getAvailableActions(); - final Pair pair = parseActionHintImpl(getFile(), getEditor().getDocument().getText()); + Pair pair = parseActionHintImpl(getFile(), getEditor().getDocument().getText()); if (!pair.getSecond()) { // Action shouldn't be found. Check that other actions are expected and thus tested action isn't there under another name. QuickFixActionsUtils.checkAvailableActionsAreExpected((JetFile) getFile(), actions); diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java index a2987967f84..9906295a17b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java @@ -29,7 +29,7 @@ public class AddOpenToClassDeclarationTest extends AbstractQuickFixMultiFileTest LocalFileSystemUtils.refreshPath(getTestDataPath()); String path = getTestDataPath() + "javaCode/"; - final VirtualFile rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, path, myFilesToDelete, false); + VirtualFile rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, path, myFilesToDelete, false); addSourceContentToRoots(myModule, rootDir); PsiDocumentManager.getInstance(myProject).commitAllDocuments(); } diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java index 3f447d8101f..37bdb416d55 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java @@ -79,7 +79,7 @@ public class JetNameSuggesterTest extends LightCodeInsightFixtureTestCase { private void doTest() { myFixture.configureByFile(getTestName(false) + ".kt"); - final JetFile file = (JetFile) myFixture.getFile(); + JetFile file = (JetFile) myFixture.getFile(); PsiElement lastChild = file.getLastChild(); assert lastChild != null; String expectedResultText = null; diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java index 65d44352e9b..aa676ca32ae 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java @@ -74,14 +74,14 @@ public class RenameInKotlinTest extends MultiFileTestCase { ClassDescriptor classDescriptor = bindingContext.get(BindingContext.FQNAME_TO_CLASS_DESCRIPTOR, qClassName); assertNotNull(classDescriptor); - final JetScope scope = classDescriptor.getMemberScope(Collections.emptyList()); - final FunctionDescriptor methodDescriptor = scope.getFunctions(Name.identifier(oldMethodName)).iterator().next(); + JetScope scope = classDescriptor.getMemberScope(Collections.emptyList()); + FunctionDescriptor methodDescriptor = scope.getFunctions(Name.identifier(oldMethodName)).iterator().next(); return BindingContextUtils.callableDescriptorToDeclaration(bindingContext, methodDescriptor); } }, newMethodName); } - private void doTestWithRenameClass(@NonNls final FqName qClassName, @NonNls final String newName) throws Exception { + private void doTestWithRenameClass(@NonNls final FqName qClassName, @NonNls String newName) throws Exception { doTestWithRename(new Function() { @Override public PsiElement fun(PsiFile file) { diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/SimpleNameReferenceRenameTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/SimpleNameReferenceRenameTest.java index 127830f6982..022ed0f0382 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/SimpleNameReferenceRenameTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/SimpleNameReferenceRenameTest.java @@ -47,7 +47,7 @@ public class SimpleNameReferenceRenameTest extends LightCodeInsightTestCase { doTest("anotherRenamed"); } - private void doTest(final String newName) throws Exception { + private void doTest(String newName) throws Exception { configureByFile(getTestName(true) + ".kt"); PsiElement element = TargetElementUtilBase .findTargetElement(myEditor, diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java index 82163890101..c203b293dca 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java @@ -43,19 +43,19 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase { } public void testSuperclassNames() { - final PsiFile psiFile = myFixture.configureByText("foo.kt", "import java.util.ArrayList as alist\nclass C(): alist() { }"); - final List declarations = ((JetFile) psiFile).getDeclarations(); - final JetClass jetClass = (JetClass) declarations.get(0); - final PsiJetClassStub stub = JetStubElementTypes.CLASS.createStub(jetClass, null); - final List names = stub.getSuperNames(); + PsiFile psiFile = myFixture.configureByText("foo.kt", "import java.util.ArrayList as alist\nclass C(): alist() { }"); + List declarations = ((JetFile) psiFile).getDeclarations(); + JetClass jetClass = (JetClass) declarations.get(0); + PsiJetClassStub stub = JetStubElementTypes.CLASS.createStub(jetClass, null); + List names = stub.getSuperNames(); assertSameElements(names, "ArrayList", "alist"); } public void testClassIsTrait() { PsiFile psiFile = myFixture.configureByText("foo.kt", "trait Test { }"); - final List declarations = ((JetFile) psiFile).getDeclarations(); - final JetClass jetClass = (JetClass) declarations.get(0); - final PsiJetClassStub stub = JetStubElementTypes.CLASS.createStub(jetClass, null); + List declarations = ((JetFile) psiFile).getDeclarations(); + JetClass jetClass = (JetClass) declarations.get(0); + PsiJetClassStub stub = JetStubElementTypes.CLASS.createStub(jetClass, null); assertEquals(true, stub.isTrait()); } @@ -220,18 +220,18 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase { " VALUE_PARAMETER_LIST:PsiJetParameterListStubImpl\n"); } - private void doBuildTest(@NonNls final String source, @NonNls @NotNull final String tree) { - final JetFile file = (JetFile) createLightFile(JetFileType.INSTANCE, source); - final FileASTNode fileNode = file.getNode(); + private void doBuildTest(@NonNls String source, @NonNls @NotNull String tree) { + JetFile file = (JetFile) createLightFile(JetFileType.INSTANCE, source); + FileASTNode fileNode = file.getNode(); assertNotNull(fileNode); // assertFalse(fileNode.isParsed()); // TODO JetFileStubBuilder jetStubBuilder = new JetFileStubBuilder(); - final StubElement lighterTree = jetStubBuilder.buildStubTree(file); + StubElement lighterTree = jetStubBuilder.buildStubTree(file); // assertFalse(fileNode.isParsed()); // TODO - final String lightStr = DebugUtil.stubTreeToString(lighterTree); + String lightStr = DebugUtil.stubTreeToString(lighterTree); assertEquals("light tree differs", tree, lightStr); } diff --git a/idea/tests/org/jetbrains/jet/resolve/ResolveBaseTest.java b/idea/tests/org/jetbrains/jet/resolve/ResolveBaseTest.java index b8fd0facc53..7bd49c9d651 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ResolveBaseTest.java +++ b/idea/tests/org/jetbrains/jet/resolve/ResolveBaseTest.java @@ -55,11 +55,11 @@ public class ResolveBaseTest extends LightCodeInsightTestCase { } protected void doSingleResolveTest(@Nullable String referenceToString) throws Exception { - final String testName = getTestName(false); + String testName = getTestName(false); configureByFile(testName + ".kt"); int offset = getEditor().getCaretModel().getOffset(); - final PsiReference psiReference = getFile().findReferenceAt(offset); + PsiReference psiReference = getFile().findReferenceAt(offset); if (psiReference != null) { PsiElement resolvedTo = psiReference.resolve(); if (resolvedTo != null) { @@ -81,18 +81,18 @@ public class ResolveBaseTest extends LightCodeInsightTestCase { } protected void doMultiResolveTest() throws Exception { - final String testName = getTestName(false); + String testName = getTestName(false); configureByFile(testName + ".kt"); - final PsiReference psiReference = + PsiReference psiReference = getFile().findReferenceAt(getEditor().getCaretModel().getOffset()); assertTrue(psiReference instanceof PsiPolyVariantReference); - final PsiPolyVariantReference variantReference = (PsiPolyVariantReference) psiReference; + PsiPolyVariantReference variantReference = (PsiPolyVariantReference) psiReference; PsiElement element = variantReference.resolve(); - final ResolveResult[] results = variantReference.multiResolve(true); + ResolveResult[] results = variantReference.multiResolve(true); for (ResolveResult result : results) { assertNotNull(result); } diff --git a/idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java b/idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java index 5ff81699609..5bf9f777d3d 100644 --- a/idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java +++ b/idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java @@ -33,11 +33,11 @@ public class ConfigLibraryUtil { private ConfigLibraryUtil() { } - public static void configureKotlinRuntime(final Module module, final Sdk sdk) { + public static void configureKotlinRuntime(Module module, Sdk sdk) { configureLibrary(module, sdk, JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE); } - public static void unConfigureKotlinRuntime(final Module module, final Sdk sdk) { + public static void unConfigureKotlinRuntime(Module module, Sdk sdk) { unConfigureLibrary(module, sdk, JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE); } @@ -50,8 +50,8 @@ public class ConfigLibraryUtil { @Override public void run() { - final ModuleRootManager rootManager = ModuleRootManager.getInstance(module); - final ModifiableRootModel rootModel = rootManager.getModifiableModel(); + ModuleRootManager rootManager = ModuleRootManager.getInstance(module); + ModifiableRootModel rootModel = rootManager.getModifiableModel(); rootModel.setSdk(sdk); projectDescriptor.configureModule(module, rootModel, null); @@ -68,8 +68,8 @@ public class ConfigLibraryUtil { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - final ModuleRootManager rootManager = ModuleRootManager.getInstance(module); - final ModifiableRootModel rootModel = rootManager.getModifiableModel(); + ModuleRootManager rootManager = ModuleRootManager.getInstance(module); + ModifiableRootModel rootModel = rootManager.getModifiableModel(); rootModel.setSdk(sdk); if (projectDescriptor instanceof JetJdkAndLibraryProjectDescriptor) { diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.java b/j2k/src/org/jetbrains/jet/j2k/Converter.java index 8208cde69c4..4b104d8a229 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Converter.java +++ b/j2k/src/org/jetbrains/jet/j2k/Converter.java @@ -130,7 +130,7 @@ public class Converter { @NotNull private File fileToFile(PsiJavaFile javaFile, List additionalImports) { - final PsiImportList importList = javaFile.getImportList(); + PsiImportList importList = javaFile.getImportList(); List imports = importList == null ? Collections.emptyList() : importsToImportList(importList.getAllImportStatements()); @@ -204,7 +204,7 @@ public class Converter { private static List createInitStatementsFromFields(@NotNull List fields) { List result = new LinkedList(); for (Field f : fields) { - final String identifierToKotlin = f.getIdentifier().toKotlin(); + String identifierToKotlin = f.getIdentifier().toKotlin(); result.add(new DummyStringExpression(identifierToKotlin + " = " + "_" + identifierToKotlin)); } return result; @@ -214,7 +214,7 @@ public class Converter { private static String createPrimaryConstructorInvocation(@NotNull String s, @NotNull List fields, @NotNull Map initializers) { List result = new LinkedList(); for (Field f : fields) { - final String id = f.getIdentifier().toKotlin(); + String id = f.getIdentifier().toKotlin(); result.add(initializers.get(id)); } return s + "(" + AstUtil.join(result, ", ") + ")"; @@ -222,20 +222,20 @@ public class Converter { @NotNull public Class classToClass(@NotNull PsiClass psiClass) { - final Set modifiers = modifiersListToModifiersSet(psiClass.getModifierList()); - final List fields = fieldsToFieldList(psiClass.getFields(), psiClass); - final List typeParameters = elementsToElementList(psiClass.getTypeParameters()); - final List implementsTypes = typesToNotNullableTypeList(psiClass.getImplementsListTypes()); - final List extendsTypes = typesToNotNullableTypeList(psiClass.getExtendsListTypes()); - final IdentifierImpl name = new IdentifierImpl(psiClass.getName()); - final List baseClassParams = new LinkedList(); + Set modifiers = modifiersListToModifiersSet(psiClass.getModifierList()); + List fields = fieldsToFieldList(psiClass.getFields(), psiClass); + List typeParameters = elementsToElementList(psiClass.getTypeParameters()); + List implementsTypes = typesToNotNullableTypeList(psiClass.getImplementsListTypes()); + List extendsTypes = typesToNotNullableTypeList(psiClass.getExtendsListTypes()); + IdentifierImpl name = new IdentifierImpl(psiClass.getName()); + List baseClassParams = new LinkedList(); List members = getMembers(psiClass); // we try to find super() call and generate class declaration like that: class A(name: String, i : Int) : Base(name) - final SuperVisitor visitor = new SuperVisitor(); + SuperVisitor visitor = new SuperVisitor(); psiClass.accept(visitor); - final Collection resolvedSuperCallParameters = visitor.getResolvedSuperCallParameters(); + Collection resolvedSuperCallParameters = visitor.getResolvedSuperCallParameters(); if (resolvedSuperCallParameters.size() == 1) { baseClassParams.addAll( expressionsToExpressionList( @@ -246,10 +246,10 @@ public class Converter { // we create primary constructor from all non final fields and fields without initializers if (!psiClass.isEnum() && !psiClass.isInterface() && psiClass.getConstructors().length > 1 && getPrimaryConstructorForThisCase(psiClass) == null) { - final List finalOrWithEmptyInitializer = getFinalOrWithEmptyInitializer(fields); - final Map initializers = new HashMap(); + List finalOrWithEmptyInitializer = getFinalOrWithEmptyInitializer(fields); + Map initializers = new HashMap(); - for (final Member m : members) { + for (Member m : members) { // and modify secondaries if (m.getKind() == INode.Kind.CONSTRUCTOR) { Function f = (Function) m; @@ -259,16 +259,16 @@ public class Converter { initializers.put(fo.getIdentifier().toKotlin(), init); } - final List newStatements = new LinkedList(); + List newStatements = new LinkedList(); for (Statement s : f.getBlock().getStatements()) { boolean isRemoved = false; if (s.getKind() == INode.Kind.ASSIGNMENT_EXPRESSION) { - final AssignmentExpression assignmentExpression = (AssignmentExpression) s; + AssignmentExpression assignmentExpression = (AssignmentExpression) s; if (assignmentExpression.getLeft().getKind() == INode.Kind.CALL_CHAIN) { for (Field fo : finalOrWithEmptyInitializer) { - final String id = fo.getIdentifier().toKotlin(); + String id = fo.getIdentifier().toKotlin(); if (((CallChainExpression) assignmentExpression.getLeft()).getIdentifier().toKotlin().endsWith("." + id)) { initializers.put(id, assignmentExpression.getRight().toKotlin()); isRemoved = true; @@ -330,7 +330,7 @@ public class Converter { return "null"; } else { - final String typeToKotlin = f.getType().toKotlin(); + String typeToKotlin = f.getType().toKotlin(); if (typeToKotlin.equals("Boolean")) return "false"; if (typeToKotlin.equals("Char")) return "' '"; if (typeToKotlin.equals("Double")) return "0." + OperatorConventions.DOUBLE + "()"; @@ -376,7 +376,7 @@ public class Converter { public static boolean isConstructorPrimary(@NotNull PsiMethod constructor) { if (constructor.getParent() instanceof PsiClass) { - final PsiClass parent = (PsiClass) constructor.getParent(); + PsiClass parent = (PsiClass) constructor.getParent(); if (parent.getConstructors().length == 1) { return true; } @@ -416,15 +416,15 @@ public class Converter { methodReturnType = method.getReturnType(); - final IdentifierImpl identifier = new IdentifierImpl(method.getName()); - final Type returnType = typeToType(method.getReturnType(), ConverterUtil.isAnnotatedAsNotNull(method.getModifierList())); - final Block body = hasFlag(J2KConverterFlags.SKIP_BODIES) + IdentifierImpl identifier = new IdentifierImpl(method.getName()); + Type returnType = typeToType(method.getReturnType(), ConverterUtil.isAnnotatedAsNotNull(method.getModifierList())); + Block body = hasFlag(J2KConverterFlags.SKIP_BODIES) ? Block.EMPTY_BLOCK : blockToBlock(method.getBody(), notEmpty); // #TODO - final Element params = createFunctionParameters(method); - final List typeParameters = elementsToElementList(method.getTypeParameters()); + Element params = createFunctionParameters(method); + List typeParameters = elementsToElementList(method.getTypeParameters()); - final Set modifiers = modifiersListToModifiersSet(method.getModifierList()); + Set modifiers = modifiersListToModifiersSet(method.getModifierList()); if (isOverrideAnyMethodExceptMethodsFromObject(method)) { modifiers.add(Modifier.OVERRIDE); } @@ -470,9 +470,9 @@ public class Converter { return new ParameterList(result); } - private static boolean isNotOpenMethod(@NotNull final PsiMethod method) { + private static boolean isNotOpenMethod(@NotNull PsiMethod method) { if (method.getParent() instanceof PsiClass) { - final PsiModifierList parentModifierList = ((PsiClass) method.getParent()).getModifierList(); + PsiModifierList parentModifierList = ((PsiClass) method.getParent()).getModifierList(); if ((parentModifierList != null && parentModifierList.hasExplicitModifier(Modifier.FINAL)) || ((PsiClass) method.getParent()).isEnum()) { return true; } @@ -528,11 +528,11 @@ public class Converter { return false; } - private static boolean isOverrideObjectDirect(@NotNull final PsiMethod method) { + private static boolean isOverrideObjectDirect(@NotNull PsiMethod method) { List superSignatures = method.getHierarchicalMethodSignature().getSuperSignatures(); if (superSignatures.size() == 1) { - final PsiClass containingClass = superSignatures.get(0).getMethod().getContainingClass(); - final String qualifiedName = containingClass != null ? containingClass.getQualifiedName() : ""; + PsiClass containingClass = superSignatures.get(0).getMethod().getContainingClass(); + String qualifiedName = containingClass != null ? containingClass.getQualifiedName() : ""; if (qualifiedName != null && qualifiedName.equals(JAVA_LANG_OBJECT)) { return true; } @@ -568,7 +568,7 @@ public class Converter { @NotNull public Statement statementToStatement(@Nullable PsiStatement s) { if (s == null) return Statement.EMPTY_STATEMENT; - final StatementVisitor statementVisitor = new StatementVisitor(this); + StatementVisitor statementVisitor = new StatementVisitor(this); s.accept(statementVisitor); return statementVisitor.getResult(); } @@ -583,7 +583,7 @@ public class Converter { @NotNull public Expression expressionToExpression(@Nullable PsiExpression e) { if (e == null) return Expression.EMPTY_EXPRESSION; - final ExpressionVisitor expressionVisitor = dispatcher.getExpressionVisitor(); + ExpressionVisitor expressionVisitor = dispatcher.getExpressionVisitor(); e.accept(expressionVisitor); return expressionVisitor.getResult(); } @@ -591,7 +591,7 @@ public class Converter { @NotNull public Element elementToElement(@Nullable PsiElement e) { if (e == null) return Element.EMPTY_ELEMENT; - final ElementVisitor elementVisitor = new ElementVisitor(this); + ElementVisitor elementVisitor = new ElementVisitor(this); e.accept(elementVisitor); return elementVisitor.getResult(); } @@ -649,7 +649,7 @@ public class Converter { @NotNull private static Import importToImport(@NotNull PsiImportStatementBase i) { - final PsiJavaCodeReferenceElement reference = i.getImportReference(); + PsiJavaCodeReferenceElement reference = i.getImportReference(); if (reference != null) { return new Import(quoteKeywords(reference.getQualifiedName()) + (i.isOnDemand() ? ".*" : "")); } @@ -698,7 +698,7 @@ public class Converter { PsiExpression[] arguments = argumentList != null ? argumentList.getExpressions() : new PsiExpression[]{}; List conversions = new LinkedList(); //noinspection UnusedDeclaration - for (final PsiExpression a : arguments) { + for (PsiExpression a : arguments) { conversions.add(""); } @@ -763,7 +763,7 @@ public class Converter { return conversion; } - private static boolean isConversionNeeded(@Nullable final PsiType actual, @Nullable final PsiType expected) { + private static boolean isConversionNeeded(@Nullable PsiType actual, @Nullable PsiType expected) { if (actual == null || expected == null) { return false; } diff --git a/j2k/src/org/jetbrains/jet/j2k/ConverterUtil.java b/j2k/src/org/jetbrains/jet/j2k/ConverterUtil.java index 185621990d3..30594606f6d 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ConverterUtil.java +++ b/j2k/src/org/jetbrains/jet/j2k/ConverterUtil.java @@ -52,7 +52,7 @@ public class ConverterUtil { @Nullable private static PsiMethod findMainMethod(@NotNull PsiClass aClass) { if (isMainClass(aClass)) { - final PsiMethod[] mainMethods = aClass.findMethodsByName("main", false); + PsiMethod[] mainMethods = aClass.findMethodsByName("main", false); return findMainMethod(mainMethods); } return null; @@ -77,11 +77,11 @@ public class ConverterUtil { if (PsiType.VOID != method.getReturnType()) return false; if (!method.hasModifierProperty(PsiModifier.STATIC)) return false; if (!method.hasModifierProperty(PsiModifier.PUBLIC)) return false; - final PsiParameter[] parameters = method.getParameterList().getParameters(); + PsiParameter[] parameters = method.getParameterList().getParameters(); if (parameters.length != 1) return false; - final PsiType type = parameters[0].getType(); + PsiType type = parameters[0].getType(); if (!(type instanceof PsiArrayType)) return false; - final PsiType componentType = ((PsiArrayType) type).getComponentType(); + PsiType componentType = ((PsiArrayType) type).getComponentType(); return componentType.equalsToText("java.lang.String"); } diff --git a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java index 274c06e0853..04b30a984e7 100644 --- a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java +++ b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java @@ -137,7 +137,7 @@ public class JavaToKotlinTranslator { public static void main(@NotNull String[] args) throws IOException { //noinspection UseOfSystemOutOrSystemErr - final PrintStream out = System.out; + PrintStream out = System.out; if (args.length == 1) { String kotlinCode = ""; try { diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.java b/j2k/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.java index b4560a47cef..d3dfdb80dfb 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.java @@ -26,13 +26,13 @@ public class ArrayInitializerExpression extends Expression { private final Type myType; private final List myInitializers; - public ArrayInitializerExpression(final Type type, List initializers) { + public ArrayInitializerExpression(Type type, List initializers) { myType = type; myInitializers = initializers; } @NotNull - private static String createArrayFunction(@NotNull final Type type) { + private static String createArrayFunction(@NotNull Type type) { String sType = innerTypeStr(type); if (PRIMITIVE_TYPES.contains(sType)) { return sType + "Array"; // intArray @@ -41,12 +41,12 @@ public class ArrayInitializerExpression extends Expression { } @NotNull - private static String innerTypeStr(@NotNull final Type type) { + private static String innerTypeStr(@NotNull Type type) { return type.convertedToNotNull().toKotlin().replace("Array", "").toLowerCase(); } @NotNull - private static String createInitializers(@NotNull final Type type, @NotNull final List initializers) { + private static String createInitializers(@NotNull Type type, @NotNull List initializers) { List arguments = new LinkedList(); for (Expression i : initializers) arguments.add(explicitConvertIfNeeded(type, i)); @@ -54,7 +54,7 @@ public class ArrayInitializerExpression extends Expression { } @NotNull - private static String explicitConvertIfNeeded(@NotNull final Type type, @NotNull final Expression i) { + private static String explicitConvertIfNeeded(@NotNull Type type, @NotNull Expression i) { Set doubleOrFloatTypes = new HashSet( Arrays.asList("double", "float", "java.lang.double", "java.lang.float") ); @@ -72,7 +72,7 @@ public class ArrayInitializerExpression extends Expression { } @NotNull - private static String getConversion(@NotNull final String afterReplace) { + private static String getConversion(@NotNull String afterReplace) { if (afterReplace.contains("double")) return DOT + OperatorConventions.DOUBLE + "()"; if (afterReplace.contains("float")) return DOT + OperatorConventions.FLOAT + "()"; return ""; diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/CaseContainer.java b/j2k/src/org/jetbrains/jet/j2k/ast/CaseContainer.java index e9b3939b4f8..4f389f312e6 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/CaseContainer.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/CaseContainer.java @@ -26,7 +26,7 @@ public class CaseContainer extends Statement { private final List myCaseStatement; private final Block myBlock; - public CaseContainer(final List caseStatement, @NotNull final List statements) { + public CaseContainer(List caseStatement, @NotNull List statements) { myCaseStatement = caseStatement; List newStatements = new LinkedList(); for (Statement s : statements) diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Class.java b/j2k/src/org/jetbrains/jet/j2k/ast/Class.java index 4be63b25612..5d08195ed6b 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Class.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Class.java @@ -116,7 +116,7 @@ public class Class extends Member { @NotNull LinkedList membersExceptConstructors() { - final LinkedList result = new LinkedList(); + LinkedList result = new LinkedList(); for (Member m : myMembers) if (m.getKind() != Kind.CONSTRUCTOR) { result.add(m); @@ -126,18 +126,18 @@ public class Class extends Member { @NotNull List secondaryConstructorsAsStaticInitFunction() { - final LinkedList result = new LinkedList(); + LinkedList result = new LinkedList(); for (Member m : myMembers) if (m.getKind() == Kind.CONSTRUCTOR && !((Constructor) m).isPrimary()) { Function f = (Function) m; Set modifiers = new HashSet(m.myModifiers); modifiers.add(Modifier.STATIC); - final List statements = f.getBlock().getStatements(); + List statements = f.getBlock().getStatements(); statements.add(new ReturnStatement(new IdentifierImpl("__"))); // TODO: move to one place, find other __ usages - final Block block = new Block(statements); + Block block = new Block(statements); - final List typeParameters = new LinkedList(); + List typeParameters = new LinkedList(); if (f.getTypeParameters().size() == 0) { typeParameters.addAll(myTypeParameters); } @@ -245,7 +245,7 @@ public class Class extends Member { @NotNull private String classObjectToKotlin() { - final List staticMembers = new LinkedList(secondaryConstructorsAsStaticInitFunction()); + List staticMembers = new LinkedList(secondaryConstructorsAsStaticInitFunction()); staticMembers.addAll(getStatic(membersExceptConstructors())); if (staticMembers.size() > 0) { return "class" + SPACE + "object" + SPACE + "{" + N + diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java b/j2k/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java index 71eebc64c57..7c25f2e1f68 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/DeclarationStatement.java @@ -36,7 +36,7 @@ public class DeclarationStatement extends Statement { if (e instanceof LocalVariable) { LocalVariable v = (LocalVariable) e; - final String varKeyword = v.hasModifier(Modifier.FINAL) ? "val" : "var"; + String varKeyword = v.hasModifier(Modifier.FINAL) ? "val" : "var"; result.add( varKeyword + SPACE + e.toKotlin() ); diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Field.java b/j2k/src/org/jetbrains/jet/j2k/ast/Field.java index 95138db55ed..112a404f892 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Field.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Field.java @@ -82,7 +82,7 @@ public class Field extends Member { @NotNull @Override public String toKotlin() { - final String declaration = modifiersToKotlin() + myIdentifier.toKotlin() + SPACE + COLON + SPACE + myType.toKotlin(); + String declaration = modifiersToKotlin() + myIdentifier.toKotlin() + SPACE + COLON + SPACE + myType.toKotlin(); if (myInitializer.isEmpty()) { return declaration + (isVal() && !isStatic() && myWritingAccesses == 1 diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/File.java b/j2k/src/org/jetbrains/jet/j2k/ast/File.java index 40602e69ac7..382e6db6e77 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/File.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/File.java @@ -37,7 +37,7 @@ public class File extends Node { @NotNull @Override public String toKotlin() { - final String common = AstUtil.joinNodes(myImports, N) + N2 + AstUtil.joinNodes(myClasses, N) + N + myMainFunction; + String common = AstUtil.joinNodes(myImports, N) + N2 + AstUtil.joinNodes(myClasses, N) + N + myMainFunction; if (myPackageName.isEmpty()) { return common; } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/NewClassExpression.java b/j2k/src/org/jetbrains/jet/j2k/ast/NewClassExpression.java index fa811ba3573..e34e229a6f7 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/NewClassExpression.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/NewClassExpression.java @@ -48,8 +48,8 @@ public class NewClassExpression extends Expression { @NotNull @Override public String toKotlin() { - final String callOperator = myQualifier.isNullable() ? QUESTDOT : DOT; - final String qualifier = myQualifier.isEmpty() ? EMPTY : myQualifier.toKotlin() + callOperator; + String callOperator = myQualifier.isNullable() ? QUESTDOT : DOT; + String qualifier = myQualifier.isEmpty() ? EMPTY : myQualifier.toKotlin() + callOperator; List applyConversions = AstUtil.applyConversions(AstUtil.nodesToKotlin(myArguments), myConversions); String appliedArguments = AstUtil.join(applyConversions, COMMA_WITH_SPACE); return myAnonymousClass != null ? diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/ReturnStatement.java b/j2k/src/org/jetbrains/jet/j2k/ast/ReturnStatement.java index 554194e5415..22ca617047a 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/ReturnStatement.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/ReturnStatement.java @@ -27,7 +27,7 @@ public class ReturnStatement extends Statement { myExpression = expression; } - public ReturnStatement(final Expression expression, final String conversion) { + public ReturnStatement(Expression expression, String conversion) { this(expression); myConversion = conversion; } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/SwitchContainer.java b/j2k/src/org/jetbrains/jet/j2k/ast/SwitchContainer.java index 6e0e2f16a49..e2d9515bfe7 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/SwitchContainer.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/SwitchContainer.java @@ -25,7 +25,7 @@ public class SwitchContainer extends Statement { private final Expression myExpression; private final List myCaseContainers; - public SwitchContainer(final Expression expression, final List caseContainers) { + public SwitchContainer(Expression expression, List caseContainers) { myExpression = expression; myCaseContainers = caseContainers; } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/SwitchLabelStatement.java b/j2k/src/org/jetbrains/jet/j2k/ast/SwitchLabelStatement.java index a2b01f38b14..0404c345de8 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/SwitchLabelStatement.java +++ b/j2k/src/org/jetbrains/jet/j2k/ast/SwitchLabelStatement.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; public class SwitchLabelStatement extends Statement { private final Expression myExpression; - public SwitchLabelStatement(final Expression expression) { + public SwitchLabelStatement(Expression expression) { myExpression = expression; } diff --git a/j2k/src/org/jetbrains/jet/j2k/util/AstUtil.java b/j2k/src/org/jetbrains/jet/j2k/util/AstUtil.java index c3f6792b82f..560184d8b6f 100644 --- a/j2k/src/org/jetbrains/jet/j2k/util/AstUtil.java +++ b/j2k/src/org/jetbrains/jet/j2k/util/AstUtil.java @@ -28,7 +28,7 @@ public class AstUtil { private AstUtil() { } - private static String join(@NotNull final String[] array, @Nullable final String delimiter) { + private static String join(@NotNull String[] array, @Nullable String delimiter) { StringBuilder buffer = new StringBuilder(); boolean haveDelimiter = (delimiter != null); @@ -43,11 +43,11 @@ public class AstUtil { return buffer.toString(); } - public static String joinNodes(@NotNull final List nodes, final String delimiter) { + public static String joinNodes(@NotNull List nodes, String delimiter) { return join(nodesToKotlin(nodes), delimiter); } - public static String join(@NotNull final List array, final String delimiter) { + public static String join(@NotNull List array, String delimiter) { return join(array.toArray(new String[array.size()]), delimiter); } @@ -70,8 +70,8 @@ public class AstUtil { } @NotNull - public static List createListWithEmptyString(@NotNull final List arguments) { - final List conversions = new LinkedList(); + public static List createListWithEmptyString(@NotNull List arguments) { + List conversions = new LinkedList(); //noinspection UnusedDeclaration for (T argument : arguments) conversions.add(""); return conversions; diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/Dispatcher.java b/j2k/src/org/jetbrains/jet/j2k/visitors/Dispatcher.java index ebe2d0e749b..3b566cfc0aa 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/Dispatcher.java +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/Dispatcher.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.j2k.Converter; public class Dispatcher { private ExpressionVisitor myExpressionVisitor; - public void setExpressionVisitor(final ExpressionVisitor expressionVisitor) { + public void setExpressionVisitor(ExpressionVisitor expressionVisitor) { this.myExpressionVisitor = expressionVisitor; } diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.java b/j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.java index db6a0f0999f..4396ce28cad 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.java +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.java @@ -73,7 +73,7 @@ public class ElementVisitor extends JavaElementVisitor implements J2KVisitor { public void visitReferenceElement(@NotNull PsiJavaCodeReferenceElement reference) { super.visitReferenceElement(reference); - final List types = getConverter().typesToTypeList(reference.getTypeParameters()); + List types = getConverter().typesToTypeList(reference.getTypeParameters()); if (!reference.isQualified()) { myResult = new ReferenceElement( new IdentifierImpl(reference.getReferenceName()), @@ -84,7 +84,7 @@ public class ElementVisitor extends JavaElementVisitor implements J2KVisitor { String result = new IdentifierImpl(reference.getReferenceName()).toKotlin(); PsiElement qualifier = reference.getQualifier(); while (qualifier != null) { - final PsiJavaCodeReferenceElement p = (PsiJavaCodeReferenceElement) qualifier; + PsiJavaCodeReferenceElement p = (PsiJavaCodeReferenceElement) qualifier; result = new IdentifierImpl(p.getReferenceName()).toKotlin() + "." + result; // TODO: maybe need to replace by safe call? qualifier = p.getQualifier(); } diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java index e922e22f32e..ed4d107b497 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java @@ -40,7 +40,7 @@ public class ExpressionVisitor extends StatementVisitor { } @Override - public void visitExpression(final PsiExpression expression) { + public void visitExpression(PsiExpression expression) { myResult = Expression.EMPTY_EXPRESSION; } @@ -74,7 +74,7 @@ public class ExpressionVisitor extends StatementVisitor { // TODO: simplify - final IElementType tokenType = expression.getOperationSign().getTokenType(); + IElementType tokenType = expression.getOperationSign().getTokenType(); String secondOp = ""; if (tokenType == JavaTokenType.GTGTEQ) secondOp = "shr"; @@ -196,11 +196,11 @@ public class ExpressionVisitor extends StatementVisitor { public void visitLiteralExpression(@NotNull PsiLiteralExpression expression) { super.visitLiteralExpression(expression); - final Object value = expression.getValue(); + Object value = expression.getValue(); String text = expression.getText(); boolean isQuotingNeeded = true; - final PsiType type = expression.getType(); + PsiType type = expression.getType(); if (type != null) { String canonicalTypeStr = type.getCanonicalText(); if (canonicalTypeStr.equals("double") || canonicalTypeStr.equals(JAVA_LANG_DOUBLE)) { @@ -264,10 +264,10 @@ public class ExpressionVisitor extends StatementVisitor { @NotNull private Expression createNewClassExpression(@NotNull PsiNewExpression expression) { - final PsiAnonymousClass anonymousClass = expression.getAnonymousClass(); - final PsiMethod constructor = expression.resolveMethod(); + PsiAnonymousClass anonymousClass = expression.getAnonymousClass(); + PsiMethod constructor = expression.resolveMethod(); PsiJavaCodeReferenceElement classReference = expression.getClassOrAnonymousClassReference(); - final boolean isNotConvertedClass = classReference != null && !getConverter().getClassIdentifiers().contains(classReference.getQualifiedName()); + boolean isNotConvertedClass = classReference != null && !getConverter().getClassIdentifiers().contains(classReference.getQualifiedName()); PsiExpressionList argumentList = expression.getArgumentList(); PsiExpression[] arguments = argumentList != null ? argumentList.getExpressions() : new PsiExpression[]{}; if (constructor == null || isConstructorPrimary(constructor) || isNotConvertedClass) { @@ -280,8 +280,8 @@ public class ExpressionVisitor extends StatementVisitor { ); } // is constructor secondary - final PsiJavaCodeReferenceElement reference = expression.getClassReference(); - final List typeParameters = reference != null + PsiJavaCodeReferenceElement reference = expression.getClassReference(); + List typeParameters = reference != null ? getConverter().typesToTypeList(reference.getTypeParameters()) : Collections.emptyList(); return new CallChainExpression( @@ -342,17 +342,17 @@ public class ExpressionVisitor extends StatementVisitor { public void visitReferenceExpression(@NotNull PsiReferenceExpression expression) { super.visitReferenceExpression(expression); - final boolean isFieldReference = isFieldReference(expression, getContainingClass(expression)); - final boolean insideSecondaryConstructor = isInsideSecondaryConstructor(expression); - final boolean hasReceiver = isFieldReference && insideSecondaryConstructor; - final boolean isThis = isThisExpression(expression); - final boolean notNull = isResolvedToNotNull(expression); - final boolean isNullable = getConverter().typeToType(expression.getType(), notNull).isNullable(); - final String className = getClassNameWithConstructor(expression); + boolean isFieldReference = isFieldReference(expression, getContainingClass(expression)); + boolean insideSecondaryConstructor = isInsideSecondaryConstructor(expression); + boolean hasReceiver = isFieldReference && insideSecondaryConstructor; + boolean isThis = isThisExpression(expression); + boolean notNull = isResolvedToNotNull(expression); + boolean isNullable = getConverter().typeToType(expression.getType(), notNull).isNullable(); + String className = getClassNameWithConstructor(expression); Expression identifier = new IdentifierImpl(expression.getReferenceName(), isNullable); - final String __ = "__"; + String __ = "__"; if (hasReceiver) { identifier = new CallChainExpression(new IdentifierImpl(__, false), new IdentifierImpl(expression.getReferenceName(), isNullable)); } @@ -382,9 +382,9 @@ public class ExpressionVisitor extends StatementVisitor { PsiElement context = expression.getContext(); while (context != null) { if (context instanceof PsiMethod && ((PsiMethod) context).isConstructor()) { - final PsiClass containingClass = ((PsiMethod) context).getContainingClass(); + PsiClass containingClass = ((PsiMethod) context).getContainingClass(); if (containingClass != null) { - final PsiIdentifier identifier = containingClass.getNameIdentifier(); + PsiIdentifier identifier = containingClass.getNameIdentifier(); if (identifier != null) { return identifier.getText(); } @@ -400,8 +400,8 @@ public class ExpressionVisitor extends StatementVisitor { PsiElement context = expression.getContext(); while (context != null) { if (context instanceof PsiClass) { - final PsiClass containingClass = (PsiClass) context; - final PsiIdentifier identifier = containingClass.getNameIdentifier(); + PsiClass containingClass = (PsiClass) context; + PsiIdentifier identifier = containingClass.getNameIdentifier(); if (identifier != null) { return identifier.getText(); } @@ -412,9 +412,9 @@ public class ExpressionVisitor extends StatementVisitor { } private static boolean isFieldReference(@NotNull PsiReferenceExpression expression, PsiClass currentClass) { - final PsiReference reference = expression.getReference(); + PsiReference reference = expression.getReference(); if (reference != null) { - final PsiElement resolvedReference = reference.resolve(); + PsiElement resolvedReference = reference.resolve(); if (resolvedReference != null) { if (resolvedReference instanceof PsiField) { return ((PsiField) resolvedReference).getContainingClass() == currentClass; @@ -461,7 +461,7 @@ public class ExpressionVisitor extends StatementVisitor { private static boolean isThisExpression(@NotNull PsiReferenceExpression expression) { for (PsiReference r : expression.getReferences()) if (r.getCanonicalText().equals("this")) { - final PsiElement res = r.resolve(); + PsiElement res = r.resolve(); if (res != null && res instanceof PsiMethod && ((PsiMethod) res).isConstructor()) { return true; } @@ -472,7 +472,7 @@ public class ExpressionVisitor extends StatementVisitor { @Override public void visitSuperExpression(@NotNull PsiSuperExpression expression) { super.visitSuperExpression(expression); - final PsiJavaCodeReferenceElement qualifier = expression.getQualifier(); + PsiJavaCodeReferenceElement qualifier = expression.getQualifier(); myResult = new SuperExpression( qualifier != null ? new IdentifierImpl(qualifier.getQualifiedName()) : @@ -483,7 +483,7 @@ public class ExpressionVisitor extends StatementVisitor { @Override public void visitThisExpression(@NotNull PsiThisExpression expression) { super.visitThisExpression(expression); - final PsiJavaCodeReferenceElement qualifier = expression.getQualifier(); + PsiJavaCodeReferenceElement qualifier = expression.getQualifier(); myResult = new ThisExpression( qualifier != null ? new IdentifierImpl(qualifier.getQualifiedName()) : @@ -495,7 +495,7 @@ public class ExpressionVisitor extends StatementVisitor { public void visitTypeCastExpression(@NotNull PsiTypeCastExpression expression) { super.visitTypeCastExpression(expression); - final PsiTypeElement castType = expression.getCastType(); + PsiTypeElement castType = expression.getCastType(); if (castType != null) { myResult = new TypeCastExpression( getConverter().typeToType(castType.getType()), diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.java b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.java index 27909c68a05..6aeeadd13d1 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.java +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.java @@ -31,7 +31,7 @@ public class ExpressionVisitorForDirectObjectInheritors extends ExpressionVisito } @Override - public void visitMethodCallExpression(@NotNull final PsiMethodCallExpression expression) { + public void visitMethodCallExpression(@NotNull PsiMethodCallExpression expression) { if (superMethodInvocation(expression.getMethodExpression(), "hashCode")) { myResult = new DummyMethodCallExpression(new IdentifierImpl("System"), "identityHashCode", new IdentifierImpl("this")); } @@ -47,11 +47,11 @@ public class ExpressionVisitorForDirectObjectInheritors extends ExpressionVisito } @Override - public void visitReferenceExpression(@NotNull final PsiReferenceExpression expression) { + public void visitReferenceExpression(@NotNull PsiReferenceExpression expression) { super.visitReferenceExpression(expression); } - private static boolean superMethodInvocation(@NotNull final PsiReferenceExpression expression, final String methodName) { + private static boolean superMethodInvocation(@NotNull PsiReferenceExpression expression, String methodName) { String referenceName = expression.getReferenceName(); PsiExpression qualifierExpression = expression.getQualifierExpression(); if (referenceName != null && referenceName.equals(methodName)) { diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.java b/j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.java index db452e7f9c7..61a07ccd3f9 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.java +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.java @@ -127,12 +127,12 @@ public class StatementVisitor extends ElementVisitor { public void visitForStatement(@NotNull PsiForStatement statement) { super.visitForStatement(statement); - final PsiStatement initialization = statement.getInitialization(); - final PsiStatement update = statement.getUpdate(); - final PsiExpression condition = statement.getCondition(); - final PsiStatement body = statement.getBody(); + PsiStatement initialization = statement.getInitialization(); + PsiStatement update = statement.getUpdate(); + PsiExpression condition = statement.getCondition(); + PsiStatement body = statement.getBody(); - final PsiLocalVariable firstChild = initialization != null && initialization.getFirstChild() instanceof PsiLocalVariable + PsiLocalVariable firstChild = initialization != null && initialization.getFirstChild() instanceof PsiLocalVariable ? (PsiLocalVariable) initialization.getFirstChild() : null; @@ -142,7 +142,7 @@ public class StatementVisitor extends ElementVisitor { int updateWriteCount = countWritingAccesses(firstChild, update); boolean onceWritableIterator = updateWriteCount == 1 && bodyWriteCount + conditionWriteCount == 0; - final IElementType operationTokenType = condition != null && condition instanceof PsiBinaryExpression ? + IElementType operationTokenType = condition != null && condition instanceof PsiBinaryExpression ? ((PsiBinaryExpression) condition).getOperationTokenType() : null; if ( initialization != null && @@ -160,8 +160,8 @@ public class StatementVisitor extends ElementVisitor { && firstChild.getNameIdentifier() != null && onceWritableIterator ) { - final Expression end = getConverter().expressionToExpression(((PsiBinaryExpression) condition).getROperand()); - final Expression endExpression = operationTokenType == JavaTokenType.LT ? + Expression end = getConverter().expressionToExpression(((PsiBinaryExpression) condition).getROperand()); + Expression endExpression = operationTokenType == JavaTokenType.LT ? new BinaryExpression(end, new IdentifierImpl("1"), "-") : end; myResult = new ForeachWithRangeStatement( @@ -240,9 +240,9 @@ public class StatementVisitor extends ElementVisitor { } @NotNull - private List switchBodyToCases(@Nullable final PsiCodeBlock body) { - final List> cases = splitToCases(body); - final List allSwitchStatements = body != null + private List switchBodyToCases(@Nullable PsiCodeBlock body) { + List> cases = splitToCases(body); + List allSwitchStatements = body != null ? Arrays.asList(body.getStatements()) : Collections.emptyList(); @@ -282,7 +282,7 @@ public class StatementVisitor extends ElementVisitor { return result; } - private static boolean containsBreak(@NotNull final List slice) { + private static boolean containsBreak(@NotNull List slice) { for (PsiStatement s : slice) if (s instanceof PsiBreakStatement) { return true; @@ -291,7 +291,7 @@ public class StatementVisitor extends ElementVisitor { } @NotNull - private static List getAllToNextBreak(@NotNull final List allStatements, final int start) { + private static List getAllToNextBreak(@NotNull List allStatements, int start) { List result = new LinkedList(); for (int i = start; i < allStatements.size(); i++) { PsiStatement s = allStatements.get(i); @@ -306,7 +306,7 @@ public class StatementVisitor extends ElementVisitor { } @NotNull - private static List> splitToCases(@Nullable final PsiCodeBlock body) { + private static List> splitToCases(@Nullable PsiCodeBlock body) { List> cases = new LinkedList>(); List currentCaseStatements = new LinkedList(); boolean isFirst = true; diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/SuperVisitor.java b/j2k/src/org/jetbrains/jet/j2k/visitors/SuperVisitor.java index 212fef40520..4f665cfdeb1 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/SuperVisitor.java +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/SuperVisitor.java @@ -45,7 +45,7 @@ public class SuperVisitor extends JavaRecursiveElementVisitor { static boolean isSuper(@NotNull PsiReference r) { if (r.getCanonicalText().equals("super")) { - final PsiElement baseConstructor = r.resolve(); + PsiElement baseConstructor = r.resolve(); if (baseConstructor != null && baseConstructor instanceof PsiMethod && ((PsiMethod) baseConstructor).isConstructor()) { return true; } diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.java b/j2k/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.java index af358349552..f02dfa81684 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.java +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.java @@ -31,7 +31,7 @@ public class ThisVisitor extends JavaRecursiveElementVisitor { public void visitReferenceExpression(@NotNull PsiReferenceExpression expression) { for (PsiReference r : expression.getReferences()) if (r.getCanonicalText().equals("this")) { - final PsiElement res = r.resolve(); + PsiElement res = r.resolve(); if (res != null && res instanceof PsiMethod && ((PsiMethod) res).isConstructor()) { myResolvedConstructors.add((PsiMethod) res); } diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java b/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java index 061f9d9e3b5..f67ba1648ea 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.java @@ -55,8 +55,8 @@ public class TypeVisitor extends PsiTypeVisitor implements J2KVisitor { @Override public Type visitPrimitiveType(@NotNull PsiPrimitiveType primitiveType) { - final String name = primitiveType.getCanonicalText(); - final IdentifierImpl identifier = new IdentifierImpl(name); + String name = primitiveType.getCanonicalText(); + IdentifierImpl identifier = new IdentifierImpl(name); if (name.equals("void")) { myResult = new PrimitiveType(new IdentifierImpl(KotlinBuiltIns.UNIT_ALIAS.getName())); @@ -80,8 +80,8 @@ public class TypeVisitor extends PsiTypeVisitor implements J2KVisitor { @Override public Type visitClassType(@NotNull PsiClassType classType) { - final IdentifierImpl identifier = constructClassTypeIdentifier(classType); - final List resolvedClassTypeParams = createRawTypesForResolvedReference(classType); + IdentifierImpl identifier = constructClassTypeIdentifier(classType); + List resolvedClassTypeParams = createRawTypesForResolvedReference(classType); if (classType.getParameterCount() == 0 && resolvedClassTypeParams.size() > 0) { myResult = new ClassType(identifier, resolvedClassTypeParams); @@ -94,7 +94,7 @@ public class TypeVisitor extends PsiTypeVisitor implements J2KVisitor { @NotNull private IdentifierImpl constructClassTypeIdentifier(@NotNull PsiClassType classType) { - final PsiClass psiClass = classType.resolve(); + PsiClass psiClass = classType.resolve(); if (psiClass != null) { String qualifiedName = psiClass.getQualifiedName(); if (qualifiedName != null) { @@ -109,7 +109,7 @@ public class TypeVisitor extends PsiTypeVisitor implements J2KVisitor { } } } - final String classTypeName = createQualifiedName(classType); + String classTypeName = createQualifiedName(classType); if (classTypeName.isEmpty()) { return new IdentifierImpl(getClassTypeName(classType)); @@ -122,12 +122,12 @@ public class TypeVisitor extends PsiTypeVisitor implements J2KVisitor { private static String createQualifiedName(@NotNull PsiClassType classType) { String classTypeName = ""; if (classType instanceof PsiClassReferenceType) { - final PsiJavaCodeReferenceElement reference = ((PsiClassReferenceType) classType).getReference(); + PsiJavaCodeReferenceElement reference = ((PsiClassReferenceType) classType).getReference(); if (reference.isQualified()) { String result = new IdentifierImpl(reference.getReferenceName()).toKotlin(); PsiElement qualifier = reference.getQualifier(); while (qualifier != null) { - final PsiJavaCodeReferenceElement p = (PsiJavaCodeReferenceElement) qualifier; + PsiJavaCodeReferenceElement p = (PsiJavaCodeReferenceElement) qualifier; result = new IdentifierImpl(p.getReferenceName()).toKotlin() + "." + result; // TODO: maybe need to replace by safe call? qualifier = p.getQualifier(); } @@ -139,10 +139,10 @@ public class TypeVisitor extends PsiTypeVisitor implements J2KVisitor { @NotNull private List createRawTypesForResolvedReference(@NotNull PsiClassType classType) { - final List typeParams = new LinkedList(); + List typeParams = new LinkedList(); if (classType instanceof PsiClassReferenceType) { - final PsiJavaCodeReferenceElement reference = ((PsiClassReferenceType) classType).getReference(); - final PsiElement resolve = reference.resolve(); + PsiJavaCodeReferenceElement reference = ((PsiClassReferenceType) classType).getReference(); + PsiElement resolve = reference.resolve(); if (resolve != null) { if (resolve instanceof PsiClass) //noinspection UnusedDeclaration diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java b/j2k/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java index 5e2dd1fc2d7..b5a97417e62 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java +++ b/j2k/tests/test/org/jetbrains/jet/j2k/StandaloneJavaToKotlinConverterTest.java @@ -68,13 +68,13 @@ public class StandaloneJavaToKotlinConverterTest extends TestCase { String javaPath = "j2k/tests/testData/" + getTestFilePath(); String kotlinPath = javaPath.replace(".jav", ".kt"); - final File kotlinFile = new File(kotlinPath); + File kotlinFile = new File(kotlinPath); if (!kotlinFile.exists()) { FileUtil.writeToFile(kotlinFile, ""); } - final String expected = FileUtil.loadFile(kotlinFile, true); - final File javaFile = new File(javaPath); - final String javaCode = FileUtil.loadFile(javaFile, true); + String expected = FileUtil.loadFile(kotlinFile, true); + File javaFile = new File(javaPath); + String javaCode = FileUtil.loadFile(javaFile, true); String actual = ""; String parentFileName = javaFile.getParentFile().getName(); @@ -97,7 +97,7 @@ public class StandaloneJavaToKotlinConverterTest extends TestCase { assert !actual.isEmpty() : "Specify what is it: file, class, method, statement or expression: " + javaPath + " parent: " + parentFileName; - final File tmp = new File(kotlinPath + ".tmp"); + File tmp = new File(kotlinPath + ".tmp"); if (!expected.equals(actual)) FileUtil.writeToFile(tmp, actual); if (expected.equals(actual) && tmp.exists()) //noinspection ResultOfMethodCallIgnored { diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/TestCaseBuilder.java b/j2k/tests/test/org/jetbrains/jet/j2k/TestCaseBuilder.java index edf863cf4c9..e9dbe2f4d02 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/TestCaseBuilder.java +++ b/j2k/tests/test/org/jetbrains/jet/j2k/TestCaseBuilder.java @@ -52,12 +52,12 @@ abstract class TestCaseBuilder { } @NotNull - public static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, @NotNull NamedTestFactory factory) { + public static TestSuite suiteForDirectory(String baseDataDir, @NotNull String dataPath, @NotNull NamedTestFactory factory) { return suiteForDirectory(baseDataDir, dataPath, true, emptyFilter, factory); } @NotNull - private static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, @NotNull final FilenameFilter filter, @NotNull NamedTestFactory factory) { + private static TestSuite suiteForDirectory(String baseDataDir, @NotNull String dataPath, boolean recursive, @NotNull final FilenameFilter filter, @NotNull NamedTestFactory factory) { TestSuite suite = new TestSuite(dataPath); final String extensionJava = ".jav"; diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java index aeabb3832db..7c35ae199be 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -65,7 +65,7 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { } @Override - protected JpsSdk addJdk(final String name, final String path) { + protected JpsSdk addJdk(String name, String path) { String homePath = System.getProperty("java.home"); String versionString = System.getProperty("java.version"); JpsTypedLibrary> jdk = myModel.getGlobal().addSdk(name, homePath, versionString, JpsJavaSdkType.INSTANCE); diff --git a/js/js.tests/test/org/jetbrains/k2js/test/config/JsUnitTestReporter.java b/js/js.tests/test/org/jetbrains/k2js/test/config/JsUnitTestReporter.java index a2a3bd770f0..3514581ce0e 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/config/JsUnitTestReporter.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/config/JsUnitTestReporter.java @@ -100,7 +100,7 @@ public class JsUnitTestReporter { @NotNull public TestSuite createTestSuiteAndFlush() { - final TestSuite suite = new TestSuite("!"); + TestSuite suite = new TestSuite("!"); Collection newFinishedTests = getNewFinishedTests(); for (String test : newFinishedTests) { //NOTE: well, it is a test diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java index 7714c6f1704..21ee66e028a 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/TranslatorTestCaseBuilder.java @@ -41,14 +41,14 @@ public abstract class TranslatorTestCaseBuilder { } @NotNull - public static TestSuite suiteForDirectory(@NotNull final String dataPath, + public static TestSuite suiteForDirectory(@NotNull String dataPath, @NotNull NamedTestFactory factory) { return suiteForDirectory(dataPath, true, emptyFilter, factory); } @NotNull - public static TestSuite suiteForDirectory(@NotNull final String dataPath, boolean recursive, - final FilenameFilter filter, @NotNull NamedTestFactory factory) { + public static TestSuite suiteForDirectory(@NotNull String dataPath, boolean recursive, + FilenameFilter filter, @NotNull NamedTestFactory factory) { TestSuite suite = new TestSuite(dataPath); suite.setName(dataPath); appendTestsInDirectory(dataPath, recursive, filter, factory, suite); diff --git a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java index 7690a54c400..182a2094e6f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java +++ b/js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java @@ -76,7 +76,7 @@ public final class AnalyzerFacadeForJS { boolean storeContextForBodiesResolve) { Project project = config.getProject(); - final ModuleDescriptor owner = new ModuleDescriptor(Name.special("")); + ModuleDescriptor owner = new ModuleDescriptor(Name.special("")); Predicate completely = Predicates.and(notLibFiles(config.getLibFiles()), filesToAnalyzeCompletely); @@ -139,7 +139,7 @@ public final class AnalyzerFacadeForJS { } @NotNull - public static ResolveSession getLazyResolveSession(Collection files, final Config config) { + public static ResolveSession getLazyResolveSession(Collection files, Config config) { LockBasedStorageManager storageManager = new LockBasedStorageManager(); FileBasedDeclarationProviderFactory declarationProviderFactory = new FileBasedDeclarationProviderFactory( storageManager, Config.withJsLibAdded(files, config), Predicates.alwaysFalse()); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java index 0466aa3899f..3d8780728c0 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/StaticContext.java @@ -413,7 +413,7 @@ public final class StaticContext { return null; } - final JsNameRef result = new JsNameRef(getNameForDescriptor(containingDescriptor)); + JsNameRef result = new JsNameRef(getNameForDescriptor(containingDescriptor)); if (DescriptorUtils.isRootNamespace((NamespaceDescriptor) containingDescriptor)) { return result; } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java index 74a7e996141..4308f2c4fde 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/general/Translation.java @@ -128,7 +128,7 @@ public final class Translation { @NotNull public static JsFunction generateClassInitializerMethod(@NotNull JetClassOrObject classDeclaration, @NotNull TranslationContext context) { - final ClassInitializerTranslator classInitializerTranslator = new ClassInitializerTranslator(classDeclaration, context); + ClassInitializerTranslator classInitializerTranslator = new ClassInitializerTranslator(classDeclaration, context); return classInitializerTranslator.generateInitializeMethod(); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java index ef77f1049fe..bc11653fa87 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java @@ -98,7 +98,7 @@ public enum PrimitiveBinaryOperationFIF implements FunctionIntrinsicFactory { if (descriptor.getName().equals(Name.identifier("rangeTo"))) { return RANGE_TO_INTRINSIC; } - final JsBinaryOperator operator = getOperator(descriptor); + JsBinaryOperator operator = getOperator(descriptor); return new PrimitiveBinaryOperationFunctionIntrinsic(operator); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java index 0a99534e691..f6ecd1218cd 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java @@ -105,7 +105,7 @@ public final class PatternBuilder { } @NotNull - public static DescriptorPredicate pattern(@NotNull final NamePredicate... checkers) { + public static DescriptorPredicate pattern(@NotNull NamePredicate... checkers) { return pattern(Arrays.asList(checkers)); } } diff --git a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java index d1357a6387c..97cf2f2513d 100644 --- a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java +++ b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureReader.java @@ -30,7 +30,7 @@ public class JetSignatureReader { } - public void accept(final JetSignatureVisitor v) { + public void accept(JetSignatureVisitor v) { String signature = this.signature; int len = signature.length(); int pos = acceptFormalTypeParameters(v); @@ -133,9 +133,9 @@ public class JetSignatureReader { private static int parseType( - final String signature, + String signature, int pos, - final JetSignatureVisitor v) + JetSignatureVisitor v) { if (signature.length() == 0) { throw new IllegalStateException(); diff --git a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java index c6241148c18..dec3d80af53 100644 --- a/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java +++ b/runtime/src/org/jetbrains/jet/rt/signature/JetSignatureWriter.java @@ -57,7 +57,7 @@ public class JetSignatureWriter implements JetSignatureVisitor { // ------------------------------------------------------------------------ @Override - public JetSignatureVisitor visitFormalTypeParameter(final String name, TypeInfoVariance variance, boolean reified) { + public JetSignatureVisitor visitFormalTypeParameter(String name, TypeInfoVariance variance, boolean reified) { if (!hasFormals) { hasFormals = true; buf.append('<'); @@ -141,13 +141,13 @@ public class JetSignatureWriter implements JetSignatureVisitor { } @Override - public void visitBaseType(final char descriptor, boolean nullable) { + public void visitBaseType(char descriptor, boolean nullable) { visitNullabe(nullable); buf.append(descriptor); } @Override - public void visitTypeVariable(final String name, boolean nullable) { + public void visitTypeVariable(String name, boolean nullable) { visitNullabe(nullable); buf.append('T'); buf.append(name); @@ -165,7 +165,7 @@ public class JetSignatureWriter implements JetSignatureVisitor { } @Override - public void visitClassType(final String name, boolean nullable, boolean forceReal) { + public void visitClassType(String name, boolean nullable, boolean forceReal) { visitNullabe(nullable); buf.append(forceReal ? 'M' : 'L'); buf.append(name); @@ -173,7 +173,7 @@ public class JetSignatureWriter implements JetSignatureVisitor { } @Override - public void visitInnerClassType(final String name, boolean nullable, boolean forceReal) { + public void visitInnerClassType(String name, boolean nullable, boolean forceReal) { endArguments(); visitNullabe(nullable); buf.append('.');