Improve Patterns for Comment and TODO Comment

Author: AmrDeveloper

app/src/main/java/com/amrdeveloper/codeviewlibrary/syntax/GoSyntaxManager.java

@@ -24,7 +24,7 @@ public class GoSyntaxManager {
     private static final Pattern PATTERN_STRING = Pattern.compile("\".*\"");
     private static final Pattern PATTERN_HEX = Pattern.compile("0x[0-9a-fA-F]+");
     private static final Pattern PATTERN_TODO_COMMENT = Pattern.compile("//TODO[^\n]*");
-    private static final Pattern PATTERN_COMMENT = Pattern.compile("//[^\n]*" + "|" + "/\\*(.|\\R)*?\\*/");
+    private static final Pattern PATTERN_COMMENT = Pattern.compile("//(?!TODO )[^\\n]*" + "|" + "/\\*(.|\\R)*?\\*/");
     private static final Pattern PATTERN_ATTRIBUTE = Pattern.compile("\\.[a-zA-Z0-9_]+");
     private static final Pattern PATTERN_OPERATION =Pattern.compile( ":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
 

app/src/main/java/com/amrdeveloper/codeviewlibrary/syntax/JavaSyntaxManager.java

@@ -19,7 +19,7 @@ public class JavaSyntaxManager {
             "|synchronized|this|throw|transient|try|void|volatile|while)\\b");
 
     private static final Pattern PATTERN_BUILTINS = Pattern.compile("[,:;[->]{}()]");
-    private static final Pattern PATTERN_COMMENT = Pattern.compile("//[^\n]*" + "|" + "/\\*(.|\\R)*?\\*/");
+    private static final Pattern PATTERN_COMMENT = Pattern.compile("//(?!TODO )[^\\n]*" + "|" + "/\\*(.|\\R)*?\\*/");
     private static final Pattern PATTERN_ATTRIBUTE = Pattern.compile("\\.[a-zA-Z0-9_]+");
     private static final Pattern PATTERN_OPERATION =Pattern.compile( ":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
     private static final Pattern PATTERN_GENERIC = Pattern.compile("<[a-zA-Z0-9,<>]+>");

app/src/main/java/com/amrdeveloper/codeviewlibrary/syntax/PythonSyntaxManager.java

@@ -23,10 +23,10 @@ public class PythonSyntaxManager {
     private static final Pattern PATTERN_CHAR = Pattern.compile("'[a-zA-Z]'");
     private static final Pattern PATTERN_STRING = Pattern.compile("\".*\"");
     private static final Pattern PATTERN_HEX = Pattern.compile("0x[0-9a-fA-F]+");
-    private static final Pattern PATTERN_TODO_COMMENT = Pattern.compile("//TODO[^\n]*");
+    private static final Pattern PATTERN_TODO_COMMENT = Pattern.compile("#TODO[^\n]*");
     private static final Pattern PATTERN_ATTRIBUTE = Pattern.compile("\\.[a-zA-Z0-9_]+");
     private static final Pattern PATTERN_OPERATION =Pattern.compile( ":|==|>|<|!=|>=|<=|->|=|>|<|%|-|-=|%=|\\+|\\-|\\-=|\\+=|\\^|\\&|\\|::|\\?|\\*");
-    private static final Pattern PATTERN_HASH_COMMENT = Pattern.compile("#.*\\n");
+    private static final Pattern PATTERN_HASH_COMMENT = Pattern.compile("#(?!TODO )[^\\n]*");
 
     public static void applyMonokaiTheme(Context context, CodeView codeView) {
         codeView.resetSyntaxPatternList();