Other small fixes

Author: DVDAndroid

content.js

@@ -75,46 +75,34 @@ chrome.runtime.onMessage.addListener(function (msg) {
             }
           }
         } else if (msg.ext === "kt") {
-          var code = $(el[j]).html();
-
-          // The workaround for Kotlin highlights imports too. Skip them, both Kotlin and Java (faster loop)
-          if (code.startsWith("import ")) continue;
+          var codeHtml = $(el[j]).html();
+          var codeText = $(el[j]).text();
 
           /*
            Workaround for Kotlin. It gets the first char of a class (first index); it checks if before the class name there's another char, if true skip this line;
            it calculates the used length, adding to the first index, the length of class name, plus a special char (like . (  <  >).
            At the end it checks if the substring matches with a valid usage of class name, so replace it with the URL
            */
-          var index = code.indexOf(clazz.className);
+          var indexHtml = codeHtml.indexOf(clazz.className);
+          var indexText = codeText.indexOf(clazz.className);
 
-          // TODO: this check in regex?
-          switch (code.charAt(index - 1)) {
-            case "<":
-            case " ":
-            case "(":
-              break;
-            default:
-              continue;
-          }
-
-          var classUsage = index + clazz.className.length + 1;
-          // TODO: this check in regex?
-          switch (code.charAt(classUsage - 1)) {
+          switch (codeText.charAt(indexText - 1)) {
             case "<":
             case ">":
             case " ":
             case "(":
-            case ")":
-            case ".":
               break;
             default:
               continue;
           }
 
-          var result = code.substr(index, classUsage).match(REGEX_VALID_USAGE_OF_CLASS_NAME);
+          var classUsage = indexHtml + clazz.className.length + 1;
+          if (codeHtml.charAt(classUsage - 1) >= 'A' || 'Z' <= codeHtml.charAt(classUsage - 1)) continue;
+
+          var result = codeHtml.substr(indexHtml, classUsage).match(REGEX_VALID_USAGE_OF_CLASS_NAME);
 
           if (result) {
-            $(el[j]).html(code.replaceBetween(index, classUsage - 1, '<a href=\"' + clazz.getLinkedUrl() + '\" target=\"_blank\">' + clazz.className + '</a>'));
+            $(el[j]).html(codeHtml.replaceBetween(indexHtml, classUsage - 1, '<a href=\"' + clazz.getLinkedUrl() + '\" target=\"_blank\">' + clazz.className + '</a>'));
           }
         }
       }