Minor fixes and additional colorscheme support

This commit is contained in:
Zachary Yedidia
2017-02-17 10:22:56 -05:00
parent 4193133ce4
commit 0cce513e73
8 changed files with 65 additions and 57 deletions
+13 -13
View File
@@ -4,16 +4,16 @@ detect:
filename: "ColorTest$"
rules:
- black: "\\<PLAIN\\>"
- red: "\\<red\\>"
- green: "\\<green\\>"
- yellow: "\\<yellow\\>"
- blue: "\\<blue\\>"
- magenta: "\\<magenta\\>"
- cyan: "\\<cyan\\>"
- brightred: "\\<brightred\\>"
- brightgreen: "\\<brightgreen\\>"
- brightyellow: "\\<brightyellow\\>"
- brightblue: "\\<brightblue\\>"
- brightmagenta: "\\<brightmagenta\\>"
- brightcyan: "\\<brightcyan\\>"
- black: "\\bPLAIN\\b"
- red: "\\bred\\b"
- green: "\\bgreen\\b"
- yellow: "\\byellow\\b"
- blue: "\\bblue\\b"
- magenta: "\\bmagenta\\b"
- cyan: "\\bcyan\\b"
- brightred: "\\bbrightred\\b"
- brightgreen: "\\bbrightgreen\\b"
- brightyellow: "\\bbrightyellow\\b"
- brightblue: "\\bbrightblue\\b"
- brightmagenta: "\\bbrightmagenta\\b"
- brightcyan: "\\bbrightcyan\\b"
+8 -3
View File
@@ -17,20 +17,25 @@ rules:
- statement: "[-+/*=<>!~%?:&|]"
- constant: "/[^*]([^/]|(\\\\/))*[^\\\\]/[gim]*"
- constant: "\\\\[0-7][0-7]?[0-7]?|\\\\x[0-9a-fA-F]+|\\\\[bfnrt'\"\\?\\\\]"
- comment:
start: "//"
end: "$"
rules: []
rules:
- todo: "TODO:?"
- comment:
start: "/\\*"
end: "\\*/"
rules: []
- todo: "TODO:?"
rules:
- todo: "TODO:?"
- constant.string:
start: "\""
end: "\""
rules:
- constant.specialChar: "\\\\."
- constant.string:
start: "'"
end: "'"
+18 -14
View File
@@ -4,19 +4,23 @@ detect:
filename: "\\.(frag|vert|fp|vp|glsl)$"
rules:
- brightblue: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
- green: "\\<(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\\>"
- green: "\\<gl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\\>"
- cyan: "\\<(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\\>"
- brightred: "\\<(break|continue)\\>"
- brightcyan: "\\<(true|false)\\>"
- red: "[-+/*=<>?:!~%&|^]"
- blue: "\\<([0-9]+|0x[0-9a-fA-F]*)\\>"
- brightblack: "(^|[[:space:]])//.*"
- brightblack:
- identifier: "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
- type: "\\<(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\\>"
- statement: "\\<gl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\\>"
- statement: "\\<(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\\>"
- statement: "\\<(break|continue)\\>"
- constant: "\\<(true|false)\\>"
- statement: "[-+/*=<>?:!~%&|^]"
- constant.number: "\\<([0-9]+|0x[0-9a-fA-F]*)\\>"
- comment:
start: "//"
end: "$"
rules:
todo: "TODO:?"
- comment:
start: "/\\*"
end: "\\*/"
rules: []
- brightwhite,cyan: "TODO:?"
- ,green: "[[:space:]]+$"
- ,red: " + +| + +"
rules:
todo: "TODO:?"
+1 -3
View File
@@ -2,7 +2,7 @@ filetype: json
detect:
filename: "\\.json$"
header: "^\{$"
header: "^\\{$"
rules:
- constant.number: "\\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\\b"
@@ -22,5 +22,3 @@ rules:
- constant.specialChar: "\\\\."
- statement: "\\\"(\\\\\"|[^\"])*\\\"[[:space:]]*:\" \"'(\\'|[^'])*'[[:space:]]*:"
- constant: "\\\\u[0-9a-fA-F]{4}|\\\\[bfnrt'\"/\\\\]"
- ,green: "[[:space:]]+$"
- ,red: " + +| + +"
+10 -9
View File
@@ -4,20 +4,21 @@ detect:
filename: "\\.(k|key)?map$|Xmodmap$"
rules:
- cyan: "\\<(add|clear|compose|keycode|keymaps|keysym|remove|string)\\>"
- cyan: "\\<(control|alt|shift)\\>"
- blue: "\\<[0-9]+\\>"
- red: "="
- yellow:
- statement: "\\b(add|clear|compose|keycode|keymaps|keysym|remove|string)\\b"
- statement: "\\b(control|alt|shift)\\b"
- constant.number: "\\b[0-9]+\\b"
- special: "="
- constant.string:
start: "\""
end: "\""
rules:
- constant.specialChar: "\\\\."
- yellow:
- constant.string:
start: "'"
end: "'"
rules:
- constant.specialChar: "\\\\."
- brightblack: "^!.*$"
- ,green: "[[:space:]]+$"
- ,red: " + +| + +"
- comment:
start: "^!"
end: "$"
rules: []
+1 -1
View File
@@ -5,7 +5,7 @@ detect:
rules:
- constant.number: "\\d+"
- identifier: "[[:space:]](staff|spacing|signature|routine|notes|handler|corrected|beams|arpeggios|Volta_engraver|Voice|Vertical_align_engraver|Vaticana_ligature_engraver|VaticanaVoice|VaticanaStaff|Tweak_engraver|Tuplet_engraver|Trill_spanner_engraver|Timing_translator|Time_signature_performer|Time_signature_engraver|Tie_performer|Tie_engraver|Text_spanner_engraver|Text_engraver|Tempo_performer|Tab_tie_follow_engraver|Tab_staff_symbol_engraver|Tab_note_heads_engraver|TabVoice|TabStaff|System_start_delimiter_engraver|Stem_engraver|Stanza_number_engraver|Stanza_number_align_engraver|Staff_symbol_engraver|Staff_performer|Staff_collecting_engraver|StaffGroup|Staff|Spanner_break_forbid_engraver|Span_bar_stub_engraver|Span_bar_engraver|Span_arpeggio_engraver|Spacing_engraver|Slur_performer|Slur_engraver|Slash_repeat_engraver|Separating_line_group_engraver|Script_row_engraver|Script_engraver|Script_column_engraver|Score|Rhythmic_column_engraver|RhythmicStaff|Rest_engraver|Rest_collision_engraver|Repeat_tie_engraver|Repeat_acknowledge_engraver|Pure_from_neighbor_engraver|Pitched_trill_engraver|Pitch_squash_engraver|Piano_pedal_performer|Piano_pedal_engraver|Piano_pedal_align_engraver|PianoStaff|Phrasing_slur_engraver|PetrucciVoice|PetrucciStaff|Percent_repeat_engraver|Part_combine_engraver|Parenthesis_engraver|Paper_column_engraver|Output_property_engraver|Ottava_spanner_engraver|OneStaff|NullVoice|Note_spacing_engraver|Note_performer|Note_name_engraver|Note_heads_engraver|Note_head_line_engraver|NoteName\|NoteHead|New_fingering_engraver|Multi_measure_rest_engraver|Midi_control_function_performer|Metronome_mark_engraver|Mensural_ligature_engraver|MensuralVoice|MensuralStaff|Mark_engraver|Lyrics|Lyric_performer|Lyric_engraver|Ligature_bracket_engraver|Ledger_line_engraver|Laissez_vibrer_engraver|Kievan_ligature_engraver|KievanVoice|KievanStaff|Key_performer|Key_engraver|Keep_alive_together_engraver|Instrument_switch_engraver|Instrument_name_engraver|Hyphen_engraver|Grob_pq_engraver|GregorianTranscriptionVoice|GregorianTranscriptionStaff|GrandStaff|Grace_spacing_engraver|Grace_engraver|Grace_beam_engraver|Grace_auto_beam_engraver|Global|Glissando_engraver|Fretboard_engraver|FretBoards|Forbid_line_break_engraver|Footnote_engraver|Font_size_engraver|Fingering_engraver|Fingering_column_engraver|Figured_bass_position_engraver|Figured_bass_engraver|FiguredBass|Extender_engraver|Episema_engraver|Dynamics|Dynamic_performer|Dynamic_engraver|Dynamic_align_engraver|Drum_notes_engraver|Drum_note_performer|DrumVoice|DrumStaff|Double_percent_repeat_engraver|Dots_engraver|Dot_column_engraver|Devnull|Default_bar_line_engraver|Custos_engraver|Cue_clef_engraver|CueVoice|Control_track_performer|Concurrent_hairpin_engraver|Collision_engraver|Cluster_spanner_engraver|Clef_engraver|Chord_tremolo_engraver|Chord_name_engraver|ChordNames|ChoirStaff|Breathing_sign_engraver|Break_align_engraver|Bend_engraver|Beam_performer|Beam_engraver|Beam_collision_engraver|Bar_number_engraver|Bar_engraver|Axis_group_engraver|Auto_beam_engraver|Arpeggio_engraver|Accidental_engraver|Score)[[:space:]]"
- identifier: "\\b(staff|spacing|signature|routine|notes|handler|corrected|beams|arpeggios|Volta_engraver|Voice|Vertical_align_engraver|Vaticana_ligature_engraver|VaticanaVoice|VaticanaStaff|Tweak_engraver|Tuplet_engraver|Trill_spanner_engraver|Timing_translator|Time_signature_performer|Time_signature_engraver|Tie_performer|Tie_engraver|Text_spanner_engraver|Text_engraver|Tempo_performer|Tab_tie_follow_engraver|Tab_staff_symbol_engraver|Tab_note_heads_engraver|TabVoice|TabStaff|System_start_delimiter_engraver|Stem_engraver|Stanza_number_engraver|Stanza_number_align_engraver|Staff_symbol_engraver|Staff_performer|Staff_collecting_engraver|StaffGroup|Staff|Spanner_break_forbid_engraver|Span_bar_stub_engraver|Span_bar_engraver|Span_arpeggio_engraver|Spacing_engraver|Slur_performer|Slur_engraver|Slash_repeat_engraver|Separating_line_group_engraver|Script_row_engraver|Script_engraver|Script_column_engraver|Score|Rhythmic_column_engraver|RhythmicStaff|Rest_engraver|Rest_collision_engraver|Repeat_tie_engraver|Repeat_acknowledge_engraver|Pure_from_neighbor_engraver|Pitched_trill_engraver|Pitch_squash_engraver|Piano_pedal_performer|Piano_pedal_engraver|Piano_pedal_align_engraver|PianoStaff|Phrasing_slur_engraver|PetrucciVoice|PetrucciStaff|Percent_repeat_engraver|Part_combine_engraver|Parenthesis_engraver|Paper_column_engraver|Output_property_engraver|Ottava_spanner_engraver|OneStaff|NullVoice|Note_spacing_engraver|Note_performer|Note_name_engraver|Note_heads_engraver|Note_head_line_engraver|NoteName\|NoteHead|New_fingering_engraver|Multi_measure_rest_engraver|Midi_control_function_performer|Metronome_mark_engraver|Mensural_ligature_engraver|MensuralVoice|MensuralStaff|Mark_engraver|Lyrics|Lyric_performer|Lyric_engraver|Ligature_bracket_engraver|Ledger_line_engraver|Laissez_vibrer_engraver|Kievan_ligature_engraver|KievanVoice|KievanStaff|Key_performer|Key_engraver|Keep_alive_together_engraver|Instrument_switch_engraver|Instrument_name_engraver|Hyphen_engraver|Grob_pq_engraver|GregorianTranscriptionVoice|GregorianTranscriptionStaff|GrandStaff|Grace_spacing_engraver|Grace_engraver|Grace_beam_engraver|Grace_auto_beam_engraver|Global|Glissando_engraver|Fretboard_engraver|FretBoards|Forbid_line_break_engraver|Footnote_engraver|Font_size_engraver|Fingering_engraver|Fingering_column_engraver|Figured_bass_position_engraver|Figured_bass_engraver|FiguredBass|Extender_engraver|Episema_engraver|Dynamics|Dynamic_performer|Dynamic_engraver|Dynamic_align_engraver|Drum_notes_engraver|Drum_note_performer|DrumVoice|DrumStaff|Double_percent_repeat_engraver|Dots_engraver|Dot_column_engraver|Devnull|Default_bar_line_engraver|Custos_engraver|Cue_clef_engraver|CueVoice|Control_track_performer|Concurrent_hairpin_engraver|Collision_engraver|Cluster_spanner_engraver|Clef_engraver|Chord_tremolo_engraver|Chord_name_engraver|ChordNames|ChoirStaff|Breathing_sign_engraver|Break_align_engraver|Bend_engraver|Beam_performer|Beam_engraver|Beam_collision_engraver|Bar_number_engraver|Bar_engraver|Axis_group_engraver|Auto_beam_engraver|Arpeggio_engraver|Accidental_engraver|Score)\\b"
- statement: "[-_^]?\\\\[-A-Za-z_]+"
- preproc: "\\b(((gisis|gis|geses|ges|g|fisis|fis|feses|fes|f|eisis|eis|eeses|ees|e|disis|dis|deses|des|d|cisis|cis|ceses|ces|c|bisis|bis|beses|bes|b|aisis|ais|aeses|aes|a)[,']*[?!]?)|s|r|R|q)(128|64|32|16|8|4|2|1|\\\\breve|\\\\longa|\\\\maxima)?([^\\\\\\w]|_|\\b)"
- special: "[(){}<>]|\\[|\\]"
+2 -2
View File
@@ -5,7 +5,7 @@ detect:
header: "^From .* \\d+:\\d+:\\d+ \\d+"
rules:
- yellow: "^From .*"
- type: "^From .*"
- identifier: "^[^[:space:]]+:"
- preproc: "^List-(Id|Archive|Subscribe|Unsubscribe|Post|Help):"
- constant: "^(To|From):"
@@ -14,7 +14,7 @@ rules:
end: "$"
rules:
- constant.specialChar: "\\\\."
- statement: "<?[^@[:space:]]+@[^[:space:]]+>?""
- statement: "<?[^@[:space:]]+@[^[:space:]]+>?"
- default:
start: "^\\n\\n"
end: ".*"
+12 -12
View File
@@ -4,15 +4,15 @@ detect:
filename: "\\.rest$|\\.rst$"
rules:
- red: "\\*\\*[^*]+\\*\\*"
- brightred: "::"
- blue: "`[^`]+`_{1,2}"
- yellow: "``[^`]+``"
- cyan: "^\\.\\. .*$"
- cyan: "^__ .*$"
- yellow: "^###+$"
- yellow: "^\\*\\*\\*+$"
- magenta: "^===+$"
- red: "^---+$"
- green: "^\\^\\^\\^+$"
- blue: "^\"\"\"+$"
- statement: "\\*\\*[^*]+\\*\\*"
- preproc: "::"
- constant.string: "`[^`]+`_{1,2}"
- constant.string: "``[^`]+``"
- identifier: "^\\.\\. .*$"
- identifier: "^__ .*$"
- type: "^###+$"
- type: "^\\*\\*\\*+$"
- special: "^===+$"
- special: "^---+$"
- special: "^\\^\\^\\^+$"
- special: "^\"\"\"+$"