Standard project layout

2025-05-09 18:34:06 +02:00 · 2021-10-11 01:29:18 +03:00 · 2021-10-11 01:29:18 +03:00 · 898e5f8bda
commit 898e5f8bda
parent 30a39497aa
922 changed files with 128 additions and 31 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,7 +21,7 @@
 .teamcity/*.iml

 # Generated by gradle task "generateGrammarSource"
-src/com/maddyhome/idea/vim/vimscript/parser/generated
+src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated

 # Created by github automation
 settings.xml
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -112,16 +112,6 @@ gradle.projectsEvaluated {
    }
 }

-sourceSets {
-    main {
-        java.srcDir("src")
-        resources.srcDir("resources")
-    }
-    test {
-        java.srcDir("test")
-    }
-}
-
 // --- Intellij plugin

 intellij {
@ -159,7 +149,7 @@ tasks {
    generateGrammarSource {
        maxHeapSize = "128m"
        arguments.addAll(listOf("-package", "com.maddyhome.idea.vim.vimscript.parser.generated", "-visitor"))
-        outputDirectory = file("src/com/maddyhome/idea/vim/vimscript/parser/generated")
+        outputDirectory = file("src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated")
    }

    named("compileKotlin") {
--- a/src/main/java/com/maddyhome/idea/vim/DynamicLoaderStopper.kt
+++ b/src/main/java/com/maddyhome/idea/vim/DynamicLoaderStopper.kt
--- a/src/main/java/com/maddyhome/idea/vim/EventFacade.java
+++ b/src/main/java/com/maddyhome/idea/vim/EventFacade.java
--- a/src/main/java/com/maddyhome/idea/vim/KeyHandler.java
+++ b/src/main/java/com/maddyhome/idea/vim/KeyHandler.java
--- a/src/main/java/com/maddyhome/idea/vim/PluginStartup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/PluginStartup.kt
--- a/src/main/java/com/maddyhome/idea/vim/RegisterActions.java
+++ b/src/main/java/com/maddyhome/idea/vim/RegisterActions.java
--- a/src/main/java/com/maddyhome/idea/vim/VimBundledDictionaryProvider.kt
+++ b/src/main/java/com/maddyhome/idea/vim/VimBundledDictionaryProvider.kt
--- a/src/main/java/com/maddyhome/idea/vim/VimPlugin.java
+++ b/src/main/java/com/maddyhome/idea/vim/VimPlugin.java
--- a/src/main/java/com/maddyhome/idea/vim/VimProjectService.kt
+++ b/src/main/java/com/maddyhome/idea/vim/VimProjectService.kt
--- a/src/main/java/com/maddyhome/idea/vim/VimTypedActionHandler.kt
+++ b/src/main/java/com/maddyhome/idea/vim/VimTypedActionHandler.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/ComplicatedKeysAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/ComplicatedKeysAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/DuplicableOperatorAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/DuplicableOperatorAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/ExEntryAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/ExEntryAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/ResetModeAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/ResetModeAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/VimPluginToggleAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/VimPluginToggleAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/VimShortcutKeyAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/VimShortcutKeyAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/OperatorAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/OperatorAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/RedoAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/RedoAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/RepeatChangeAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/RepeatChangeAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/UndoAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/UndoAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/AutoIndentLinesVisualAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/AutoIndentLinesVisualAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerMotionAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerMotionAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerVisualAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseLowerVisualAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleCharacterAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleCharacterAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleMotionAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleMotionAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleVisualAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseToggleVisualAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperMotionAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperMotionAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperVisualAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCaseUpperVisualAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCharacterAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCharacterAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCharactersAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeCharactersAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeEndOfLineAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeEndOfLineAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeLastGlobalSearchReplaceAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeLastGlobalSearchReplaceAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeLastSearchReplaceAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeLastSearchReplaceAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeLineAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeLineAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeMotionAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeMotionAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeReplaceAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeReplaceAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeVisualAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeVisualAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeVisualCharacterAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeVisualCharacterAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesEndAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesEndAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/FilterMotionAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/FilterMotionAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/FilterVisualLinesAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/FilterVisualLinesAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ReformatCodeMotionAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ReformatCodeMotionAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/ReformatCodeVisualAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/ReformatCodeVisualAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/number/ChangeNumberIncAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/number/ChangeNumberIncAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/change/number/ChangeVisualNumberIncAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/change/number/ChangeVisualNumberIncAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteEndOfLineAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteEndOfLineAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesSpacesAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesSpacesAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesSpacesAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesSpacesAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteMotionAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteMotionAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteVisualAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteVisualAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesEndAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesEndAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertAfterCursorAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertAfterCursorAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertAfterLineEndAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertAfterLineEndAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertAtPreviousInsertAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertAtPreviousInsertAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertBeforeCursorAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertBeforeCursorAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertBeforeFirstNonBlankAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertBeforeFirstNonBlankAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertCharacterAboveCursorAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertCharacterAboveCursorAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertCharacterBelowCursorAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertCharacterBelowCursorAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertCompletedDigraphAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertCompletedDigraphAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertCompletedLiteralAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertCompletedLiteralAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertDeleteInsertedTextAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertDeleteInsertedTextAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertDeletePreviousWordAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertDeletePreviousWordAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertEnterAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertEnterAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertExitModeAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertExitModeAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertInsertAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertInsertAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertLineStartAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertLineStartAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertNewLineAboveAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertNewLineAboveAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertNewLineBelowAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertNewLineBelowAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertExitAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertPreviousInsertExitAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertRegisterAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertRegisterAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertSingleCommandAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/InsertSingleCommandAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/VisualBlockAppendAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/VisualBlockAppendAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/insert/VisualBlockInsertAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/insert/VisualBlockInsertAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/shift/AutoIndentMotionAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/shift/AutoIndentMotionAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/shift/ShiftLeft.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/shift/ShiftLeft.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/change/shift/ShiftRight.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/shift/ShiftRight.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/copy/PutTextAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/copy/PutTextAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/copy/PutVisualTextAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/copy/PutVisualTextAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/copy/YankLineAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/copy/YankLineAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/copy/YankMotionAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/copy/YankMotionAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/copy/YankVisualAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/copy/YankVisualAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/copy/YankVisualLinesAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/copy/YankVisualLinesAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/editor/VimEditorActions.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/editor/VimEditorActions.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/ex/ProcessExEntryAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/ex/ProcessExEntryAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/file/FileGetAsciiAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/file/FileGetAsciiAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/file/FileGetFileInfoAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/file/FileGetFileInfoAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/file/FileGetHexAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/file/FileGetHexAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/file/FileGetLocationInfoAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/file/FileGetLocationInfoAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/file/FilePreviousAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/file/FilePreviousAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/file/FileSaveCloseAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/file/FileSaveCloseAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/fold/FoldActions.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/fold/FoldActions.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/internal/AddBlockInlaysAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/internal/AddBlockInlaysAction.kt
--- a/src/main/java/com/maddyhome/idea/vim/action/internal/AddInlineInlaysAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/internal/AddInlineInlaysAction.kt
--- a/Show More
+++ b/Show More