From 0f8b67e6ce7dc8488b06a71ad58ff931d86530d5 Mon Sep 17 00:00:00 2001
From: Alex Plate <aleksei.plate@jetbrains.com>
Date: Mon, 27 Mar 2023 11:14:00 +0300
Subject: [PATCH] Reformat files
---
.editorconfig | 1 +
build.gradle.kts | 1 -
src/main/java/com/maddyhome/idea/vim/group/copy/PutGroup.kt | 3 +--
src/test/java/org/jetbrains/plugins/ideavim/VimTestCase.kt | 2 +-
.../ideavim/ex/implementation/commands/RegistersCommandTest.kt | 1 -
.../org/jetbrains/plugins/ideavim/impl/EmptyTransferable.kt | 2 +-
vim-engine/build.gradle.kts | 1 -
.../src/main/kotlin/com/maddyhome/idea/vim/put/VimPutBase.kt | 2 +-
8 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index f5bb74985..ce6251398 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,3 +7,4 @@ indent_style = space
[*.kt]
indent_size = 2
indent_style = space
+ktlint_standard_no-wildcard-imports = disabled
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 60fbb0c2c..f822e4d78 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -340,7 +340,6 @@ tasks {
// --- Linting
ktlint {
- disabledRules.add("no-wildcard-imports")
version.set("0.48.2")
}
diff --git a/src/main/java/com/maddyhome/idea/vim/group/copy/PutGroup.kt b/src/main/java/com/maddyhome/idea/vim/group/copy/PutGroup.kt
index 73ea781e6..bed9caa97 100644
--- a/src/main/java/com/maddyhome/idea/vim/group/copy/PutGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/copy/PutGroup.kt
@@ -98,8 +98,7 @@ internal class PutGroup : VimPutBase() {
val registerChar = text.registerChar
if (registerChar != null && registerChar in RegisterConstants.CLIPBOARD_REGISTERS) {
(pasteProvider as IjPasteProvider).pasteProvider.performPaste(context)
- }
- else {
+ } else {
pasteKeepingClipboard(text) {
(pasteProvider as IjPasteProvider).pasteProvider.performPaste(context)
}
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/VimTestCase.kt b/src/test/java/org/jetbrains/plugins/ideavim/VimTestCase.kt
index 86b13e492..b4e8eb618 100644
--- a/src/test/java/org/jetbrains/plugins/ideavim/VimTestCase.kt
+++ b/src/test/java/org/jetbrains/plugins/ideavim/VimTestCase.kt
@@ -728,7 +728,7 @@ abstract class VimTestCase {
}
private fun clearClipboard() {
- ClipboardSynchronizer.getInstance().resetContent();
+ ClipboardSynchronizer.getInstance().resetContent()
ClipboardSynchronizer.getInstance().setContent(EmptyTransferable, EmptyClipboardOwner.INSTANCE)
}
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/RegistersCommandTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/RegistersCommandTest.kt
index 9a32ed2d5..4b346af21 100644
--- a/src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/RegistersCommandTest.kt
+++ b/src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/RegistersCommandTest.kt
@@ -224,4 +224,3 @@ class RegistersCommandTest : VimTestCase() {
)
}
}
-
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/impl/EmptyTransferable.kt b/src/test/java/org/jetbrains/plugins/ideavim/impl/EmptyTransferable.kt
index 170d69373..b8cd8b13a 100644
--- a/src/test/java/org/jetbrains/plugins/ideavim/impl/EmptyTransferable.kt
+++ b/src/test/java/org/jetbrains/plugins/ideavim/impl/EmptyTransferable.kt
@@ -22,4 +22,4 @@ object EmptyTransferable : Transferable {
override fun getTransferData(flavor: DataFlavor?): Any {
throw UnsupportedFlavorException(flavor)
}
-}
\ No newline at end of file
+}
diff --git a/vim-engine/build.gradle.kts b/vim-engine/build.gradle.kts
index c580846f6..a180d3115 100644
--- a/vim-engine/build.gradle.kts
+++ b/vim-engine/build.gradle.kts
@@ -43,7 +43,6 @@ tasks {
// --- Linting
ktlint {
- disabledRules.add("no-wildcard-imports")
version.set("0.48.2")
}
diff --git a/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/put/VimPutBase.kt b/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/put/VimPutBase.kt
index 3ce15196a..d44d29730 100644
--- a/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/put/VimPutBase.kt
+++ b/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/put/VimPutBase.kt
@@ -143,7 +143,7 @@ public abstract class VimPutBase : VimPut {
text,
data.textData.typeInRegister,
data.textData.transferableData,
- data.textData.registerChar
+ data.textData.registerChar,
)
}