Skip to content

Commit 871485c

Browse files
authored
Improve String pattern to support both " and ' in the example app
Improve String pattern to support both " and '
2 parents 144e9fa + 8ca9f5b commit 871485c

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public class GoLanguage {
2727

2828
//Data
2929
private static final Pattern PATTERN_NUMBERS = Pattern.compile("\\b(\\d*[.]?\\d+)\\b");
30-
private static final Pattern PATTERN_CHAR = Pattern.compile("'[a-zA-Z]'");
31-
private static final Pattern PATTERN_STRING = Pattern.compile("\".*\"");
30+
private static final Pattern PATTERN_CHAR = Pattern.compile("['](.*?)[']");
31+
private static final Pattern PATTERN_STRING = Pattern.compile("[\"](.*?)[\"]");
3232
private static final Pattern PATTERN_HEX = Pattern.compile("0x[0-9a-fA-F]+");
3333
private static final Pattern PATTERN_SINGLE_LINE_COMMENT = Pattern.compile("//[^\\n]*");
3434
private static final Pattern PATTERN_MULTI_LINE_COMMENT = Pattern.compile("/\\*[^*]*\\*+(?:[^/*][^*]*\\*+)*/");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public class JavaLanguage {
3434
private static final Pattern PATTERN_ANNOTATION = Pattern.compile("@.[a-zA-Z0-9]+");
3535
private static final Pattern PATTERN_TODO_COMMENT = Pattern.compile("//TODO[^\n]*");
3636
private static final Pattern PATTERN_NUMBERS = Pattern.compile("\\b(\\d*[.]?\\d+)\\b");
37-
private static final Pattern PATTERN_CHAR = Pattern.compile("'[a-zA-Z]'");
38-
private static final Pattern PATTERN_STRING = Pattern.compile("\".*\"");
37+
private static final Pattern PATTERN_CHAR = Pattern.compile("['](.*?)[']");
38+
private static final Pattern PATTERN_STRING = Pattern.compile("[\"](.*?)[\"]");
3939
private static final Pattern PATTERN_HEX = Pattern.compile("0x[0-9a-fA-F]+");
4040

4141
public static void applyMonokaiTheme(Context context, CodeView codeView) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public class PythonLanguage {
2727

2828
//Data
2929
private static final Pattern PATTERN_NUMBERS = Pattern.compile("\\b(\\d*[.]?\\d+)\\b");
30-
private static final Pattern PATTERN_CHAR = Pattern.compile("'[a-zA-Z]'");
31-
private static final Pattern PATTERN_STRING = Pattern.compile("\".*\"");
30+
private static final Pattern PATTERN_CHAR = Pattern.compile("['](.*?)[']");
31+
private static final Pattern PATTERN_STRING = Pattern.compile("[\"](.*?)[\"]");
3232
private static final Pattern PATTERN_HEX = Pattern.compile("0x[0-9a-fA-F]+");
3333
private static final Pattern PATTERN_TODO_COMMENT = Pattern.compile("#TODO[^\n]*");
3434
private static final Pattern PATTERN_ATTRIBUTE = Pattern.compile("\\.[a-zA-Z0-9_]+");

0 commit comments

Comments
 (0)