-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into bugfix/indentation-inside-string-templates(#…
…758)
- Loading branch information
Showing
7 changed files
with
88 additions
and
7 deletions.
There are no files selected for viewing
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
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
17 changes: 17 additions & 0 deletions
17
diktat-rules/src/test/resources/test/paragraph2/kdoc/KdocFormattingOrderExpected.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,17 @@ | ||
package test.paragraph2.kdoc | ||
|
||
/** | ||
* Creates a docker container with [file], prepared to execute it | ||
* | ||
* @param runConfiguration a [RunConfiguration] for the supplied binary | ||
* @param file a file that will be included as an executable | ||
* @param resources additional resources | ||
* @return id of created container or null if it wasn't created | ||
* @throws DockerException if docker daemon has returned an error | ||
* @throws DockerException if docker daemon has returned an error | ||
* @throws RuntimeException if an exception not specific to docker has occurred | ||
*/ | ||
internal fun createWithFile(runConfiguration: RunConfiguration, | ||
containerName: String, | ||
file: File, | ||
resources: Collection<File> = emptySet()): String {} |
17 changes: 17 additions & 0 deletions
17
diktat-rules/src/test/resources/test/paragraph2/kdoc/KdocFormattingOrderTest.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,17 @@ | ||
package test.paragraph2.kdoc | ||
|
||
/** | ||
* Creates a docker container with [file], prepared to execute it | ||
* | ||
* @param runConfiguration a [RunConfiguration] for the supplied binary | ||
* @param file a file that will be included as an executable | ||
* @param resources additional resources | ||
* @throws DockerException if docker daemon has returned an error | ||
* @throws DockerException if docker daemon has returned an error | ||
* @throws RuntimeException if an exception not specific to docker has occurred | ||
* @return id of created container or null if it wasn't created | ||
*/ | ||
internal fun createWithFile(runConfiguration: RunConfiguration, | ||
containerName: String, | ||
file: File, | ||
resources: Collection<File> = emptySet()): 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
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