Merge branch 'master' into patch-6

This commit is contained in:
GrenderG authored and GitHub committed 2021-10-07 17:27:36 +02:00
commit 2ed86bd9bd
1 file changed
+10 -3
+10 -3
View File
@@ -174,10 +174,10 @@ typedef enum ActionType ActionType;
char* C_HL_extensions[] = {".c", ".h", ".cpp", ".hpp", ".cc", NULL}; // Array must be terminated with NULL. char* C_HL_extensions[] = {".c", ".h", ".cpp", ".hpp", ".cc", NULL}; // Array must be terminated with NULL.
char* JAVA_HL_extensions[] = {".java", NULL}; char* JAVA_HL_extensions[] = {".java", NULL};
char* PYTHON_HL_extensions[] = {".py", NULL}; char* PYTHON_HL_extensions[] = {".py",".pyw",".py3",".pyc",".pyo", NULL};
char* BASH_HL_extensions[] = {".sh", NULL}; char* BASH_HL_extensions[] = {".sh", NULL};
char* JS_HL_extensions[] = {".js", ".jsx", NULL}; char* JS_HL_extensions[] = {".js", ".jsx", NULL};
char* PHP_HL_extensions[] = {".php", NULL}; char* PHP_HL_extensions[] = {".php",".phtml", NULL};
char* JSON_HL_extensions[] = {".json", ".jsonp", NULL}; char* JSON_HL_extensions[] = {".json", ".jsonp", NULL};
char* XML_HL_extensions[] = {".xml", NULL}; char* XML_HL_extensions[] = {".xml", NULL};
char* SQL_HL_extensions[] = {".sql", NULL}; char* SQL_HL_extensions[] = {".sql", NULL};
@@ -185,11 +185,17 @@ char* RUBY_HL_extensions[] = {".rb", NULL};
char* C_HL_keywords[] = { char* C_HL_keywords[] = {
"switch", "if", "while", "for", "break", "continue", "return", "else", "switch", "if", "while", "for", "break", "continue", "return", "else",
"struct", "union", "typedef", "static", "enum", "class", "case", "#include", "struct", "union", "typedef", "static", "enum", "case", "#include",
"volatile", "register", "sizeof", "typedef", "union", "goto", "const", "auto", "volatile", "register", "sizeof", "typedef", "union", "goto", "const", "auto",
"#define", "#if", "#endif", "#error", "#ifdef", "#ifndef", "#undef", "#define", "#if", "#endif", "#error", "#ifdef", "#ifndef", "#undef",
"asm" /* in stdbool.h */ , "bool" , "true" , "fasle" , "inline" , "asm" /* in stdbool.h */ , "bool" , "true" , "fasle" , "inline" ,
// C++
"class" , "namespace" , "using" , "catch" , "delete" , "explicit" ,
"export" , "friend" , "mutable" , "new" , "public" , "protected" ,
"private" , "operator" , "this" , "template" , "virtual" , "throw" ,
"try" , "typeid" ,
"int|", "long|", "double|", "float|", "char|", "unsigned|", "signed|", "int|", "long|", "double|", "float|", "char|", "unsigned|", "signed|",
"void|", "bool|", NULL "void|", "bool|", NULL
}; };
@@ -347,6 +353,7 @@ struct editor_syntax HL_DB[] = {
"//", "//",
"/*", "/*",
"*/", "*/",
"#",
HL_HIGHLIGHT_NUMBERS | HL_HIGHLIGHT_STRINGS HL_HIGHLIGHT_NUMBERS | HL_HIGHLIGHT_STRINGS
}, },
{ {