forked from yole/idiomatic-kotlin
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reorder examples to match slides; rename some stuff
- Loading branch information
Showing
52 changed files
with
85 additions
and
78 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
...in/kotlin/t13_WhenAsExpressionBody/bad.kt → ...in/kotlin/t01_WhenAsExpressionBody/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...n/kotlin/t13_WhenAsExpressionBody/good.kt → ...n/kotlin/t01_WhenAsExpressionBody/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ain/kotlin/t14_TryAsExpressionBody/bad.kt → ...ain/kotlin/t02_TryAsExpressionBody/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...in/kotlin/t14_TryAsExpressionBody/good.kt → ...in/kotlin/t02_TryAsExpressionBody/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t15_ReturnInElvis/bad.kt → src/main/kotlin/t03_ReturnInElvis/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t15_ReturnInElvis.bad | ||
package t03_ReturnInElvis.bad | ||
|
||
class Person(val name: String?, | ||
val age: Int?) | ||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t15_ReturnInElvis/good.kt → src/main/kotlin/t03_ReturnInElvis/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t15_ReturnInElvis.good | ||
package t03_ReturnInElvis.good | ||
|
||
class Person(val name: String?, | ||
val age: Int?) | ||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t16_Range/bad.kt → src/main/kotlin/t04_Range/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t16_Range.bad | ||
package t04_Range.bad | ||
|
||
fun isLatinUppercase(c: Char) = | ||
c >= 'A' && c <= 'Z' |
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t16_Range/good.kt → src/main/kotlin/t04_Range/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t16_Range.good | ||
package t04_Range.good | ||
|
||
fun isLatinUppercase(c: Char) = | ||
c in 'A'..'Z' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
src/main/kotlin/t08_MemberExtensionFunctionsSelfReceiver/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package t08_MemberExtensionFunctionsSelfReceiver.bad | ||
|
||
class PhoneBook { | ||
fun PhoneBook.findPhone(name: String) = "1234567" | ||
} |
5 changes: 5 additions & 0 deletions
5
src/main/kotlin/t08_MemberExtensionFunctionsSelfReceiver/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
package t08_MemberExtensionFunctionsSelfReceiver.good | ||
|
||
class PhoneBook { | ||
fun findPhone(name: String) = "1234567" | ||
} |
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t03_Lateinit/bad.kt → src/main/kotlin/t11_Lateinit/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t03_Lateinit.bad | ||
package t11_Lateinit.bad | ||
|
||
import org.junit.Assert | ||
import org.junit.Before | ||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t03_Lateinit/good.kt → src/main/kotlin/t11_Lateinit/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t03_Lateinit.good | ||
package t11_Lateinit.good | ||
|
||
import org.junit.Assert | ||
import org.junit.Before | ||
|
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t04_Typealias/bad.kt → src/main/kotlin/t12_Typealias/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t04_Typealias.bad | ||
package t12_Typealias.bad | ||
|
||
class Event | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t04_Typealias/good.kt → src/main/kotlin/t12_Typealias/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t04_Typealias.good | ||
package t12_Typealias.good | ||
|
||
class Event | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package t13_ReturnMultipleValues.bad | ||
|
||
fun namedNum(): Pair<Int, String> = | ||
1 to "one" | ||
|
||
fun main(args: Array<String>) { | ||
val pair = namedNum() | ||
val number = pair.first | ||
val name = pair.second | ||
} |
6 changes: 3 additions & 3 deletions
6
...n/kotlin/t11_ReturnMultipleValues/good.kt → ...n/kotlin/t13_ReturnMultipleValues/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
package t11_ReturnMultipleValues.good | ||
package t13_ReturnMultipleValues.good | ||
|
||
data class NamedNumber(val number: Int, | ||
val name: String) | ||
|
||
fun returnMultipleValues() = | ||
fun namedNum() = | ||
NamedNumber(1, "one") | ||
|
||
fun main(args: Array<String>) { | ||
val (number, name) = returnMultipleValues() | ||
val (number, name) = namedNum() | ||
} |
2 changes: 1 addition & 1 deletion
2
...in/kotlin/t18_DestructuringInLoops/bad.kt → ...in/kotlin/t14_DestructuringInLoops/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...n/kotlin/t18_DestructuringInLoops/good.kt → ...n/kotlin/t14_DestructuringInLoops/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t12_DestructuringList/bad.kt → src/main/kotlin/t15_DestructuringList/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...main/kotlin/t12_DestructuringList/good.kt → ...main/kotlin/t15_DestructuringList/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t02_DataClassCopy/bad.kt → src/main/kotlin/t16_DataClassCopy/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t02_DataClassCopy.bad | ||
package t16_DataClassCopy.bad | ||
|
||
class Person(val name: String, var age: Int) | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t02_DataClassCopy/good.kt → src/main/kotlin/t16_DataClassCopy/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t02_DataClassCopy.good | ||
package t16_DataClassCopy.good | ||
|
||
data class Person(val name: String, val age: Int) | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t20_Apply/bad.kt → src/main/kotlin/t18_Apply/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t20_Apply.bad | ||
package t18_Apply.bad | ||
|
||
import java.awt.Color | ||
import javax.swing.JLabel | ||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t20_Apply/good.kt → src/main/kotlin/t18_Apply/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t20_Apply.good | ||
package t18_Apply.good | ||
|
||
import java.awt.Color | ||
import javax.swing.JLabel | ||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t21_FilterIsInstance/bad.kt → src/main/kotlin/t19_FilterIsInstance/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t21_FilterIsInstance.bad | ||
package t19_FilterIsInstance.bad | ||
|
||
fun findAllStrings(objects: List<Any>) = | ||
objects.filter { it is String } |
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t21_FilterIsInstance/good.kt → src/main/kotlin/t19_FilterIsInstance/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t21_FilterIsInstance.good | ||
package t19_FilterIsInstance.good | ||
|
||
fun findAllStrings(objects: List<Any>) = | ||
objects.filterIsInstance<String>() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package t20_MapNotNull.bad | ||
|
||
data class Result(val data: Any?, | ||
val error: String?) | ||
|
||
fun listErrors(results: List<Result>): List<String> = | ||
results.map { it.error }.filterNotNull() | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t22_MapNotNull/good.kt → src/main/kotlin/t20_MapNotNull/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t23_CompareBy/bad.kt → src/main/kotlin/t21_CompareBy/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t23_CompareBy.bad | ||
package t21_CompareBy.bad | ||
|
||
class Person(val name: String, | ||
val age: Int) | ||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t23_CompareBy/good.kt → src/main/kotlin/t21_CompareBy/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t23_CompareBy.good | ||
package t21_CompareBy.good | ||
|
||
class Person(val name: String, | ||
val age: Int) | ||
|
4 changes: 2 additions & 2 deletions
4
src/main/kotlin/t25_GroupBy/bad.kt → src/main/kotlin/t22_GroupBy/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/main/kotlin/t25_GroupBy/good.kt → src/main/kotlin/t22_GroupBy/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
package t25_GroupBy.good | ||
package t22_GroupBy.good | ||
|
||
class Request(val url: String, | ||
val remoteIP: String, | ||
val timestamp: Long) | ||
|
||
fun analyzeRequests(log: List<Request>) { | ||
fun analyzeLog(log: List<Request>) { | ||
val map = log.groupBy(Request::url) | ||
} |
This file was deleted.
Oops, something went wrong.
6 changes: 3 additions & 3 deletions
6
...ain/kotlin/t26_SubstringBeforeLast/bad.kt → ...ain/kotlin/t23_SubstringBeforeLast/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package t23_SubstringBeforeLast.good | ||
|
||
data class PathParts(val dir: String, | ||
val name: String) | ||
|
||
fun splitPath(path: String) = PathParts( | ||
path.substringBeforeLast('/', ""), | ||
path.substringAfterLast('/')) |
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...n/t09_OmitReturnTypes/IJavaInterface.java → ...n/t99_OmitReturnTypes/IJavaInterface.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/main/kotlin/t09_OmitReturnTypes/bad.kt → src/main/kotlin/t99_OmitReturnTypes/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/main/kotlin/t09_OmitReturnTypes/good.kt → src/main/kotlin/t99_OmitReturnTypes/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t19_Optional/bad.kt → src/main/kotlin/t99_Optional/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t19_Optional.bad | ||
package t99_Optional.bad | ||
|
||
import java.util.* | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t19_Optional/good.kt → src/main/kotlin/t99_Optional/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t19_Optional.good | ||
package t99_Optional.good | ||
|
||
fun processOptional(x: String?) { | ||
val s = x ?: "Unknown" | ||
|
2 changes: 1 addition & 1 deletion
2
...in/kotlin/t01_SmallClasses/bad/Address.kt → ...in/kotlin/t99_SmallClasses/bad/Address.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t01_SmallClasses.bad | ||
package t99_SmallClasses.bad | ||
|
||
class Address(val city: String, val street: String, val zipCode: String) { | ||
} |
2 changes: 1 addition & 1 deletion
2
...in/kotlin/t01_SmallClasses/bad/Company.kt → ...in/kotlin/t99_SmallClasses/bad/Company.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t01_SmallClasses.bad | ||
package t99_SmallClasses.bad | ||
|
||
class Company(val personnel: List<Person>, val address: Address) { | ||
} |
2 changes: 1 addition & 1 deletion
2
...ain/kotlin/t01_SmallClasses/bad/Person.kt → ...ain/kotlin/t99_SmallClasses/bad/Person.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
package t01_SmallClasses.bad | ||
package t99_SmallClasses.bad | ||
|
||
class Person(val name: String, val address: Address) { | ||
} |
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t01_SmallClasses/good.kt → src/main/kotlin/t99_SmallClasses/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t24_Zip/bad.kt → src/main/kotlin/t99_Zip/bad.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/kotlin/t24_Zip/good.kt → src/main/kotlin/t99_Zip/good.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters