Fix code insertion bug

codiga · Apr 27, 2022 · c2dbe5b · c2dbe5b
1 parent 5cee4d5
commit c2dbe5b
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 14 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 pluginGroup = codiga.io.plugins
 pluginName = codiga-jetbrains-plugin
-pluginVersion = 1.5.1
+pluginVersion = 1.5.2
 
 
 pluginSinceBuild = 212.*

diff --git a/src/main/java/io/codiga/plugins/jetbrains/utils/CodePositionUtils.java b/src/main/java/io/codiga/plugins/jetbrains/utils/CodePositionUtils.java
@@ -92,27 +92,50 @@ public static int firstPositionToInsert(String code, LanguageEnumeration languag
             }
 
         }
-        if (languageEnumeration == LanguageEnumeration.JAVA) {
+        if (languageEnumeration == LanguageEnumeration.JAVA || languageEnumeration == LanguageEnumeration.SCALA) {
 
+            boolean inComment = false;
             for (String line: codeArray) {
+                final String lineWithoutSpace = line.replaceAll(" ", "");
+
                 if (line.startsWith(JAVA_PACKAGE_KEYWORD)) {
-                    start = line.length() + 1;
-                } else {
-                    break;
+                    start = start + line.length() + 1;
+                    continue;
                 }
-            }
-        }
-        if (languageEnumeration == LanguageEnumeration.SCALA) {
 
-            for (String line: codeArray) {
-                if (line.startsWith(SCALA_PACKAGE_KEYWORD)) {
-                    start = line.length() + 1;
-                } else {
-                    break;
+                /**
+                 * We do not want to add code on top of a comment
+                 */
+                if (lineWithoutSpace.startsWith("/*")) {
+                    start = start + line.length() + 1;
+                    inComment = true;
+                    continue;
+                }
+                if (lineWithoutSpace.startsWith("*/") && inComment) {
+                    inComment = false;
+                    start = start + line.length() + 1;
+                    continue;
                 }
+                if (lineWithoutSpace.startsWith("//")) {
+                    inComment = false;
+                    start = start + line.length() + 1;
+                    continue;
+                }
+
+                if (inComment) {
+                    start = start + line.length() + 1;
+                    continue;
+                }
+
+                break;
             }
         }
-        return start;
+
+        if (start < code.length()) {
+            return start;
+        } else {
+            return 0;
+        }
     }
 
     public static Optional<String> getKeywordFromLine(String line, int position) {