From 339cbdc0b598e9ca072085c1e2605dfe6778bb60 Mon Sep 17 00:00:00 2001 From: olegkunov Date: Thu, 1 Mar 2012 16:07:01 +0400 Subject: [PATCH 1/2] KT-1378 - added spaces before ':' in the generated code. --- .../plugin/codeInsight/OverrideImplementMethodsHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index 0643538142c..7dbe0faa458 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java @@ -92,7 +92,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns else { bodyBuilder.append("val "); } - bodyBuilder.append(descriptor.getName()).append(": ").append(descriptor.getType()); + bodyBuilder.append(descriptor.getName()).append(" : ").append(descriptor.getType()); ImportClassHelper.addImportDirectiveIfNeeded(descriptor.getType(), file); String initializer = defaultInitializer(descriptor.getType(), JetStandardLibrary.getInstance()); if (initializer != null) { @@ -115,7 +115,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns } first = false; bodyBuilder.append(parameterDescriptor.getName()); - bodyBuilder.append(": "); + bodyBuilder.append(" : "); bodyBuilder.append(parameterDescriptor.getType().toString()); ImportClassHelper.addImportDirectiveIfNeeded(parameterDescriptor.getType(), file); @@ -124,7 +124,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns final JetType returnType = descriptor.getReturnType(); final JetStandardLibrary stdlib = JetStandardLibrary.getInstance(); if (!returnType.equals(stdlib.getTuple0Type())) { - bodyBuilder.append(": ").append(returnType.toString()); + bodyBuilder.append(" : ").append(returnType.toString()); ImportClassHelper.addImportDirectiveIfNeeded(returnType, file); } From 96d72033700abc5904a4c8cf19d218f0fdfd3e12 Mon Sep 17 00:00:00 2001 From: olegkunov Date: Thu, 1 Mar 2012 21:18:37 +0400 Subject: [PATCH 2/2] KT-1378 Code formatting: spaces around ':' Changed test data to match actual behavior of the "override methods" feature. --- .../codeInsight/overrideImplement/generateMulti.kt.after | 4 ++-- .../codeInsight/overrideImplement/genericMethod.kt.after | 2 +- .../overrideImplement/javaInterfaceMethod/foo/Impl.kt.after | 2 +- .../overrideImplement/javaParameters/foo/Impl.kt.after | 2 +- idea/testData/codeInsight/overrideImplement/property.kt.after | 2 +- .../overrideImplement/traitGenericOverride.kt.after | 2 +- .../overrideImplement/traitNullableFunction.kt.after | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after index 2fee4d5fe4e..145bec959a7 100644 --- a/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after +++ b/idea/testData/codeInsight/overrideImplement/generateMulti.kt.after @@ -11,10 +11,10 @@ class SomeOther : Some { override fun someFoo() { throw UnsupportedOperationException() } - override fun someGenericFoo(): S { + override fun someGenericFoo() : S { throw UnsupportedOperationException() } - override fun someOtherFoo(): Int { + override fun someOtherFoo() : Int { throw UnsupportedOperationException() } } \ No newline at end of file diff --git a/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after b/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after index 1ccd7a1510d..8e325065024 100644 --- a/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after +++ b/idea/testData/codeInsight/overrideImplement/genericMethod.kt.after @@ -4,7 +4,7 @@ trait G { class GC() : G { - override fun foo(t: Int): Int { + override fun foo(t : Int) : Int { throw UnsupportedOperationException() } } diff --git a/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after index a8d4e037f35..eafc5366e34 100644 --- a/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after +++ b/idea/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after @@ -2,7 +2,7 @@ import foo.Intf class Impl(): Intf { - override fun getFooBar(): String? { + override fun getFooBar() : String? { throw UnsupportedOperationException() } } diff --git a/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after b/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after index da4335ee7f9..3ae321d7e30 100644 --- a/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after +++ b/idea/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after @@ -2,7 +2,7 @@ import foo.Intf class Impl(): Intf { - override fun fooBar(i: Int, s: Array?, foo: Any?) { + override fun fooBar(i : Int, s : Array?, foo : Any?) { throw UnsupportedOperationException() } } diff --git a/idea/testData/codeInsight/overrideImplement/property.kt.after b/idea/testData/codeInsight/overrideImplement/property.kt.after index bfff67330db..782da651f85 100644 --- a/idea/testData/codeInsight/overrideImplement/property.kt.after +++ b/idea/testData/codeInsight/overrideImplement/property.kt.after @@ -4,5 +4,5 @@ trait T { class GC() : T { - override val v: Int = 0 + override val v : Int = 0 } diff --git a/idea/testData/codeInsight/overrideImplement/traitGenericOverride.kt.after b/idea/testData/codeInsight/overrideImplement/traitGenericOverride.kt.after index 4ef321e0344..ba53dd1904e 100644 --- a/idea/testData/codeInsight/overrideImplement/traitGenericOverride.kt.after +++ b/idea/testData/codeInsight/overrideImplement/traitGenericOverride.kt.after @@ -4,7 +4,7 @@ trait G { class GC() : G { - override fun foo(t: T): T { + override fun foo(t : T) : T { throw UnsupportedOperationException() } } \ No newline at end of file diff --git a/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after b/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after index 85e528cce48..40250446404 100644 --- a/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after +++ b/idea/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after @@ -4,7 +4,7 @@ trait Some { class SomeOther : Some { - override fun foo(some: Int?): Int { + override fun foo(some : Int?) : Int { throw UnsupportedOperationException() } } \ No newline at end of file