diff options
| author | q5sys <jt@obs-sec.com> | 2017-06-16 12:44:45 -0400 |
|---|---|---|
| committer | q5sys <jt@obs-sec.com> | 2017-06-16 12:44:45 -0400 |
| commit | 74afc0d985b8b054de0850c84cb09e6e9fbe482d (patch) | |
| tree | c54e845d495b973cd569274cb243398f42d6f735 /src-qt5 | |
| parent | fix file manage autoextract menu method (diff) | |
| parent | Quick update for javascript syntax rules (diff) | |
| download | lumina-74afc0d985b8b054de0850c84cb09e6e9fbe482d.tar.gz lumina-74afc0d985b8b054de0850c84cb09e6e9fbe482d.tar.bz2 lumina-74afc0d985b8b054de0850c84cb09e6e9fbe482d.zip | |
Merge branch 'master' of http://github.com/trueos/lumina
Diffstat (limited to 'src-qt5')
4 files changed, 14 insertions, 5 deletions
diff --git a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/cpp.syntax b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/cpp.syntax index 9a235ae3..f504263e 100644 --- a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/cpp.syntax +++ b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/cpp.syntax @@ -27,7 +27,7 @@ }, { "name": "keywords", - "words": ["char", "class", "const", "double", "enum", "explicit", "extern", "float", "friend", "inline", "int", "long", "namespace", "operator", "private", "protected", "public", "short", "signals", "signed", "slots", "static", "struct", "template", "typedef", "typename", "union", "unsigned", "virtual", "void", "volatile", "true", "false", "bool"], + "words": ["char", "class", "const", "double", "enum", "explicit", "extern", "float", "friend", "inline", "int", "long", "namespace", "operator", "private", "protected", "public", "short", "signals", "signed", "slots", "static", "struct", "template", "typedef", "typename", "union", "using","unsigned", "virtual", "void", "volatile", "true", "false", "bool"], "foreground": "colors/keyword", "font_weight": "bold" }, @@ -44,6 +44,11 @@ "font_weight": "bold" }, { + "name": "numbers", + "regex" : "\\b[0-9\\.]+\\b", + "foreground": "colors/text" + }, + { "name": "function names", "regex": "\\b[A-Za-z0-9_]+(?=\\()", "foreground": "colors/function" diff --git a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/javascript.syntax b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/javascript.syntax index a10045d7..b9543221 100644 --- a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/javascript.syntax +++ b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/javascript.syntax @@ -30,11 +30,16 @@ "foreground": "colors/altkeyword" }, { - "name": "function names", - "regex": "\\b[A-Za-z0-9_]+(?=\\()|(?:\\.)[a-z]+", + "name": "attributes", + "regex": "(\\.)[A-Za-z_][A-Za-z0-9_]*(?![\\(a-zA-Z0-9])", "foreground": "colors/function" }, { + "name": "function names", + "regex": "\\b[A-Za-z0-9_]+(?=\\()", + "foreground": "colors/class" + }, + { "name" : "text", "regex": "\"[^\"\\\\]*(\\\\(.|\\n)[^\"\\\\]*)*\"|'[^'\\\\]*(\\\\(.|\\n)[^'\\\\]*)*'", "foreground" : "colors/text" diff --git a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/md.syntax b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/md.syntax index 678431b4..294c2c68 100644 --- a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/md.syntax +++ b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/md.syntax @@ -70,7 +70,7 @@ }, { "name" : "horizontal rule", - "regex": "^((\\-\\-\\-)|(\\*\\*\\*))$", + "regex": "^((\\-[\\s]?\\-[\\s]?\\-[\\s]?)|(\\*\\*\\*))$", "foreground" : "colors/function" }, { diff --git a/src-qt5/desktop-utils/lumina-textedit/tests/test.js b/src-qt5/desktop-utils/lumina-textedit/tests/test.js index 81361577..696cd74d 100644 --- a/src-qt5/desktop-utils/lumina-textedit/tests/test.js +++ b/src-qt5/desktop-utils/lumina-textedit/tests/test.js @@ -42,4 +42,3 @@ function squaredDistance(p1, p2) { let d = distance(polygonCentroid(p1), polygonCentroid(p2)); return d * d; } -(?:[a-z]+[\.])([a-z])+ |